Skip to content

Commit ee5fb14

Browse files
committed
feat: adjust base of storybook
1 parent e7425ee commit ee5fb14

File tree

26 files changed

+140
-65
lines changed

26 files changed

+140
-65
lines changed

configs/webpack/alias-config.js renamed to configs/project/alias-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports.alias = {
66
'@': path.resolve(baseUrl, 'src'),
77
'@root': path.resolve(baseUrl),
88
'@api': path.resolve(baseUrl, 'src/api'),
9+
'@assets': path.resolve(baseUrl, 'src/assets'),
910
'@styles': path.resolve(baseUrl, 'src/styles'),
1011
'@components': path.resolve(baseUrl, 'src/components'),
1112
'@layouts': path.resolve(baseUrl, 'src/layouts'),

configs/webpack/rules-config.js renamed to configs/project/rules-config.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ if (process.env.npm_lifecycle_event.search('storybook') < 0) {
55
test: /\.vue$/,
66
loader: 'vue-loader',
77
});
8+
rules.push({
9+
test: /\.(png|jp(e*)g|svg|gif)$/,
10+
use: ['file-loader'],
11+
});
12+
} else {
13+
rules.push({
14+
test: /\.svg$/,
15+
use: ["@svgr/webpack", "url-loader"],
16+
});
817
}
918

1019
rules.push({
@@ -22,9 +31,4 @@ rules.push({
2231
],
2332
});
2433

25-
rules.push({
26-
test: /\.(png|jp(e*)g|svg|gif)$/,
27-
use: ['file-loader'],
28-
});
29-
3034
exports.rules = rules;
File renamed without changes.

configs/.storybook/main.js renamed to configs/storybook/main.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { rules } = require("../webpack/rules-config");
2-
const { alias } = require("../webpack/alias-config");
1+
const { rules } = require("../project/rules-config");
2+
const { alias } = require("../project/alias-config");
33

44
module.exports = {
55
stories: [
@@ -17,6 +17,11 @@ module.exports = {
1717
builder: "webpack5",
1818
},
1919
webpackFinal: async (config) => {
20+
const fileLoaderRule = config.module.rules.find(
21+
(rule) => !Array.isArray(rule.test) && rule.test.test(".svg"),
22+
);
23+
fileLoaderRule.exclude = /\.svg$/;
24+
2025
config.module.rules = [...config.module.rules, ...rules];
2126

2227
config.resolve.alias = { ...config.resolve.alias, ...alias };
File renamed without changes.
File renamed without changes.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {
1010
"build:lib": "rollup -c",
1111
"test:unit": "jest",
12-
"dev:storybook": "start-storybook -p 6006 -c configs/.storybook",
12+
"dev:storybook": "start-storybook -p 6006 -c configs/storybook",
1313
"build:storybook": "build-storybook -o dist/storybook",
1414
"semantic-release": "semantic-release"
1515
},
@@ -19,7 +19,6 @@
1919
"dist/lib/*"
2020
],
2121
"dependencies": {
22-
"url-join": "^4.0.1",
2322
"vue-prop-validation-helper": "^3.0.0"
2423
},
2524
"peerDependencies": {
@@ -31,6 +30,7 @@
3130
"@babel/plugin-syntax-jsx": "^7.16.7",
3231
"@babel/plugin-transform-runtime": "^7.16.7",
3332
"@babel/preset-env": "^7.16.7",
33+
"@rollup/plugin-alias": "^3.1.9",
3434
"@rollup/plugin-node-resolve": "^13.1.3",
3535
"@storybook/addon-actions": "^6.4.9",
3636
"@storybook/addon-essentials": "^6.4.9",
@@ -61,12 +61,14 @@
6161
"param-case": "^3.0.4",
6262
"rollup": "^2.67.2",
6363
"rollup-plugin-peer-deps-external": "^2.2.4",
64+
"rollup-plugin-scss": "3",
6465
"rollup-plugin-vue": "^6.0.0",
6566
"sass": "^1.46.0",
6667
"sass-loader": "^12.4.0",
6768
"semantic-release": "^18.0.1",
6869
"storybook-design-token": "^1.4.0",
6970
"style-loader": "^3.3.1",
71+
"url-loader": "^4.1.1",
7072
"vue": "^3.2.26",
7173
"vue-loader": "^17.0.0",
7274
"vue-style-loader": "^4.1.3",

rollup.config.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import vue from "rollup-plugin-vue";
22
import peerDepsExternal from "rollup-plugin-peer-deps-external";
33
import { nodeResolve } from "@rollup/plugin-node-resolve";
4+
import RollupAlias from "@rollup/plugin-alias";
5+
const { alias } = require("./configs/.project/alias-config");
6+
import scss from "rollup-plugin-scss";
47

58
export default [
69
{
@@ -15,6 +18,12 @@ export default [
1518
file: "dist/lib/core-ui.js",
1619
},
1720
],
18-
plugins: [vue(), peerDepsExternal(), nodeResolve()],
21+
plugins: [
22+
vue(),
23+
peerDepsExternal(),
24+
nodeResolve(),
25+
RollupAlias({ entries: alias }),
26+
scss(),
27+
],
1928
},
2029
];
Lines changed: 33 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)