diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js index 94afacc1f5..57349327ea 100644 --- a/app/assets/javascripts/discourse/ember-cli-build.js +++ b/app/assets/javascripts/discourse/ember-cli-build.js @@ -66,11 +66,14 @@ module.exports = function (defaults) { }, resolve: { fallback: { + // Sinon needs a `util` polyfill util: require.resolve("util/"), }, }, module: { rules: [ + // Sinon/`util` polyfill accesses the `process` global, + // so we need to provide a mock { test: require.resolve("util/"), use: [ diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 35c1f61ccd..7c8384f3c6 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -76,6 +76,7 @@ "eslint-plugin-qunit": "^7.3.2", "handlebars": "^4.7.7", "html-entities": "^2.3.3", + "imports-loader": "^4.0.1", "js-yaml": "^4.1.0", "jsdom": "^20.0.2", "loader.js": "^4.7.0", @@ -92,6 +93,7 @@ "source-map": "^0.7.4", "terser": "5.10.0", "tippy.js": "^6.3.7", + "util": "^0.12.5", "virtual-dom": "^2.1.1", "webpack": "^5.75.0", "wizard": "1.0.0", @@ -108,8 +110,6 @@ "devDependencies": { "ember-cached-decorator-polyfill": "^1.0.1", "ember-cli-deprecation-workflow": "^2.1.0", - "ember-exam": "^8.0.0", - "imports-loader": "^4.0.1", - "util": "^0.12.5" + "ember-exam": "^8.0.0" } }