Skip to content

Commit adcb765

Browse files
committedNov 12, 2018
Minor adjustments
1 parent 0a5b1a1 commit adcb765

File tree

7 files changed

+35
-9177
lines changed

7 files changed

+35
-9177
lines changed
 

‎.babelrc

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
{
22
"presets": [
3-
[ "@babel/env", { "targets": { "browsers": [ "last 2 versions" ] }, "modules": false } ],
4-
"@babel/preset-typescript"
3+
[ "@babel/env", { "targets": { "browsers": [ "last 2 versions" ] }, "modules": false } ]
54
],
65
"plugins": [
7-
"@babel/plugin-proposal-function-bind",
8-
"@babel/plugin-proposal-logical-assignment-operators",
96
["@babel/plugin-proposal-optional-chaining", { "loose": false }],
10-
["@babel/plugin-proposal-pipeline-operator", { "proposal": "minimal" }],
11-
["@babel/plugin-proposal-nullish-coalescing-operator", { "loose": false }],
12-
"@babel/plugin-proposal-do-expressions",
13-
["@babel/plugin-proposal-decorators", { "legacy": true }],
14-
"@babel/plugin-proposal-throw-expressions",
15-
["@babel/plugin-proposal-class-properties", { "loose": false }]
7+
["@babel/plugin-proposal-decorators", { "legacy": true }]
168
]
179
}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules/
33
dist/
44
npm-debug.log
55
yarn-error.log
6+
package-lock.json
67

78
# Editor directories and files
89
.idea

‎package-lock.json

-9,130
This file was deleted.

‎package.json

+21-27
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"vue": "2.5.17",
1414
"vue-router": "3.0.1",
1515
"vuex": "3.0.1",
16-
"vue-i18n": "8.1.0",
17-
"googleapis": "33.0.0",
16+
"vue-i18n": "8.3.1",
17+
"googleapis": "35.0.0",
1818
"hyperid": "1.4.1",
1919
"greenlet": "1.0.1",
20-
"format-duration": "1.2.0"
20+
"format-duration": "1.3.1"
2121
},
2222
"engines": {
2323
"node": ">=8.0.0"
@@ -28,40 +28,34 @@
2828
"not ie <= 8"
2929
],
3030
"devDependencies": {
31-
"babel-loader": "8.0.0",
32-
"@babel/cli": "7.0.0",
33-
"@babel/core": "7.0.0",
34-
"@babel/preset-env": "7.0.0",
35-
"@babel/plugin-proposal-function-bind": "7.0.0",
36-
"@babel/plugin-proposal-logical-assignment-operators": "7.0.0",
31+
"babel-loader": "8.0.4",
32+
"@babel/cli": "7.1.5",
33+
"@babel/core": "7.1.5",
34+
"@babel/preset-env": "7.1.5",
3735
"@babel/plugin-proposal-optional-chaining": "7.0.0",
38-
"@babel/plugin-proposal-pipeline-operator": "7.0.0",
39-
"@babel/plugin-proposal-nullish-coalescing-operator": "7.0.0",
40-
"@babel/plugin-proposal-do-expressions": "7.0.0",
41-
"@babel/plugin-proposal-decorators": "7.0.0",
42-
"@babel/plugin-proposal-throw-expressions": "7.0.0",
43-
"@babel/plugin-proposal-class-properties": "7.0.0",
36+
"@babel/plugin-proposal-decorators": "7.1.2",
4437
"@babel/polyfill": "7.0.0",
45-
"@babel/preset-typescript": "7.0.0",
38+
"@babel/preset-typescript": "7.1.0",
4639
"babel-preset-minify": "0.4.3",
4740
"less": "3.8.1",
4841
"cross-env": "5.2.0",
49-
"css-loader": "1.0.0",
50-
"file-loader": "1.1.11",
42+
"css-loader": "1.0.1",
43+
"file-loader": "2.0.0",
5144
"less-loader": "4.1.0",
52-
"vue-loader": "15.4.1",
45+
"vue-loader": "15.4.2",
5346
"vue-template-compiler": "2.5.17",
54-
"webpack": "4.17.2",
55-
"webpack-dev-server": "3.1.7",
56-
"webpack-cli": "3.1.0",
57-
"eslint": "5.5.0",
47+
"webpack": "4.25.1",
48+
"webpack-dev-server": "3.1.10",
49+
"webpack-cli": "3.1.2",
50+
"eslint": "5.9.0",
5851
"eslint-plugin-import": "2.14.0",
59-
"eslint-plugin-node": "7.0.1",
60-
"eslint-plugin-promise": "4.0.0",
52+
"eslint-plugin-node": "8.0.0",
53+
"eslint-plugin-promise": "4.0.1",
6154
"eslint-plugin-standard": "4.0.0",
6255
"eslint-plugin-react": "7.11.1",
63-
"eslint-plugin-vue": "4.7.1",
56+
"eslint-plugin-vue": "^5.0.0-beta.3",
6457
"eslint-config-standard": "12.0.0",
65-
"eslint-config-semistandard": "12.0.1"
58+
"eslint-config-semistandard": "13.0.0",
59+
"acorn": "6.0.0"
6660
}
6761
}

