From c27570ede49db8aa335c2b7702679e5bab3e28cb Mon Sep 17 00:00:00 2001
From: Ville Immonen <ville.immonen@iki.fi>
Date: Sun, 28 Aug 2016 20:49:25 +0300
Subject: [PATCH] Allow importing static file outside src and node_modules
folders (#504)
Remove the `include` setting from webpack loaders for CSS, JSON and other static assets.
This way it's possible to import files from a separate config folder, a parent directory etc.
---
config/webpack.config.dev.js | 4 ----
config/webpack.config.prod.js | 4 ----
2 files changed, 8 deletions(-)
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index b93abcdad..2a66d3dd8 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -112,14 +112,12 @@ module.exports = {
// in development "style" loader enables hot editing of CSS.
{
test: /\.css$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'style!css!postcss'
},
// JSON is not enabled by default in Webpack but both Node and Browserify
// allow it implicitly so we also enable it.
{
test: /\.json$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'json'
},
// "file" loader makes sure those assets get served by WebpackDevServer.
@@ -127,7 +125,6 @@ module.exports = {
// In production, they would get copied to the `build` folder.
{
test: /\.(ico|jpg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
- include: [paths.appSrc, paths.appNodeModules],
exclude: /\/favicon.ico$/,
loader: 'file',
query: {
@@ -147,7 +144,6 @@ module.exports = {
// assets smaller than specified size as data URLs to avoid requests.
{
test: /\.(mp4|webm)(\?.*)?$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'url',
query: {
limit: 10000,
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 8b04ec4b6..48a37d04e 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -114,7 +114,6 @@ module.exports = {
// in the main CSS file.
{
test: /\.css$/,
- include: [paths.appSrc, paths.appNodeModules],
// "?-autoprefixer" disables autoprefixer in css-loader itself:
// https://github.com/webpack/css-loader/issues/281
// We already have it thanks to postcss. We only pass this flag in
@@ -130,7 +129,6 @@ module.exports = {
// allow it implicitly so we also enable it.
{
test: /\.json$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'json'
},
// "file" loader makes sure those assets end up in the `build` folder.
@@ -138,7 +136,6 @@ module.exports = {
{
test: /\.(ico|jpg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
exclude: /\/favicon.ico$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'file',
query: {
name: 'static/media/[name].[hash:8].[ext]'
@@ -157,7 +154,6 @@ module.exports = {
// assets smaller than specified size as data URLs to avoid requests.
{
test: /\.(mp4|webm)(\?.*)?$/,
- include: [paths.appSrc, paths.appNodeModules],
loader: 'url',
query: {
limit: 10000,
--
GitLab