github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 13:53:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Apply ember-this-fallback patches sequentially (#23407)

Browse Source
This commit is contained in:
Jarek Radosz 2023-09-05 12:50:15 +02:00 committed by GitHub
parent 7d0d0e48bc
commit 2dbec2e836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/javascripts/patches/ember-this-fallback+0.3.1+001+initial.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/node_modules/ember-this-fallback/index.js b/node_modules/ember-this-fallback/index.js
index afa73eb..168bb16 100644
--- a/node_modules/ember-this-fallback/index.js
+++ b/node_modules/ember-this-fallback/index.js
@@ -8,7 +8,7 @@ module.exports = {
setupPreprocessorRegistry(type, registry) {
if (type === 'parent') {
- const options = getOptions(findHost(this));
+ const options = getOptions(this.parent); // findHost doesn't work for us - not sure why
registry.add('htmlbars-ast-plugin', this._buildPlugin(options));
}
},
diff --git a/node_modules/ember-this-fallback/lib/helpers/deprecations.js b/node_modules/ember-this-fallback/lib/helpers/deprecations.js
index 5a00c44..993e3cf 100644
--- a/node_modules/ember-this-fallback/lib/helpers/deprecations.js
+++ b/node_modules/ember-this-fallback/lib/helpers/deprecations.js
@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.deprecationOptionsFor = void 0;
const assert_1 = __importDefault(require("../types/assert"));
const CURRENT_DEPRECATIONS = [
+ [
+ 'this-property-fallback',
{
- id: 'this-property-fallback',
+ id: 'ember-this-fallback.this-property-fallback', // Updating deprecation id so we can distinguish it from Ember's
until: 'n/a',
for: 'ember-this-fallback',
url: 'https://deprecations.emberjs.com/v3.x#toc_this-property-fallback',
@@ -15,8 +17,9 @@ const CURRENT_DEPRECATIONS = [
available: '0.2.0',
},
},
+ ]
];
-const DEPRECATION_OPTIONS_MAP = new Map(CURRENT_DEPRECATIONS.map((options) => [options.id, options]));
+const DEPRECATION_OPTIONS_MAP = new Map(CURRENT_DEPRECATIONS);
function deprecationOptionsFor(id) {
const options = DEPRECATION_OPTIONS_MAP.get(id);
(0, assert_1.default)(`expected to find DeprecationOptions for id=${id}`, options);

36
app/assets/javascripts/patches/ember-this-fallback+0.3.1.patch → app/assets/javascripts/patches/ember-this-fallback+0.3.1+002+themes.patch
View File

@ -2,15 +2,6 @@ diff --git a/node_modules/ember-this-fallback/index.js b/node_modules/ember-this
index afa73eb..21e9411 100644
--- a/node_modules/ember-this-fallback/index.js
+++ b/node_modules/ember-this-fallback/index.js
@@ -8,7 +8,7 @@ module.exports = {
setupPreprocessorRegistry(type, registry) {
if (type === 'parent') {
- const options = getOptions(findHost(this));
+ const options = getOptions(this.parent); // findHost doesn't work for us - not sure why
registry.add('htmlbars-ast-plugin', this._buildPlugin(options));
}
},
@@ -17,15 +17,20 @@ module.exports = {
ThisFallbackPlugin.baseDir = () => __dirname;
ThisFallbackPlugin.cacheKey = () => 'ember-this-fallback';
@ -37,33 +28,6 @@ index afa73eb..21e9411 100644
},
};
diff --git a/node_modules/ember-this-fallback/lib/helpers/deprecations.js b/node_modules/ember-this-fallback/lib/helpers/deprecations.js
index 5a00c44..993e3cf 100644
--- a/node_modules/ember-this-fallback/lib/helpers/deprecations.js
+++ b/node_modules/ember-this-fallback/lib/helpers/deprecations.js
@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.deprecationOptionsFor = void 0;
const assert_1 = __importDefault(require("../types/assert"));
const CURRENT_DEPRECATIONS = [
+ [
+ 'this-property-fallback',
{
- id: 'this-property-fallback',
+ id: 'ember-this-fallback.this-property-fallback', // Updating deprecation id so we can distinguish it from Ember's
until: 'n/a',
for: 'ember-this-fallback',
url: 'https://deprecations.emberjs.com/v3.x#toc_this-property-fallback',
@@ -15,8 +17,9 @@ const CURRENT_DEPRECATIONS = [
available: '0.2.0',
},
},
+ ]
];
-const DEPRECATION_OPTIONS_MAP = new Map(CURRENT_DEPRECATIONS.map((options) => [options.id, options]));
+const DEPRECATION_OPTIONS_MAP = new Map(CURRENT_DEPRECATIONS);
function deprecationOptionsFor(id) {
const options = DEPRECATION_OPTIONS_MAP.get(id);
(0, assert_1.default)(`expected to find DeprecationOptions for id=${id}`, options);
diff --git a/node_modules/ember-this-fallback/lib/helpers/logger.js b/node_modules/ember-this-fallback/lib/helpers/logger.js
index b856edc..afb059a 100644
--- a/node_modules/ember-this-fallback/lib/helpers/logger.js