Skip to content

Commit

Permalink
Revert "define webpack loader.exclude with array for extensibility" (#…
Browse files Browse the repository at this point in the history
…4046)

This reverts commit 50b0a47.
  • Loading branch information
erquhart authored and KyleAMathews committed Feb 16, 2018
1 parent b9ceb4c commit 3a713ad
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions packages/gatsby/src/utils/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ module.exports = async (
// Common config for every env.
config.loader(`js`, {
test: /\.jsx?$/, // Accept either .js or .jsx files.
exclude: [/(node_modules|bower_components)/],
exclude: /(node_modules|bower_components)/,
loader: `babel`,
query: babelConfig,
})
Expand Down Expand Up @@ -421,7 +421,7 @@ module.exports = async (
case `develop`:
config.loader(`css`, {
test: /\.css$/,
exclude: [/\.module\.css$/],
exclude: /\.module\.css$/,
loaders: [`style`, `css`, `postcss`],
})

Expand All @@ -446,7 +446,7 @@ module.exports = async (
case `build-css`:
config.loader(`css`, {
test: /\.css$/,
exclude: [/\.module\.css$/],
exclude: /\.module\.css$/,
loader: extractBuildCss.extract([`css?minimize`, `postcss`]),
})

Expand Down Expand Up @@ -476,7 +476,7 @@ module.exports = async (

config.loader(`css`, {
test: /\.css$/,
exclude: [/\.module\.css$/],
exclude: /\.module\.css$/,
loader: `null`,
})

Expand All @@ -501,7 +501,7 @@ module.exports = async (

config.loader(`css`, {
test: /\.css$/,
exclude: [/\.module\.css$/],
exclude: /\.module\.css$/,
// loader: `null`,
loader: extractBuildJavascript.extract([`css`]),
})
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ axios@^0.17.1:
follow-redirects "^1.2.5"
is-buffer "^1.1.5"

"axios@github:contentful/axios#fix/https-via-http-proxy":
axios@contentful/axios#fix/https-via-http-proxy:
version "0.17.1"
resolved "https://codeload.github.com/contentful/axios/tar.gz/4b06f4a63db3ac16c99f7c61b584ef0e6d11f1af"
dependencies:
Expand Down Expand Up @@ -11307,9 +11307,9 @@ [email protected]:
mdast-util-to-hast "^2.1.1"
xtend "^4.0.1"

remark-math@^0.2.4:
version "0.2.4"
resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-0.2.4.tgz#f027cf7f984108777c23425905bf0cbfeeeddda1"
remark-math@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-1.0.3.tgz#e8cda5af8cd8a85fc7782ccbecf0261943c29b9a"
dependencies:
trim-trailing-lines "^1.1.0"

Expand Down

0 comments on commit 3a713ad

Please sign in to comment.