Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(storybook): upgrade to webpack5 #810

Merged
merged 9 commits into from
Jan 17, 2023
Merged

fix(storybook): upgrade to webpack5 #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c954d78
upgrade webpack for storybook
dvdanielamoitzi Dec 2, 2022
bf625e9
use webpack.config from storybook and override rules
dvdanielamoitzi Dec 2, 2022
5d81dd0
add HtmlWebpackPlugin
dvdanielamoitzi Dec 2, 2022
c79a06b
Merge branch 'develop' into dmoitzi/809_fix-storybook
puehringer Jan 11, 2023
8b9062e
Merge branch 'develop' into dmoitzi/809_fix-storybook
puehringer Jan 11, 2023
0a6f803
Fix storybook path aliases
puehringer Jan 11, 2023
6b06265
Merge branch 'develop' into dmoitzi/809_fix-storybook
puehringer Jan 12, 2023
38fdce6
Merge branch 'develop' into dmoitzi/809_fix-storybook
dvdanielamoitzi Jan 17, 2023
ffd910b
use latest version of storybook
dvdanielamoitzi Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
const path = require('path');

module.exports = {
stories: [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"@storybook/preset-scss"
],
framework: "@storybook/react",
core: {
builder: 'webpack5',
},
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-interactions', '@storybook/preset-scss', 'storybook-addon-swc'],
framework: '@storybook/react',
webpackFinal: async (config) => {
// Add tdp_core/dist as alias, as we have scss/code imports like tdp_core/dist/assets/...
// These can only be resolved in a workspace currently, and not in the standalone repo.
config.resolve.alias = {
...(config.resolve.alias || {}),
'tdp_core/dist': path.resolve(__dirname, '../', 'dist')
// I have no clue why this is required, but if this is missing we get a "Can't resolve '../../assets/icons/datavisyn_logo.svg' in '.../src/scss'""
'../../assets': path.resolve(__dirname, '../src/assets'),
// Add tdp_core/dist as alias, as we have scss/code imports like tdp_core/dist/assets/...
'tdp_core/dist': path.resolve(__dirname, '../src'),
'tdp_core/src': path.resolve(__dirname, '../src'),
'tdp_core': path.resolve(__dirname, '../src'),
};
return config;
},
}
};
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,17 @@
"devDependencies": {
"@babel/core": "^7.17.7",
"@babel/plugin-transform-typescript": "7.17.12",
"@storybook/addon-actions": "^6.5.9",
"@storybook/addon-essentials": "^6.5.9",
"@storybook/addon-interactions": "^6.5.9",
"@storybook/addon-links": "^6.5.9",
"@storybook/addon-actions": "^6.5.15",
"@storybook/addon-essentials": "^6.5.15",
"@storybook/addon-interactions": "^6.5.15",
"@storybook/addon-links": "^6.5.15",
"@storybook/builder-webpack5": "^6.5.15",
"@storybook/manager-webpack5": "^6.5.15",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^6.5.9",
"@storybook/react": "^6.5.15",
"@storybook/testing-library": "0.0.9",
"cypress": "^11.2.0"
"cypress": "^11.2.0",
"storybook-addon-swc": "^1.1.9"
},
"overrides": {
"@types/react": "^16.9.23",
Expand Down