diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-03 11:16:56 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-03 11:56:34 -0500 |
| commit | eb548e6eb14907e1d362a2e47e81498195a74183 (patch) | |
| tree | 3dffd86c9b842aaf8cd3a1c5fcf2068134736ab1 /config/webpack.config.js | |
| parent | b2d90ea1fb16ec4db441c86262191a093401b962 (diff) | |
| download | gitlab-ce-eb548e6eb14907e1d362a2e47e81498195a74183.tar.gz | |
adjust IDE page loading config to ensure web workers are not loaded cross-origin
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 2ac0e204f03..7c191a973fd 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -57,7 +57,6 @@ function generateEntries() { const manualEntries = { default: defaultEntries, raven: './raven/index.js', - ide: './ide/index.js', }; return Object.assign(manualEntries, autoEntries); @@ -75,6 +74,7 @@ const config = { publicPath: '/assets/webpack/', filename: IS_PRODUCTION ? '[name].[chunkhash].bundle.js' : '[name].bundle.js', chunkFilename: IS_PRODUCTION ? '[name].[chunkhash].chunk.js' : '[name].chunk.js', + globalObject: 'this', // allow HMR and web workers to play nice }, optimization: { @@ -129,15 +129,7 @@ const config = { }, { test: /\_worker\.js$/, - use: [ - { - loader: 'worker-loader', - options: { - inline: true, - }, - }, - { loader: 'babel-loader' }, - ], + use: ['worker-loader', 'babel-loader'], }, { test: /\.(worker(\.min)?\.js|pdf|bmpr)$/, |