feat: Improve config handling for polyfillUUID (#9265)

* feat: Improve config handling for polyfillUUID * add polyfillUUID config for graph addon * remove: duplicate addon-main.js in packages/graph
emberjs · Mar 19, 2024 · aa0a34a · aa0a34a
1 parent f6ae038
commit aa0a34a
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 99 deletions.
diff --git a/README.md b/README.md
@@ -125,12 +125,8 @@ activate this polyfill:
 
 ```ts
 let app = new EmberApp(defaults, {
-  '@embroider/macros': {
-    setConfig: {
-      '@ember-data/store': {
-        polyfillUUID: true,
-      },
-    },
+  emberData: {
+    polyfillUUID: true
   },
 });
 ```

diff --git a/packages/adapter/addon-main.js b/packages/adapter/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/core-types/addon-main.cjs b/packages/core-types/addon-main.cjs
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/graph/addon-main.cjs b/packages/graph/addon-main.cjs
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/graph/addon-main.js b/packages/graph/addon-main.js
diff --git a/packages/json-api/addon-main.js b/packages/json-api/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/legacy-compat/addon-main.js b/packages/legacy-compat/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/model/addon-main.js b/packages/model/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

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
@@ -118,6 +118,7 @@ function addonBuildConfigForDataPackage(pkg) {
       let options = (app.options = app.options || {});
       options.emberData = options.emberData || {};
       options.emberData.debug = options.emberData.debug || {};
+      options.emberData.polyfillUUID = options.emberData.polyfillUUID ?? false;
       const hostOptions = options.emberData;
       const debugOptions = Object.assign(
         {
@@ -157,6 +158,7 @@ function addonBuildConfigForDataPackage(pkg) {
 
       // copy configs forward
       const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+      ownConfig.polyfillUUID = options.emberData.polyfillUUID;
       ownConfig.compatWith = options.emberData.compatWith || null;
       ownConfig.debug = debugOptions;
       ownConfig.deprecations = Object.assign(

diff --git a/packages/request/addon-main.js b/packages/request/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/schema-record/addon-main.js b/packages/schema-record/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/serializer/addon-main.js b/packages/serializer/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/store/addon-main.js b/packages/store/addon-main.js
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});

diff --git a/packages/tracking/addon-main.cjs b/packages/tracking/addon-main.cjs
@@ -58,6 +58,7 @@ module.exports = {
 
     // copy configs forward
     const ownConfig = this.options['@embroider/macros'].setOwnConfig;
+    ownConfig.polyfillUUID = hostOptions.polyfillUUID ?? false;
     ownConfig.compatWith = hostOptions.compatWith || null;
     ownConfig.debug = debugOptions;
     ownConfig.deprecations = Object.assign(DEPRECATIONS, ownConfig.deprecations || {}, hostOptions.deprecations || {});