From c707ee714d91418f5661c24b337acd287bc7cc02 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 12 Oct 2022 11:14:41 +0100 Subject: [PATCH] DEV: Use npm for forked backburner.js version (#18559) Using a git-sourced package seems to cause intermittent `yarn install` failures. Followup to ad37c6c017ad3a1fd35bff7ec11052e31caac1e4 --- app/assets/javascripts/discourse/ember-cli-build.js | 3 ++- app/assets/javascripts/discourse/package.json | 2 +- app/assets/javascripts/yarn.lock | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js index 1aaa6369ea7..8c3d2f45289 100644 --- a/app/assets/javascripts/discourse/ember-cli-build.js +++ b/app/assets/javascripts/discourse/ember-cli-build.js @@ -83,7 +83,8 @@ module.exports = function (defaults) { vendorFiles: { // Freedom patch - includes bug fix and async stack support // https://github.com/discourse/backburner.js/commits/discourse-patches - backburner: "node_modules/backburner.js/dist/named-amd/backburner.js", + backburner: + "node_modules/@discourse/backburner.js/dist/named-amd/backburner.js", }, }); diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 9faf821c314..c1e070d853a 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -19,6 +19,7 @@ "@babel/core": "^7.19.3", "@babel/standalone": "^7.19.3", "@discourse/itsatrap": "^2.0.10", + "@discourse/backburner.js": "^2.7.1-0", "@ember/jquery": "^2.0.0", "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.4", @@ -37,7 +38,6 @@ "admin": "^1.0.0", "discourse-plugins": "^1.0.0", "babel-plugin-ember-template-compilation": "^1.0.2", - "backburner.js": "https://github.com/discourse/backburner.js#discourse-patches", "bootstrap": "3.4.1", "broccoli-asset-rev": "^3.0.0", "deepmerge": "^4.2.2", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index cafb17aaa29..676e2eb7ebd 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -1032,6 +1032,11 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@discourse/backburner.js@^2.7.1-0": + version "2.7.1-0" + resolved "https://registry.yarnpkg.com/@discourse/backburner.js/-/backburner.js-2.7.1-0.tgz#0fc5f93c8f3ee013af2beed55d30ff10362d8f06" + integrity sha512-r0cjllX/niPSxot/lpz0Tj9CXmyYoFE6kvEN9oL0D0sOGpknmK9FielZqcPGxuD/Z8vOb67penUElHRjH+F4cQ== + "@discourse/itsatrap@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@discourse/itsatrap/-/itsatrap-2.0.10.tgz#c7e750eeb32b54e769e952c4ecc472213eb1385a" @@ -2581,10 +2586,6 @@ backbone@^1.1.2: dependencies: underscore ">=1.8.3" -"backburner.js@https://github.com/discourse/backburner.js#discourse-patches": - version "2.7.0" - resolved "https://github.com/discourse/backburner.js#4b227c302c8a2bfa604dcdcca3802ed018423683" - backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"