Commit 79f261c5 by Johannes Edmeier

Less global provides

parent 4329ed8d
...@@ -78,7 +78,11 @@ module.exports = { ...@@ -78,7 +78,11 @@ module.exports = {
loader: 'eslint', loader: 'eslint',
exclude: [/node_modules/, /third-party/], exclude: [/node_modules/, /third-party/],
}], }],
loaders: [{ loaders: [
{
test: /^jolokia$/,
loader: "imports?$=jquery"
}, {
test: /\.js$/, test: /\.js$/,
exclude: [/node_modules/, /third-party/], exclude: [/node_modules/, /third-party/],
loader: 'ng-annotate' loader: 'ng-annotate'
...@@ -110,8 +114,6 @@ module.exports = { ...@@ -110,8 +114,6 @@ module.exports = {
new CleanWebpackPlugin([DIST]), new CleanWebpackPlugin([DIST]),
new ExtractTextPlugin('[name].css'), new ExtractTextPlugin('[name].css'),
new Webpack.ProvidePlugin({ new Webpack.ProvidePlugin({
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery' 'window.jQuery': 'jquery'
}), }),
new NgAnnotatePlugin({ new NgAnnotatePlugin({
...@@ -130,7 +132,8 @@ module.exports = { ...@@ -130,7 +132,8 @@ module.exports = {
}], { }], {
ignore: ['*.tpl.html'] ignore: ['*.tpl.html']
}) })
].concat(!isDevServer ? [] : new ModuleConcatPlugin([{ ].concat(!isDevServer ? [] : new ModuleConcatPlugin([
{
filename: 'all-modules.js', filename: 'all-modules.js',
test: /module\.js/, test: /module\.js/,
delimiter: ';\n' delimiter: ';\n'
......
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