Skip to content

Commit

Permalink
fix(linting): Make linting work again
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelklehr committed Apr 25, 2024
1 parent c1c63cc commit e1fb563
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 19 deletions.
1 change: 1 addition & 0 deletions lib/templates/minimal/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
vue.config.js
stylelint.config.js
.eslintrc.js
7 changes: 0 additions & 7 deletions lib/templates/minimal/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
6 changes: 5 additions & 1 deletion lib/templates/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion lib/templates/minimal/stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ module.exports = {

root: true,

extends: ['stylelint-config-standard']
extends: ['stylelint-config-recommended-vue']
};
1 change: 1 addition & 0 deletions lib/templates/showroom/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
vue.config.js
stylelint.config.js
.eslintrc.js
7 changes: 0 additions & 7 deletions lib/templates/showroom/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
6 changes: 5 additions & 1 deletion lib/templates/showroom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion lib/templates/showroom/stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ module.exports = {

root: true,

extends: ['stylelint-config-standard']
extends: ['stylelint-config-recommended-vue']
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit e1fb563

Please sign in to comment.