Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Use npm for forked backburner.js version (#18559) 

Using a git-sourced package seems to cause intermittent `yarn install` failures.

Followup to ad37c6c017
This commit is contained in:
David Taylor 2022-10-12 11:14:41 +01:00 committed by GitHub
parent ad37c6c017
commit c707ee714d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/ember-cli-build.js
View File

@ -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",
},
});

2
app/assets/javascripts/discourse/package.json
View File

@ -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",

9
app/assets/javascripts/yarn.lock
View File

@ -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"