diff --git a/lib/templates/minimal/.eslintignore b/lib/templates/minimal/.eslintignore index 884a1cd..a073384 100644 --- a/lib/templates/minimal/.eslintignore +++ b/lib/templates/minimal/.eslintignore @@ -1,2 +1,3 @@ vue.config.js stylelint.config.js +.eslintrc.js diff --git a/lib/templates/minimal/.eslintrc.js b/lib/templates/minimal/.eslintrc.js index 29a1b43..ec08323 100644 --- a/lib/templates/minimal/.eslintrc.js +++ b/lib/templates/minimal/.eslintrc.js @@ -17,14 +17,8 @@ module.exports = { 'plugin:prettier/recommended', // usage with Prettier, provided by 'eslint-config-prettier'. 'prettier', - - 'prettier/vue' ], plugins: [ - // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file - // required to lint *.vue files - 'vue' - // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674 // Prettier has not been included as plugin to avoid performance impact // add it as an extension for your IDE @@ -34,7 +28,6 @@ module.exports = { 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' }, parserOptions: { - parser: 'babel-eslint', ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features sourceType: 'module' // Allows for the use of imports } diff --git a/lib/templates/minimal/package.json b/lib/templates/minimal/package.json index f6791bd..9439151 100644 --- a/lib/templates/minimal/package.json +++ b/lib/templates/minimal/package.json @@ -11,8 +11,12 @@ "dependencies": { "magpie-base": "3.x" }, + "devDependencies": { + "@samhammer/vue-cli-plugin-stylelint": "5.x", + "@vue/cli-plugin-eslint": "5.x" + }, "engines": { - "node": "14.x || 16.x || 18.x", + "node": "14.x || 16.x || 18.x || 20.x", "npm": ">=7.0.0" }, "browserslist": [ diff --git a/lib/templates/minimal/stylelint.config.js b/lib/templates/minimal/stylelint.config.js index bea2720..5f17341 100644 --- a/lib/templates/minimal/stylelint.config.js +++ b/lib/templates/minimal/stylelint.config.js @@ -30,5 +30,5 @@ module.exports = { root: true, - extends: ['stylelint-config-standard'] + extends: ['stylelint-config-recommended-vue'] }; diff --git a/lib/templates/showroom/.eslintignore b/lib/templates/showroom/.eslintignore index 884a1cd..a073384 100644 --- a/lib/templates/showroom/.eslintignore +++ b/lib/templates/showroom/.eslintignore @@ -1,2 +1,3 @@ vue.config.js stylelint.config.js +.eslintrc.js diff --git a/lib/templates/showroom/.eslintrc.js b/lib/templates/showroom/.eslintrc.js index 29a1b43..ec08323 100644 --- a/lib/templates/showroom/.eslintrc.js +++ b/lib/templates/showroom/.eslintrc.js @@ -17,14 +17,8 @@ module.exports = { 'plugin:prettier/recommended', // usage with Prettier, provided by 'eslint-config-prettier'. 'prettier', - - 'prettier/vue' ], plugins: [ - // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file - // required to lint *.vue files - 'vue' - // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674 // Prettier has not been included as plugin to avoid performance impact // add it as an extension for your IDE @@ -34,7 +28,6 @@ module.exports = { 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' }, parserOptions: { - parser: 'babel-eslint', ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features sourceType: 'module' // Allows for the use of imports } diff --git a/lib/templates/showroom/package.json b/lib/templates/showroom/package.json index f6791bd..9439151 100644 --- a/lib/templates/showroom/package.json +++ b/lib/templates/showroom/package.json @@ -11,8 +11,12 @@ "dependencies": { "magpie-base": "3.x" }, + "devDependencies": { + "@samhammer/vue-cli-plugin-stylelint": "5.x", + "@vue/cli-plugin-eslint": "5.x" + }, "engines": { - "node": "14.x || 16.x || 18.x", + "node": "14.x || 16.x || 18.x || 20.x", "npm": ">=7.0.0" }, "browserslist": [ diff --git a/lib/templates/showroom/stylelint.config.js b/lib/templates/showroom/stylelint.config.js index bea2720..5f17341 100644 --- a/lib/templates/showroom/stylelint.config.js +++ b/lib/templates/showroom/stylelint.config.js @@ -30,5 +30,5 @@ module.exports = { root: true, - extends: ['stylelint-config-standard'] + extends: ['stylelint-config-recommended-vue'] }; diff --git a/package.json b/package.json index 4356771..3965fb9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magpie-base", - "version": "3.6.2", + "version": "3.6.6", "description": "Provides base components for magpie frontend projects", "author": "magpie project", "scripts": {