Skip to content

Commit

Permalink
Use new webpack api schema
Browse files Browse the repository at this point in the history
  • Loading branch information
QWp6t committed Nov 15, 2016
1 parent 70ebba7 commit e6e60aa
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions assets/build/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ const sourceMapQueryStr = (config.enabled.sourceMaps) ? '+sourceMap' : '-sourceM
const jsLoader = {
test: /\.js$/,
exclude: [/(node_modules|bower_components)(?![/|\\](bootstrap|foundation-sites))/],
loaders: [{
use: [{
loader: 'buble',
query: { objectAssign: 'Object.assign' },
options: { objectAssign: 'Object.assign' },
}],
};

if (config.enabled.watcher) {
jsLoader.loaders.unshift('monkey-hot?sourceType=module');
jsLoader.use.unshift('monkey-hot?sourceType=module');
}

let webpackConfig = {
Expand Down Expand Up @@ -71,7 +71,7 @@ let webpackConfig = {
{
test: /\.(png|jpe?g|gif|svg|ico)$/,
include: config.paths.assets,
loaders: [
use: [
`file?${qs.stringify({
name: `[path]${assetsFilenames}.[ext]`,
})}`,
Expand All @@ -97,7 +97,7 @@ let webpackConfig = {
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg)$/,
include: /node_modules|bower_components/,
loader: 'file',
query: {
options: {
name: `vendor/${config.cacheBusting}.[ext]`,
},
},
Expand Down

0 comments on commit e6e60aa

Please sign in to comment.