‎src/components/Song.vue

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ export default {
7171
top: 14px;
7272
left: 16px;
7373
z-index: 3;
74+
pointer-events: none;
7475
transition: all 0.3s ease-in-out;
7576
}
7677

‎src/components/player/Player.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export default {
122122
float: left;
123123
vertical-align: middle;
124124
box-sizing: border-box;
125-
width: 5%;
125+
width: 60px;
126126
127127
.player-image {
128128
width: 60px;
@@ -140,7 +140,7 @@ export default {
140140
text-align: left;
141141
float: left;
142142
padding-left: 20px;
143-
width: 30%;
143+
width: calc(35% - 60px);
144144
min-height: 5px;
145145
box-sizing: border-box;
146146
vertical-align: middle;

‎webpack.config.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,27 @@ module.exports = {
4646
],
4747
plugins: [
4848
// Stage 0
49-
'@babel/plugin-proposal-function-bind',
49+
// '@babel/plugin-proposal-function-bind',
5050

5151
// Stage 1
5252
// "@babel/plugin-proposal-export-default-from",
53-
'@babel/plugin-proposal-logical-assignment-operators',
53+
// '@babel/plugin-proposal-logical-assignment-operators',
5454
['@babel/plugin-proposal-optional-chaining', { 'loose': false }],
55-
['@babel/plugin-proposal-pipeline-operator', { 'proposal': 'minimal' }],
56-
['@babel/plugin-proposal-nullish-coalescing-operator', { 'loose': false }],
57-
'@babel/plugin-proposal-do-expressions',
55+
// ['@babel/plugin-proposal-pipeline-operator', { 'proposal': 'minimal' }],
56+
// ['@babel/plugin-proposal-nullish-coalescing-operator', { 'loose': false }],
57+
// '@babel/plugin-proposal-do-expressions',
5858

5959
// Stage 2
60-
['@babel/plugin-proposal-decorators', { 'legacy': true }],
60+
['@babel/plugin-proposal-decorators', { 'legacy': true }]
6161
// "@babel/plugin-proposal-function-sent",
6262
// "@babel/plugin-proposal-export-namespace-from",
6363
// "@babel/plugin-proposal-numeric-separator",
64-
'@babel/plugin-proposal-throw-expressions',
64+
// '@babel/plugin-proposal-throw-expressions',
6565

6666
// Stage 3
6767
// "@babel/plugin-syntax-dynamic-import",
6868
// "@babel/plugin-syntax-import-meta",
69-
['@babel/plugin-proposal-class-properties', { 'loose': false }]
69+
// ['@babel/plugin-proposal-class-properties', { 'loose': false }]
7070
// "@babel/plugin-proposal-json-strings"
7171
]
7272
}

0 commit comments

Comments
 (0)
Please sign in to comment.