diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js index e22b64adb45..abd43ee512a 100644 --- a/app/assets/javascripts/discourse/ember-cli-build.js +++ b/app/assets/javascripts/discourse/ember-cli-build.js @@ -70,9 +70,6 @@ module.exports = function (defaults) { util: require.resolve("util/"), // Also for sinon timers: false, - // For source-map-support - path: require.resolve("path-browserify"), - fs: false, }, }, module: { @@ -225,13 +222,6 @@ module.exports = function (defaults) { }, }, }, - resolve: { - fallback: { - // For source-map-support - path: require.resolve("path-browserify"), - fs: false, - }, - }, }, }, }); diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 37c4beac8f5..f398582008d 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -95,7 +95,6 @@ "loader.js": "^4.7.0", "message-bus-client": "^4.3.8", "messageformat": "0.1.5", - "path-browserify": "^1.0.1", "pretender": "^3.4.7", "qunit": "^2.20.0", "qunit-dom": "^2.0.0", @@ -104,7 +103,6 @@ "sinon": "^16.0.0", "float-kit": "1.0.0", "source-map": "^0.7.4", - "source-map-support": "^0.5.21", "terser": "^5.20.0", "truth-helpers": "1.0.0", "util": "^0.12.5", diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js index 3dd3709d834..60b010d5bb3 100644 --- a/app/assets/javascripts/discourse/tests/setup-tests.js +++ b/app/assets/javascripts/discourse/tests/setup-tests.js @@ -42,13 +42,6 @@ import SiteSettingService from "discourse/services/site-settings"; import jQuery from "jquery"; import { setupDeprecationCounter } from "discourse/tests/helpers/deprecation-counter"; import { configureRaiseOnDeprecation } from "discourse/tests/helpers/raise-on-deprecation"; -import SourceMapSupport from "source-map-support"; - -// Updates Error.stack to include source-mapped locations. -// Makes QUnit errors more human-readable -SourceMapSupport.install({ - handleUncaughtExceptions: false, -}); const Plugin = $.fn.modal; const Modal = Plugin.Constructor; @@ -309,18 +302,8 @@ export default function setupTests(config) { throw new Error(error); }; - pretender.checkPassthrough = (request) => { - const requestUrl = new URL(request.url, location.href); - if ( - requestUrl.origin === location.origin && - requestUrl.pathname.startsWith("/assets/") - ) { - // Likely a request from source-map-support package - return true; - } - - return request.requestHeaders["Discourse-Script"]; - }; + pretender.checkPassthrough = (request) => + request.requestHeaders["Discourse-Script"]; applyPretender(ctx.module, pretender, pretenderHelpers()); @@ -412,7 +395,6 @@ export default function setupTests(config) { setupToolbar(); reportMemoryUsageAfterTests(); patchFailedAssertion(); - patchStacktraceOrigin(); if (!hasPluginJs && !hasThemeJs) { configureRaiseOnDeprecation(); @@ -440,25 +422,6 @@ function patchFailedAssertion() { }; } -/** - * Stacktraces tend to look something like `http://localhost:4200/assets/...`. - * This patch removes the `http://localhost:4200` part to make things cleaner. - */ -function patchStacktraceOrigin() { - const oldPushResult = QUnit.assert.pushResult; - - QUnit.assert.pushResult = function (resultInfo) { - if (resultInfo.source) { - resultInfo.source = resultInfo.source.replaceAll( - `${window.origin}/`, - "/" - ); - } - - oldPushResult.call(this, resultInfo); - }; -} - function handleLegacyParameters() { for (const param of [ "qunit_single_plugin", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 4d006b45310..95afcc91ae1 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -8782,11 +8782,6 @@ patch-package@^8.0.0: tmp "^0.0.33" yaml "^2.2.2" -path-browserify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" - integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -9866,7 +9861,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.21, source-map-support@~0.5.20: +source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==