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

support Webpack 5 #1707

Merged
merged 11 commits into from
Nov 5, 2020
Merged

support Webpack 5 #1707

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5101fc9
Update loader syntax to support Webpack 5
jasonwilliams Oct 30, 2020
1311b1f
Add support for both Webpack 4 and Webpack 5 in StyleguidistOptionsPl…
jasonwilliams Oct 31, 2020
b308202
* Updating dependencies in the webpack example
jasonwilliams Oct 31, 2020
7d8c309
* Update TerserPlugin, remove Resolve and use any to support both web…
jasonwilliams Oct 31, 2020
1134a84
update dependencies and bring in assert
jasonwilliams Oct 31, 2020
bbb2034
Fix CI bug by reverting TerserPlugin version (We don't need to update…
jasonwilliams Nov 1, 2020
96efb75
Revert make-webpack-config now we're sticking to v4 on styleguidist i…
jasonwilliams Nov 1, 2020
4df8d8e
update package.json
jasonwilliams Nov 3, 2020
57ecea7
add typing back for webpack 4 path
jasonwilliams Nov 3, 2020
6cad3b4
can revert to loader as we don't use webpack 5 here
jasonwilliams Nov 3, 2020
fb1aeee
ignore if statement
jasonwilliams Nov 4, 2020
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
10 changes: 9 additions & 1 deletion docs/API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ const styleguide = styleguidist({
},
{
test: /\.css$/,
loader: 'style-loader!css-loader?modules'
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true
}
}
]
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader',
use: ['style-loader', 'css-loader'],
},
],
},
Expand Down
10 changes: 9 additions & 1 deletion examples/customised/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader?modules',
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
},
},
],
},
{
test: /\.svg$/,
Expand Down
10 changes: 9 additions & 1 deletion examples/express/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader?modules',
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
},
},
],
},
],
},
Expand Down
10 changes: 9 additions & 1 deletion examples/preact/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader?modules',
use: [
'style-loader',
{
loader: 'css-loader',
options: {
modules: true,
},
},
],
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion examples/sections/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader',
use: ['style-loader', 'css-loader'],
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion examples/themed/styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
},
{
test: /\.css$/,
loader: 'style-loader!css-loader',
use: ['style-loader', 'css-loader'],
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions examples/webpack/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
presets: [
[
'@babel/env',
'@babel/preset-env',
{
debug: true,
modules: false,
useBuiltIns: 'usage',
corejs: 3,
},
],
'@babel/react',
Expand Down
Loading