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

fix(gatsby): compile themes through default webpack config #13651

Merged
merged 12 commits into from
May 14, 2019
Merged

fix(gatsby): compile themes through default webpack config #13651

Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
85e9544
added includes for themes in webpack config
Apr 26, 2019
6d211b3
Merge branch 'master' of github.com:gatsbyjs/gatsby into topic-themes…
Apr 29, 2019
808129b
altered check for themes in if statement
Apr 29, 2019
8f23a98
fixed possible issue with false positive in if check
Apr 29, 2019
93a3466
Merge branch 'master' of github.com:gatsbyjs/gatsby into topic-themes…
May 2, 2019
a32dec0
Update packages/gatsby/src/utils/webpack.config.js
ChristopherBiscardi May 5, 2019
88806ad
Update packages/gatsby/src/utils/webpack.config.js
ChristopherBiscardi May 5, 2019
a7e797f
Merge branch 'master' of github.com:gatsbyjs/gatsby into topic-themes…
May 10, 2019
ca1e714
updated includes > include and actually altering configRules
May 10, 2019
bed1cac
Merge branch 'topic-themes-apply-webpack' of github.com:grantglidewel…
May 10, 2019
72a51bc
Merge remote-tracking branch 'origin/master' into topic-themes-apply-…
pieh May 14, 2019
b812c0e
chore: format
pieh May 14, 2019
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
13 changes: 13 additions & 0 deletions packages/gatsby/src/utils/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,19 @@ module.exports = async (
rules.media(),
rules.miscAssets(),
]
if (
store.getState().themes.themes
) {
configRules.concat(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one probably needs to be

configRules = configRules.concat...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, true as concat would not alter the original array

store.getState().themes.themes.map(theme => {
return {
test: /\.jsx?$/,
includes: theme.themeDir,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think the rule option is called include vs includes

https://webpack.js.org/configuration/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, good catch

use: [loaders.js()],
}
})
)
}
switch (stage) {
case `develop`: {
// get schema to pass to eslint config and program for directory
Expand Down