Skip to content

Commit a54bd3c

Browse files
committed
Fix storybook
1 parent f96ec4d commit a54bd3c

File tree

7 files changed

+665
-1410
lines changed

7 files changed

+665
-1410
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
run: yarn install
3838

3939
- name: Run Lint Check 🔍
40-
run: yarn run lint
40+
run: yarn run eslint:check
4141

4242
- name: Run Format Check 🌸
43-
run: yarn run fmt
43+
run: yarn run prettier:check
4444

4545
build-toolkit:
4646
runs-on: ubuntu-latest

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"packages/components",
2020
"packages/lab-example"
2121
]
22+
},
23+
"resolutions": {
24+
"webpack": "^5.0.0"
2225
}
2326
}
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
module.exports = {
2-
presets: ['@babel/preset-env', '@babel/preset-typescript'],
3-
plugins: [
4-
['@babel/plugin-proposal-decorators', {legacy: true}],
5-
['@babel/plugin-proposal-class-properties', {loose: true}],
6-
],
2+
presets: ['@babel/preset-env', '@babel/preset-typescript'],
3+
plugins: [
4+
['@babel/plugin-proposal-decorators', { legacy: true }],
5+
['@babel/plugin-proposal-class-properties', { loose: true }],
6+
['@babel/plugin-proposal-private-methods', { loose: true }],
7+
['@babel/plugin-proposal-private-property-in-object', { loose: true }]
8+
]
79
};

packages/components/.storybook/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
module.exports = {
2+
core: {
3+
builder: 'webpack5',
4+
},
25
stories: [
36
'../src/**/*.stories.mdx',
47
'../src/**/*.stories.@(js|jsx|ts|tsx)',

packages/components/package.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"sideEffects": false,
1818
"scripts": {
1919
"start": "start-storybook -p 6006",
20-
"build": "rollup -c && tsc -p ./tsconfig.json && npm run doc",
20+
"build": "rollup -c && tsc -p ./tsconfig.json && yarn run doc",
2121
"build:docs": "build-storybook",
22-
"deploy:docs": "npm run build:docs && gh-pages -d storybook-static",
22+
"deploy:docs": "yarn run build:docs && gh-pages -d storybook-static",
2323
"doc": "api-extractor run --local",
24-
"fmt": "prettier --config ./.prettierrc --check \"**/*.{ts,js,md}\"",
25-
"fmt:fix": "prettier --config ./.prettierrc --write \"**/*.{ts,js,md}\"",
26-
"lint": "eslint . --ext .ts",
27-
"lint:fix": "eslint . --ext .ts --fix",
28-
"prepublishOnly": "npm run build",
24+
"prettier:check": "prettier --config ./.prettierrc --check \"**/*.{ts,js,md}\"",
25+
"prettier": "prettier --config ./.prettierrc --write \"**/*.{ts,js,md}\"",
26+
"eslint:check": "eslint . --ext .ts",
27+
"eslint": "eslint . --ext .ts --fix",
28+
"prepublishOnly": "yarn run build",
2929
"test": "jest --verbose --coverage"
3030
},
3131
"dependencies": {
@@ -37,25 +37,27 @@
3737
"@babel/plugin-proposal-decorators": "^7.14.2",
3838
"@babel/preset-env": "^7.14.2",
3939
"@babel/preset-typescript": "^7.13.0",
40-
"@microsoft/api-extractor": "7.18.9",
40+
"@microsoft/api-extractor": "^7.18.9",
4141
"@microsoft/eslint-config-fast-dna": "^1.2.0",
4242
"@rollup/plugin-commonjs": "^17.1.0",
4343
"@rollup/plugin-node-resolve": "^11.2.0",
4444
"@rollup/plugin-typescript": "^8.2.0",
45-
"@storybook/addon-a11y": "^6.4.0-beta.4",
46-
"@storybook/addon-actions": "^6.4.0-beta.4",
47-
"@storybook/addon-essentials": "^6.4.0-beta.4",
48-
"@storybook/addon-links": "^6.4.0-beta.4",
49-
"@storybook/html": "^6.4.0-beta.4",
50-
"@storybook/theming": "^6.4.0-beta.4",
45+
"@storybook/addon-a11y": "^6.4.3",
46+
"@storybook/addon-actions": "^6.4.3",
47+
"@storybook/addon-essentials": "^6.4.3",
48+
"@storybook/addon-links": "^6.4.3",
49+
"@storybook/builder-webpack5": "^6.4.3",
50+
"@storybook/html": "^6.4.3",
51+
"@storybook/manager-webpack5": "^6.4.3",
52+
"@storybook/theming": "^6.4.3",
5153
"@types/jest": "^26.0.20",
5254
"@typescript-eslint/eslint-plugin": "^2.23.0",
5355
"@vscode/codicons": "^0.0.22",
5456
"babel-jest": "^27.2.4",
5557
"babel-loader": "^8.2.2",
5658
"babel-plugin-transform-class-properties": "^6.24.1",
57-
"eslint": "6.8.0",
58-
"eslint-config-prettier": "6.10.1",
59+
"eslint": "^6.8.0",
60+
"eslint-config-prettier": "^6.10.1",
5961
"eslint-plugin-import": "^2.25.2",
6062
"gh-pages": "^3.1.0",
6163
"jest": "^27.2.4",
@@ -66,7 +68,7 @@
6668
"rollup-plugin-terser": "^7.0.2",
6769
"rollup-plugin-transform-tagged-template": "0.0.3",
6870
"tslib": "^2.1.0",
69-
"typescript": "4.3.5",
70-
"webpack": "^4.46.0"
71+
"typescript": "~4.3.5",
72+
"webpack": "^5.0.0"
7173
}
7274
}

packages/lab-example/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
4141
"eslint": "eslint . --ext .ts,.tsx --fix",
4242
"eslint:check": "eslint . --ext .ts,.tsx",
43+
"prettier": "prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
44+
"prettier:check": "prettier --list-different \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
4345
"install:extension": "jlpm run build",
4446
"watch": "run-p watch:src watch:labextension",
4547
"watch:src": "tsc -w",

0 commit comments

Comments
 (0)