Skip to content

Commit

Permalink
Merge pull request #172 from dnum-mi/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
laruiss authored Dec 7, 2021
2 parents 3739baf + 851aa21 commit 6c0d70e
Show file tree
Hide file tree
Showing 26 changed files with 25,991 additions and 21,553 deletions.
19 changes: 4 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ module.exports = {
env: {
node: true,
},
extends: [
'plugin:vue/vue3-recommended',
'@vue/standard',
],
extends: ['plugin:vue/vue3-recommended', '@vue/standard', 'plugin:storybook/recommended'],
parserOptions: {
parser: '@babel/eslint-parser',
},
Expand All @@ -22,25 +19,17 @@ module.exports = {
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/*.{j,t}s?(x)',
'**/src/**/*.spec.{j,t}s?(x)',
],
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/*.{j,t}s?(x)', '**/src/**/*.spec.{j,t}s?(x)'],
env: {
jest: true,
},
},
{
files: [
'**/src/**/*.e2e.{j,t}s?(x)',
],
files: ['**/src/**/*.e2e.{j,t}s?(x)'],
env: {
'cypress/globals': true,
},
extends: [
'plugin:cypress/recommended',
],
extends: ['plugin:cypress/recommended'],
},
],
}
4 changes: 4 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ module.exports = {
}
},
],
staticDirs: ['../public'],
core: {
builder: 'webpack5'
}
// "core": {
// "builder": "storybook-builder-vite"
// }
Expand Down
Loading

0 comments on commit 6c0d70e

Please sign in to comment.