Commit fc369fa2 authored by Naoyuki Kanezawa's avatar Naoyuki Kanezawa Committed by Guillermo Rauch

webpack: emit json and apply json-loader after emitting files (#298)

parent f9726a5d
...@@ -74,8 +74,19 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa ...@@ -74,8 +74,19 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa
const babelRuntimePath = require.resolve('babel-runtime/package') const babelRuntimePath = require.resolve('babel-runtime/package')
.replace(/[\\/]package\.json$/, '') .replace(/[\\/]package\.json$/, '')
const loaders = [{ const loaders = (hotReload ? [{
test: /\.js$/, test: /\.js$/,
loader: 'hot-self-accept-loader',
include: [
join(dir, 'pages'),
nextPagesDir
]
}] : [])
.concat([{
test: /\.json$/,
loader: 'json-loader'
}, {
test: /\.(js|json)$/,
loader: 'emit-file-loader', loader: 'emit-file-loader',
include: [dir, nextPagesDir], include: [dir, nextPagesDir],
exclude (str) { exclude (str) {
...@@ -84,16 +95,7 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa ...@@ -84,16 +95,7 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa
query: { query: {
name: 'dist/[path][name].[ext]' name: 'dist/[path][name].[ext]'
} }
}] }, {
.concat(hotReload ? [{
test: /\.js$/,
loader: 'hot-self-accept-loader',
include: [
join(dir, 'pages'),
nextPagesDir
]
}] : [])
.concat([{
loader: 'babel', loader: 'babel',
include: nextPagesDir, include: nextPagesDir,
query: { query: {
...@@ -180,9 +182,6 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa ...@@ -180,9 +182,6 @@ export default async function createCompiler (dir, { hotReload = false, dev = fa
}, },
plugins, plugins,
module: { module: {
preLoaders: [
{ test: /\.json$/, loader: 'json-loader' }
],
loaders loaders
}, },
customInterpolateName: function (url, name, opts) { customInterpolateName: function (url, name, opts) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment