From 4ae727b0418961d226727b3d6eb707c92842bd2f Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Sun, 20 Jun 2021 17:09:19 +0200 Subject: [PATCH 1/3] Use patched ember-cached-decorator-polyfill --- packages/model/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/model/package.json b/packages/model/package.json index 998ddb47191..ced934e29fe 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -23,7 +23,7 @@ "@ember-data/store": "3.29.0-alpha.10", "@ember/edition-utils": "^1.2.0", "@ember/string": "^1.0.0", - "ember-cached-decorator-polyfill": "^0.1.3", + "ember-cached-decorator-polyfill": "github:dcyriller/ember-cached-decorator-polyfill#fix-addons", "ember-cli-babel": "^7.26.6", "ember-cli-string-utils": "^1.1.0", "ember-cli-test-info": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 9c17e9d2e55..145d33ac886 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6874,10 +6874,9 @@ ember-cache-primitive-polyfill@^1.0.1: ember-compatibility-helpers "^1.2.1" silent-error "^1.1.1" -ember-cached-decorator-polyfill@^0.1.3: +"ember-cached-decorator-polyfill@github:dcyriller/ember-cached-decorator-polyfill#fix-addons": version "0.1.3" - resolved "https://registry.npmjs.org/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.3.tgz#9da71cacad87330e8bf090f922984cb827588a60" - integrity sha512-I3AJ3sJkPoJdSOnXw8E1ww8h9Ly62djVugLySrQhNerOnTSGmbSx/iAXtojFfepo7q29HfUlFcM7DSFp5shQ7g== + resolved "https://codeload.github.com/dcyriller/ember-cached-decorator-polyfill/tar.gz/8a88281537d31305befac361e1b6683011485798" dependencies: "@glimmer/tracking" "^1.0.4" ember-cache-primitive-polyfill "^1.0.1" @@ -7871,7 +7870,8 @@ eslint-module-utils@^2.6.1: pkg-dir "^2.0.0" "eslint-plugin-ember-data@link:./packages/unpublished-eslint-rules": - version "3.29.0-alpha.5" + version "0.0.0" + uid "" eslint-plugin-ember@^10.3.0, eslint-plugin-ember@^10.4.1: version "10.5.1" From eb2c12273e1af0a1827fb658b5b15c71ace2bfa2 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Sun, 20 Jun 2021 17:10:10 +0200 Subject: [PATCH 2/3] Simplify `@cached` transpilation --- .../src/addon-build-config-for-data-package.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/private-build-infra/src/addon-build-config-for-data-package.js b/packages/private-build-infra/src/addon-build-config-for-data-package.js index 5e13c19594e..d9c0918773f 100644 --- a/packages/private-build-infra/src/addon-build-config-for-data-package.js +++ b/packages/private-build-infra/src/addon-build-config-for-data-package.js @@ -174,19 +174,10 @@ function addonBuildConfigForDataPackage(PackageName) { let checker = new VersionChecker(this.project); let emberVersion = checker.for('ember-source'); - const babelOptions = Object.assign({}, this.options.babel); - - // we only want to add this to the options passed to the babel transpiler for the rolled up files - // other files get it from the inherited app config - if (this.pkg.dependencies['ember-cached-decorator-polyfill']) { - babelOptions.plugins = babelOptions.plugins.slice(); - babelOptions.plugins.push([require.resolve('ember-cached-decorator-polyfill/lib/transpile-modules.js')]); // eslint-disable-line - } - let privateTree = rollupPrivateModule(tree, { packageName: PackageName, babelCompiler: babel, - babelOptions, + babelOptions: this.options.babel, emberVersion: emberVersion, emberCliBabelOptions: host.options && host.options['ember-cli-babel'] ? host.options['ember-cli-babel'] : {}, onWarn: this._suppressUneededRollupWarnings.bind(this), From 17974f65e7729abb6e814ab957fcb11b0f477db0 Mon Sep 17 00:00:00 2001 From: Cyrille David Date: Wed, 21 Jul 2021 23:19:29 +0200 Subject: [PATCH 3/3] Use meber-cached-decorator-polyfill 0.1.4 --- packages/model/package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/model/package.json b/packages/model/package.json index ced934e29fe..f1f3a34f26d 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -23,7 +23,7 @@ "@ember-data/store": "3.29.0-alpha.10", "@ember/edition-utils": "^1.2.0", "@ember/string": "^1.0.0", - "ember-cached-decorator-polyfill": "github:dcyriller/ember-cached-decorator-polyfill#fix-addons", + "ember-cached-decorator-polyfill": "^0.1.4", "ember-cli-babel": "^7.26.6", "ember-cli-string-utils": "^1.1.0", "ember-cli-test-info": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 145d33ac886..89d1292d31d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6874,9 +6874,10 @@ ember-cache-primitive-polyfill@^1.0.1: ember-compatibility-helpers "^1.2.1" silent-error "^1.1.1" -"ember-cached-decorator-polyfill@github:dcyriller/ember-cached-decorator-polyfill#fix-addons": - version "0.1.3" - resolved "https://codeload.github.com/dcyriller/ember-cached-decorator-polyfill/tar.gz/8a88281537d31305befac361e1b6683011485798" +ember-cached-decorator-polyfill@^0.1.4: + version "0.1.4" + resolved "https://registry.npmjs.org/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace" + integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA== dependencies: "@glimmer/tracking" "^1.0.4" ember-cache-primitive-polyfill "^1.0.1"