[BUGFIX] rollup step should deactivate ember modules polyfill >= 3.27 (…

…#7527) * disable modules polyfills when transpiling for rollup * implement fix * fix lint * fix expansion * better comment
emberjs · May 26, 2021 · af58229 · af58229
1 parent d431556
commit af58229
Show file tree

Hide file tree

Showing 22 changed files with 287 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -69,9 +69,9 @@
     "command-line-args": "^5.1.1",
     "common-tags": "^1.8.0",
     "debug": "^4.1.1",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
@@ -88,7 +88,6 @@
     "ember-cli-version-checker": "^5.1.1",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-compatibility-helpers": "^1.2.0",
-    "ember-decorators-polyfill": "^1.1.5",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",

diff --git a/packages/-ember-data/ember-cli-build.js b/packages/-ember-data/ember-cli-build.js
@@ -16,6 +16,7 @@ module.exports = function(defaults) {
     },
     'ember-cli-babel': {
       throwUnlessParallelizable: true,
+      includeExternalHelpers: true,
     },
     'ember-cli-terser': {
       exclude: ['assets/dummy.js', 'assets/tests.js', 'assets/test-support.js', 'dist/docs/*', 'docs/*'],

diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -34,8 +34,8 @@
     "@ember/string": "^1.0.0",
     "@glimmer/env": "^0.1.7",
     "broccoli-merge-trees": "^4.2.0",
-    "ember-cli-babel": "^7.26.3",
-    "ember-cli-typescript": "^4.0.0",
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-typescript": "^4.1.0",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
@@ -68,7 +68,6 @@
     "ember-cli-typescript-blueprints": "^3.0.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-compatibility-helpers": "^1.2.0",
-    "ember-decorators-polyfill": "^1.1.5",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -24,7 +24,7 @@
     "@ember-data/store": "3.27.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },
@@ -61,4 +61,4 @@
     "node": "12.16.2",
     "yarn": "1.22.4"
   }
-}
+}
diff --git a/packages/canary-features/package.json b/packages/canary-features/package.json
@@ -14,8 +14,8 @@
   },
   "scripts": {},
   "dependencies": {
-    "ember-cli-babel": "^7.26.3",
-    "ember-cli-typescript": "^4.0.0"
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-typescript": "^4.1.0"
   },
   "devDependencies": {
     "babel-plugin-debug-macros": "^0.3.3",

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -22,7 +22,7 @@
     "@ember-data/private-build-infra": "3.27.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },
@@ -59,4 +59,4 @@
     "node": "12.16.2",
     "yarn": "1.22.4"
   }
-}
+}
diff --git a/packages/model/package.json b/packages/model/package.json
@@ -26,7 +26,7 @@
     "@ember-data/store": "3.27.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0",

diff --git a/packages/private-build-infra/package.json b/packages/private-build-infra/package.json
@@ -27,7 +27,7 @@
     "broccoli-rollup": "^4.1.1",
     "calculate-cache-key-for-tree": "^2.0.0",
     "chalk": "^4.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-typescript": "^3.1.3",
@@ -48,4 +48,4 @@
     "node": "12.16.2",
     "yarn": "1.22.4"
   }
-}
+}
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
@@ -2,6 +2,7 @@ const calculateCacheKeyForTree = require('calculate-cache-key-for-tree');
 const Funnel = require('broccoli-funnel');
 const merge = require('broccoli-merge-trees');
 const BroccoliDebug = require('broccoli-debug');
+const VersionChecker = require('ember-cli-version-checker');
 
 const rollupPrivateModule = require('./utilities/rollup-private-module');
 
@@ -104,7 +105,7 @@ function addonBuildConfigForDataPackage(PackageName) {
       let compatVersion = this.getEmberDataConfig().compatWith || null;
 
       let customPlugins = require('./stripped-build-plugins')(process.env.EMBER_ENV, this._findHost(), compatVersion);
-      let plugins = existingPlugins.map(plugin => {
+      let plugins = existingPlugins.map((plugin) => {
         return Array.isArray(plugin) ? plugin : [plugin];
       });
       plugins = plugins.concat(customPlugins.plugins);
@@ -149,12 +150,29 @@ function addonBuildConfigForDataPackage(PackageName) {
       tree = this.debugTree(tree, 'input');
       this._setupBabelOptions();
 
-      let babel = this.addons.find(addon => addon.name === 'ember-cli-babel');
+      let babel = this.addons.find((addon) => addon.name === 'ember-cli-babel');
+      let externalDeps = this.externalDependenciesForPrivateModule();
+
+      const host = this._findHost();
+
+      // don't print this for consumers
+      if (this.isDevelopingAddon()) {
+        // eslint-disable-next-line no-console
+        console.log(
+          `Rolling up ${this.name} private modules with the following external dependencies: ['${externalDeps.join(
+            "', '"
+          )}']`
+        );
+      }
+      let checker = new VersionChecker(this.project);
+      let emberVersion = checker.for('ember-source');
 
       let privateTree = rollupPrivateModule(tree, {
         packageName: PackageName,
         babelCompiler: babel,
         babelOptions: this.options.babel,
+        emberVersion: emberVersion,
+        emberCliBabelOptions: host.options && host.options['ember-cli-babel'] ? host.options['ember-cli-babel'] : {},
         onWarn: this._suppressUneededRollupWarnings.bind(this),
         externalDependencies: this.externalDependenciesForPrivateModule(),
         destDir: this.getOutputDirForVersion(),

diff --git a/packages/private-build-infra/src/utilities/rollup-private-module.js b/packages/private-build-infra/src/utilities/rollup-private-module.js
@@ -12,12 +12,53 @@ module.exports = function rollupPrivateModule(tree, options) {
     destDir: '-private',
   });
 
+  const emberCliBabelOptions = {
+    // we leave our output as valid ES
+    // for the consuming app's config to transpile as desired
+    // so we don't want to compileModules to amd here
+    compileModules: false,
+
+    // we never need this on our own stuff
+    disableEmberDataPackagesPolyfill: true,
+
+    // TODO for the embroider world we want to leave our -private module
+    // as an es module and only transpile the few things we genuinely care about.
+    // ideally this would occur as a pre-publish step so that consuming apps would
+    // just see a `-private.js` file and not pay any additional costs.
+    // CURRENTLY we transpile the -private module fully acccording to the
+    // consuming app's config, so we must leave these enabled.
+    disablePresetEnv: false,
+    disableDebugTooling: false,
+    disableDecoratorTransforms: false,
+
+    throwUnlessParallelizable: true,
+
+    // consuming app will take care of this if needed,
+    // we don't need to also include
+    includePolyfill: false,
+
+    // defer to consuming app's selection
+    // necessary as only consuming app can set this, must only have
+    // one copy
+    includeExternalHelpers: options.emberCliBabelOptions.includeExternalHelpers || false,
+
+    extensions: ['js', 'ts'],
+  };
+
+  // and we don't want
+  // to convert imports to globals when real modules is possible
+  // this is necessary because compileModules: false forces globals
+  // conversion without it.
+  if (options.emberVersion.gte('3.27.0')) {
+    // TODO should we just set this all the time?
+    // yes, this needs to be "false" to disable it in 3.27+
+    // when compileModules is false (which it is)
+    emberCliBabelOptions.disableEmberModulesAPIPolyfill = false;
+  }
+
   let privateTree = babelCompiler.transpileTree(debugTree(withPrivate, 'babel-private:input'), {
     babel: babelOptions,
-    'ember-cli-babel': {
-      compileModules: false,
-      extensions: ['js', 'ts'],
-    },
+    'ember-cli-babel': emberCliBabelOptions,
   });
 
   privateTree = debugTree(privateTree, 'babel-private:output');
@@ -27,7 +68,7 @@ module.exports = function rollupPrivateModule(tree, options) {
       output: [
         {
           file: `${packageName}/-private.js`,
-          format: babelCompiler.shouldCompileModules() ? 'amd' : 'es',
+          format: 'amd',
           amd: { id: `${packageName}/-private` },
           exports: 'named',
         },

diff --git a/packages/record-data/package.json b/packages/record-data/package.json
@@ -24,7 +24,7 @@
     "@ember-data/store": "3.27.0",
     "@ember/edition-utils": "^1.2.0",
     "@ember/ordered-set": "^4.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@ember-data/private-build-infra": "3.27.0",
     "@ember-data/store": "3.27.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^4.0.0"
   },

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -23,7 +23,8 @@
     "@ember-data/canary-features": "3.27.0",
     "@ember-data/private-build-infra": "3.27.0",
     "@ember/string": "^1.0.0",
-    "ember-cli-babel": "^7.26.3",
+    "@glimmer/tracking": "^1.0.4",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-typescript": "^4.0.0",
     "heimdalljs": "^0.3.0"

diff --git a/packages/unpublished-adapter-encapsulation-test-app/package.json b/packages/unpublished-adapter-encapsulation-test-app/package.json
@@ -29,9 +29,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-debug-encapsulation-test-app/package.json b/packages/unpublished-debug-encapsulation-test-app/package.json
@@ -28,9 +28,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-fastboot-test-app/package.json b/packages/unpublished-fastboot-test-app/package.json
@@ -31,9 +31,9 @@
     "@types/qunit": "^2.5.3",
     "@types/rsvp": "^4.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-fastboot": "^2.2.1",
     "ember-cli-fastboot-testing": "^0.2.3",

diff --git a/packages/unpublished-model-encapsulation-test-app/package.json b/packages/unpublished-model-encapsulation-test-app/package.json
@@ -29,9 +29,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-record-data-encapsulation-test-app/package.json b/packages/unpublished-record-data-encapsulation-test-app/package.json
@@ -29,9 +29,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-relationship-performance-test-app/package.json b/packages/unpublished-relationship-performance-test-app/package.json
@@ -24,9 +24,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-serializer-encapsulation-test-app/package.json b/packages/unpublished-serializer-encapsulation-test-app/package.json
@@ -28,9 +28,9 @@
     "@ember-data/unpublished-test-infra": "3.27.0",
     "@ember/optional-features": "^1.3.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.25.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli": "~3.26.1",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",

diff --git a/packages/unpublished-test-infra/package.json b/packages/unpublished-test-infra/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@ember-data/private-build-infra": "3.27.0",
     "@ember/edition-utils": "^1.2.0",
-    "ember-cli-babel": "^7.26.3",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-typescript": "^4.0.0",
     "ember-get-config": "^0.2.4",
@@ -55,4 +55,4 @@
     "node": "12.16.2",
     "yarn": "1.22.4"
   }
-}
+}