Do not transform imports to Ember Global on certain version

emberjs · Mar 16, 2021 · a6c3862 · a6c3862
1 parent 0b4cef2
commit a6c3862
Show file tree

Hide file tree

Showing 3 changed files with 123 additions and 13 deletions.
diff --git a/lib/babel-options-util.js b/lib/babel-options-util.js
@@ -98,11 +98,12 @@ function _getDebugMacroPlugins(config) {
   ];
 }
 
-function _emberVersionRequiresModulesAPIPolyfill() {
-  // once a version of Ember ships with the
-  // emberjs/rfcs#176 modules natively this will
-  // be updated to detect that and return false
-  return true;
+function _emberVersionRequiresModulesAPIPolyfill(parent) {
+  let checker = new VersionChecker(parent).for("ember-source", "npm");
+  if (!checker.exists()) {
+    return true;
+  }
+  return checker.lt("3.27.0-alpha.1");
 }
 
 function _emberDataVersionRequiresPackagesPolyfill(project) {
@@ -125,7 +126,7 @@ function _getEmberModulesAPIPolyfill(config, parent, project) {
     return;
   }
 
-  if (_emberVersionRequiresModulesAPIPolyfill()) {
+  if (_emberVersionRequiresModulesAPIPolyfill(parent)) {
     const ignore = _getEmberModulesAPIIgnore(parent, project);
 
     return [

diff --git a/lib/ember-plugins.js b/lib/ember-plugins.js
@@ -46,19 +46,22 @@ function _getDebugMacroPlugins() {
     ],
   ];
 }
-function _emberVersionRequiresModulesAPIPolyfill() {
-  // once a version of Ember ships with the
-  // emberjs/rfcs#176 modules natively this will
-  // be updated to detect that and return false
-  return true;
+function _emberVersionRequiresModulesAPIPolyfill(appRoot) {
+  let packagePath = resolvePackagePath("ember-source", appRoot);
+  if (packagePath === null) {
+    return true;
+  }
+
+  let pkg = require(packagePath);
+  return pkg && semver.lt(pkg.version, "3.27.0-alpha.1");
 }
 
 function _getEmberModulesAPIPolyfill(appRoot, config) {
   if (config.disableEmberModulesAPIPolyfill) {
     return;
   }
 
-  if (_emberVersionRequiresModulesAPIPolyfill()) {
+  if (_emberVersionRequiresModulesAPIPolyfill(appRoot)) {
     const ignore = _getEmberModulesAPIIgnore(appRoot, config);
 
     return [
@@ -128,7 +131,7 @@ function _getEmberDataPackagesPolyfill(appRoot, config) {
 function _getModuleResolutionPlugins(config) {
   if (!config.disableModuleResolution) {
     const resolvePath = require("../lib/relative-module-paths")
-    .resolveRelativeModulePath;
+      .resolveRelativeModulePath;
     return [
       [require.resolve("babel-plugin-module-resolver"), { resolvePath }],
       [

diff --git a/node-tests/addon-test.js b/node-tests/addon-test.js
@@ -216,6 +216,112 @@ describe('ember-cli-babel', function() {
       }));
     });
 
+    describe("Opting out of the ember modules API polyfill", function () {
+      let dependencies;
+
+      beforeEach(function () {
+        dependencies = {};
+        let project = {
+          root: input.path(),
+          emberCLIVersion: () => "2.16.2",
+          dependencies() {
+            return dependencies;
+          },
+          addons: [],
+          targets: {
+            browsers: ["ie 11"],
+          },
+        };
+
+        this.addon = new Addon({
+          project,
+          parent: project,
+          ui: this.ui,
+        });
+
+        project.addons.push(this.addon);
+      });
+
+      function buildEmberSourceFixture(version) {
+        return {
+          node_modules: {
+            "ember-source": {
+              "package.json": JSON.stringify({ name: "ember-source", version }),
+              "index.js": "module.exports = {};",
+            },
+          },
+        };
+      }
+
+      it(
+        "should replace imports with Ember Globals",
+        co.wrap(function* () {
+          const PRE_GLOBAL_RESOLVER_DEPRECATION_VERSION = "3.26.0";
+          dependencies[
+            "ember-source"
+          ] = PRE_GLOBAL_RESOLVER_DEPRECATION_VERSION;
+          input.write(
+            buildEmberSourceFixture(PRE_GLOBAL_RESOLVER_DEPRECATION_VERSION)
+          );
+          input.write({
+            "foo.js": `import Component from '@ember/component'; Component.extend()`,
+            "app.js": `import Application from '@ember/application'; Application.extend()`,
+          });
+
+          subject = this.addon.transpileTree(input.path());
+          output = createBuilder(subject);
+
+          yield output.build();
+
+          expect(output.read()).to.deep.equal({
+            "foo.js": `define("foo", [], function () {\n  "use strict";\n\n  Ember.Component.extend();\n});`,
+            "app.js": `define("app", [], function () {\n  "use strict";\n\n  Ember.Application.extend();\n});`,
+            node_modules: {
+              "ember-source": {
+                "index.js":
+                  'define("node_modules/ember-source/index", [], function () {\n  "use strict";\n\n  module.exports = {};\n});',
+                "package.json": '{"name":"ember-source","version":"3.26.0"}',
+              },
+            },
+          });
+        })
+      );
+
+      it(
+        "should not replace the imports with Ember Globals when using an ember-source version that supports it",
+        co.wrap(function* () {
+          const POST_GLOBAL_RESOLVER_DEPRECATION_VERSION = "3.27.0";
+          dependencies[
+            "ember-source"
+          ] = POST_GLOBAL_RESOLVER_DEPRECATION_VERSION;
+          input.write(
+            buildEmberSourceFixture(POST_GLOBAL_RESOLVER_DEPRECATION_VERSION)
+          );
+          input.write({
+            "foo.js": `import Component from '@ember/component'; Component.extend()`,
+            "app.js": `import Application from '@ember/application'; Application.extend()`,
+          });
+
+          subject = this.addon.transpileTree(input.path());
+          output = createBuilder(subject);
+
+          yield output.build();
+
+          expect(output.read()).to.deep.equal({
+            "foo.js": `define("foo", ["@ember/component"], function (_component) {\n  "use strict";\n\n  _component.default.extend();\n});`,
+            "app.js": `define("app", ["@ember/application"], function (_application) {\n  "use strict";\n\n  _application.default.extend();\n});`,
+            node_modules: {
+              "ember-source": {
+                "index.js":
+                  'define("node_modules/ember-source/index", [], function () {\n  "use strict";\n\n  module.exports = {};\n});',
+                "package.json": '{"name":"ember-source","version":"3.27.0"}',
+              },
+            },
+          });
+        })
+      );
+    });
+
     describe('debug macros', function() {
       it("can opt-out via ember-cli-babel.disableDebugTooling", co.wrap(function* () {
         process.env.EMBER_ENV = 'development';