Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 14a0da8

Browse files
committed
Upgrade packages. Configure eslint.
1 parent da44ea5 commit 14a0da8

File tree

4 files changed

+65
-10
lines changed

4 files changed

+65
-10
lines changed

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ module.exports = {
77
plugins: [
88
'html',
99
],
10+
globals: {
11+
"$": 1,
12+
"axios": 1,
13+
"Vue": 1,
14+
},
1015
rules: {
1116
'global-require': 0,
1217

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@
88
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=webpack.config.js"
99
},
1010
"devDependencies": {
11+
"cross-env": "^3.2.3",
1112
"eslint": "^3.8.1",
1213
"eslint-config-airbnb-base": "^9.0.0",
1314
"eslint-import-resolver-webpack": "^0.6.0",
14-
"eslint-plugin-html": "^1.5.5",
15+
"eslint-plugin-html": "^2.0.1",
1516
"eslint-plugin-import": "^2.1.0",
16-
"cross-env": "^3.2.3",
1717
"laravel-mix": "^0.8.3",
1818
"lodash": "^4.17.4"
1919
},
2020
"dependencies": {
21+
"accounting": "^0.4.1",
2122
"axios": "^0.15.3",
22-
"json-loader": "^0.5.4",
2323
"bootstrap-sass": "^3.3.7",
24-
"accounting": "^0.4.1",
24+
"element-ui": "^1.2.4",
25+
"eslint-loader": "^1.6.3",
2526
"jquery": "^3.1.1",
2627
"jquery-ui": "^1.12.1",
28+
"json-loader": "^0.5.4",
2729
"moment": "^2.14.1",
2830
"vue": "^2.2.0",
2931
"vue-i18n": "^5.0",

webpack.config.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,17 @@ let rules = [
189189
name: '[name].[ext]?[hash]',
190190
publicPath: Mix.options.resourceRoot
191191
}
192-
}
192+
},
193+
194+
{
195+
enforce: "pre",
196+
test: /\.js$/,
197+
exclude: /node_modules/,
198+
loader: "eslint-loader",
199+
options: {
200+
fix: true,
201+
}
202+
},
193203
];
194204

195205
if (Mix.preprocessors) {

yarn.lock

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ async-foreach@^0.1.3:
216216
version "0.1.3"
217217
resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
218218

219+
async-validator@^1.6.6:
220+
version "1.6.8"
221+
resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.6.8.tgz#fbaaa9002b41066fdf3ba21d8a4ca8b1179ad36b"
222+
219223
async@1.5.2, async@^1.5.2:
220224
version "1.5.2"
221225
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -372,6 +376,10 @@ babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
372376
babel-traverse "^6.23.0"
373377
babel-types "^6.23.0"
374378

379+
babel-helper-vue-jsx-merge-props@^2.0.0:
380+
version "2.0.2"
381+
resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
382+
375383
babel-helpers@^6.23.0:
376384
version "6.23.0"
377385
resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
@@ -1449,6 +1457,10 @@ deep-is@~0.1.3:
14491457
version "0.1.3"
14501458
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
14511459

1460+
deepmerge@^1.2.0:
1461+
version "1.3.2"
1462+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050"
1463+
14521464
del@^2.0.2:
14531465
version "2.2.2"
14541466
resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -1587,6 +1599,15 @@ electron-to-chromium@^1.2.5:
15871599
version "1.2.7"
15881600
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.7.tgz#4f748061407e478c76256d04496972b71f647407"
15891601

1602+
element-ui@^1.2.4:
1603+
version "1.2.4"
1604+
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-1.2.4.tgz#f7502193b0575e40dddbc4c3407e98e5fb346027"
1605+
dependencies:
1606+
async-validator "^1.6.6"
1607+
babel-helper-vue-jsx-merge-props "^2.0.0"
1608+
deepmerge "^1.2.0"
1609+
throttle-debounce "^1.0.1"
1610+
15901611
elliptic@^6.0.0:
15911612
version "6.4.0"
15921613
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -1793,16 +1814,25 @@ eslint-import-resolver-webpack@^0.6.0:
17931814
resolve "^1.1.7"
17941815
semver "^5.3.0"
17951816

1817+
eslint-loader@^1.6.3:
1818+
version "1.6.3"
1819+
resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.6.3.tgz#52fdcb32e9e8355108f8380dad4efe51a28986f9"
1820+
dependencies:
1821+
find-cache-dir "^0.1.1"
1822+
loader-utils "^1.0.2"
1823+
object-assign "^4.0.1"
1824+
object-hash "^1.1.4"
1825+
17961826
eslint-module-utils@^2.0.0:
17971827
version "2.0.0"
17981828
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
17991829
dependencies:
18001830
debug "2.2.0"
18011831
pkg-dir "^1.0.0"
18021832

1803-
eslint-plugin-html@^1.5.5:
1804-
version "1.7.0"
1805-
resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-1.7.0.tgz#2a5b03884d8d56adf9ad9864e9c036480fb629c9"
1833+
eslint-plugin-html@^2.0.1:
1834+
version "2.0.1"
1835+
resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.1.tgz#3a829510e82522f1e2e44d55d7661a176121fce1"
18061836
dependencies:
18071837
htmlparser2 "^3.8.2"
18081838

@@ -3468,8 +3498,8 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
34683498
minimist "0.0.8"
34693499

34703500
moment@^2.14.1:
3471-
version "2.17.1"
3472-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
3501+
version "2.18.0"
3502+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.0.tgz#6cfec6a495eca915d02600a67020ed994937252c"
34733503

34743504
ms@0.7.1:
34753505
version "0.7.1"
@@ -3702,6 +3732,10 @@ object-component@0.0.3:
37023732
version "0.0.3"
37033733
resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
37043734

3735+
object-hash@^1.1.4:
3736+
version "1.1.7"
3737+
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.7.tgz#a8d83fdf5d4583a4e2e7ffc18e8915e08482ef52"
3738+
37053739
object-path@^0.9.0, object-path@^0.9.2:
37063740
version "0.9.2"
37073741
resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
@@ -4945,6 +4979,10 @@ tfunk@^3.0.1:
49454979
chalk "^1.1.1"
49464980
object-path "^0.9.0"
49474981

4982+
throttle-debounce@^1.0.1:
4983+
version "1.0.1"
4984+
resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-1.0.1.tgz#dad0fe130f9daf3719fdea33dc36a8e6ba7f30b5"
4985+
49484986
through@^2.3.6, through@~2.3.6:
49494987
version "2.3.8"
49504988
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

0 commit comments

Comments
 (0)