Resolved merge conflicts.

This commit is contained in:
William Welling
2016-12-02 07:46:21 -06:00
8 changed files with 93 additions and 12 deletions

View File

@@ -2,6 +2,7 @@ var webpack = require('webpack');
var path = require('path');
var clone = require('js.clone');
var webpackMerge = require('webpack-merge');
let CopyWebpackPlugin = require('copy-webpack-plugin');
export var commonPlugins = [
new webpack.ContextReplacementPlugin(
@@ -13,6 +14,11 @@ export var commonPlugins = [
}
),
new CopyWebpackPlugin([{
from: path.join(__dirname, 'resources', 'i18n'),
to: path.join('assets', 'i18n')
}]),
// Loader options
new webpack.LoaderOptionsPlugin({
options: {