Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit 7b43654

Browse files
committed
Merge branch 'greenkeeper/eslint-plugin-vue-5.0.0' into develop
2 parents 4efa13a + cc7bad9 commit 7b43654

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+9996
-4873
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"browser": true
77
},
88
"parserOptions": {
9-
"ecmaVersion": 8
9+
"parser": "babel-eslint"
1010
},
1111
"globals": {
1212
"$": true,

package-lock.json

Lines changed: 193 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
1010
"prod": "npm run production",
1111
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --inline --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
12-
"lint-js": "eslint --ext .js,.vue resources/js/ ./*.js",
12+
"lint-js": "eslint -f pretty --ext .js,.vue resources/js/ ./*.js",
1313
"lint-css": "stylelint \"resources/sass/**/*.scss\"",
14-
"fix-js": "eslint --ext .js,.vue resources/js/ ./*.js --fix",
14+
"fix-js": "eslint -f pretty --ext .js,.vue resources/js/ ./*.js --fix",
1515
"fix-css": "stylelint \"resources/sass/**/*.scss\" --fix",
1616
"lint-php": "php php-cs-fixer fix --dry-run",
1717
"fix-php": "php php-cs-fixer fix",
@@ -23,19 +23,21 @@
2323
"npm": ">= 5.6.0"
2424
},
2525
"devDependencies": {
26+
"babel-eslint": "^10.0.1",
2627
"babel-plugin-wildcard": "^5.0.0",
2728
"babel-preset-stage-2": "^6.24.1",
2829
"cross-env": "^5.1",
2930
"eslint": "^5.8.0",
3031
"eslint-config-adenvt": "^2.0.0",
3132
"eslint-config-standard": "^12.0.0",
33+
"eslint-formatter-pretty": "^2.0.0",
3234
"eslint-plugin-import": "^2.14.0",
3335
"eslint-plugin-node": "^8.0.0",
3436
"eslint-plugin-promise": "^4.0.1",
3537
"eslint-plugin-standard": "^4.0.0",
3638
"eslint-plugin-unicorn": "^6.0.1",
3739
"eslint-plugin-varspacing": "^1.2.1",
38-
"eslint-plugin-vue": "^4.7.1",
40+
"eslint-plugin-vue": "^5.0.0",
3941
"laravel-mix": "^4.0.12",
4042
"node-sass": "^4.11.0",
4143
"offline-plugin": "^5.0.5",

resources/js/coreui/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<router-view/>
2+
<router-view />
33
</template>
44

55
<script>

0 commit comments

Comments
 (0)