Merge pull request #1713 from Julien-prrs/patch-1

Avoid conflic between multiple WebPack config - webpack.config.js [MAILPOET-1715]
2019-01-07 07:57:48 -05:00
parent a13a18875b 8562e486a6
commit ee55e815bc
1 changed files with 2 additions and 1 deletions
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,7 +20,8 @@ var baseConfig = {
  output: {
    path: path.join(__dirname, 'assets/js'),
    filename: (PRODUCTION_ENV) ? '[name].[hash:8].js' : '[name].js',
-    chunkFilename: (PRODUCTION_ENV) ? '[name].[hash:8].chunk.js' : '[name].chunk.js'
+    chunkFilename: (PRODUCTION_ENV) ? '[name].[hash:8].chunk.js' : '[name].chunk.js',
+    jsonpFunction: 'mailpoetJsonp'
  },
  resolve: {
    modules: [