Skip to content

Commit 6c0d70e

Browse files
authored
Merge pull request #172 from dnum-mi/develop
Develop
2 parents 3739baf + 851aa21 commit 6c0d70e

26 files changed

+25991
-21553
lines changed

.eslintrc.js

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ module.exports = {
77
env: {
88
node: true,
99
},
10-
extends: [
11-
'plugin:vue/vue3-recommended',
12-
'@vue/standard',
13-
],
10+
extends: ['plugin:vue/vue3-recommended', '@vue/standard', 'plugin:storybook/recommended'],
1411
parserOptions: {
1512
parser: '@babel/eslint-parser',
1613
},
@@ -22,25 +19,17 @@ module.exports = {
2219
},
2320
overrides: [
2421
{
25-
files: [
26-
'**/__tests__/*.{j,t}s?(x)',
27-
'**/tests/unit/*.{j,t}s?(x)',
28-
'**/src/**/*.spec.{j,t}s?(x)',
29-
],
22+
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/*.{j,t}s?(x)', '**/src/**/*.spec.{j,t}s?(x)'],
3023
env: {
3124
jest: true,
3225
},
3326
},
3427
{
35-
files: [
36-
'**/src/**/*.e2e.{j,t}s?(x)',
37-
],
28+
files: ['**/src/**/*.e2e.{j,t}s?(x)'],
3829
env: {
3930
'cypress/globals': true,
4031
},
41-
extends: [
42-
'plugin:cypress/recommended',
43-
],
32+
extends: ['plugin:cypress/recommended'],
4433
},
4534
],
4635
}

.storybook/main.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ module.exports = {
1414
}
1515
},
1616
],
17+
staticDirs: ['../public'],
18+
core: {
19+
builder: 'webpack5'
20+
}
1721
// "core": {
1822
// "builder": "storybook-builder-vite"
1923
// }

0 commit comments

Comments
 (0)