diff options
Diffstat (limited to 'app/assets/javascripts/lib/utils/webpack.js')
| -rw-r--r-- | app/assets/javascripts/lib/utils/webpack.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index 38d2f3d7551..f1e87145406 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -5,10 +5,11 @@ import { joinPaths } from '~/lib/utils/url_utility'; * See https://gitlab.com/gitlab-org/gitlab/-/issues/321656 for a fix */ export function resetServiceWorkersPublicPath() { + // No-op if we're running Vite instead of Webpack + if (typeof __webpack_public_path__ === 'undefined') return; // eslint-disable-line camelcase // __webpack_public_path__ is a global variable that can be used to adjust // the webpack publicPath setting at runtime. // see: https://webpack.js.org/guides/public-path/ const relativeRootPath = (gon && gon.relative_url_root) || ''; - const webpackAssetPath = joinPaths(relativeRootPath, '/assets/webpack/'); - __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase + __webpack_public_path__ = joinPaths(relativeRootPath, '/assets/webpack/'); // eslint-disable-line camelcase } |