diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /config/webpack.config.js | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index a0c65ed4012..fd58e22bb99 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -312,22 +312,27 @@ module.exports = { test: /\.mjs$/, use: [], }, + { + test: /(@cubejs-client\/vue).*\.(js)?$/, + include: /node_modules/, + loader: 'babel-loader', + }, WEBPACK_USE_ESBUILD_LOADER && { - test: /\.js$/, + test: /\.(js|cjs)$/, exclude: (modulePath) => /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath), loader: 'esbuild-loader', options: esbuildConfiguration, }, !WEBPACK_USE_ESBUILD_LOADER && { - test: /\.js$/, + test: /\.(js|cjs)$/, exclude: (modulePath) => /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath), loader: 'babel-loader', options: defaultJsOptions, }, WEBPACK_USE_ESBUILD_LOADER && { - test: /\.js$/, + test: /\.(js|cjs)$/, include: (modulePath) => /node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test( modulePath, @@ -336,7 +341,7 @@ module.exports = { options: esbuildConfiguration, }, !WEBPACK_USE_ESBUILD_LOADER && { - test: /\.js$/, + test: /\.(js|cjs)$/, include: (modulePath) => /node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test( modulePath, |