feat(embroider): use only @embroider/test-setup for testing embroider

mainmatter · Jul 31, 2023 · 6e2a256 · 6e2a256
1 parent a012dab
commit 6e2a256
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,13 +94,10 @@ jobs:
             test-suite: "test:one embroider-optimized"
             allow-failure: false
           - workspace: test-app
-            test-suite: "test:one embroider-lts-4.12"
-            allow-failure: false
-          - workspace: test-app
-            test-suite: "test:one embroider-default"
+            test-suite: "test:one embroider-safe"
             allow-failure: false
           - workspace: test-app
-            test-suite: "test:one embroider-ember-5"
+            test-suite: "test:one embroider-optimized"
             allow-failure: false
 
     steps:

diff --git a/packages/ember-simple-auth/src/utils/is-fastboot.js b/packages/ember-simple-auth/src/utils/is-fastboot.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-unused-vars */
 // @ts-check
 import { assert } from '@ember/debug';
-import ApplicationInstance from '@ember/application/instance';
 
 export default function isFastBoot(owner) {
   assert('You must pass in an owner to isFastBoot!', owner && typeof owner.lookup === 'function');

diff --git a/packages/test-app/ember-cli-build.js b/packages/test-app/ember-cli-build.js
@@ -20,20 +20,6 @@ module.exports = function(defaults) {
 
   app.import('node_modules/bootstrap/dist/css/bootstrap.css');
 
-  if (process.env.ESA_TEST_EMBROIDER) {
-    const { Webpack } = require('@embroider/webpack');
-    return require('@embroider/compat').compatBuild(app, Webpack, {
-      staticAddonTestSupportTrees: true,
-      staticAddonTrees: true,
-      staticHelpers: true,
-      staticModifiers: true,
-      staticComponents: true,
-      staticEmberSource: true,
-      packagerOptions: {
-        webpackConfig: {},
-      },
-    });
-  } else {
-    return app.toTree();
-  }
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/test-app/package.json b/packages/test-app/package.json
@@ -22,10 +22,10 @@
     "@ember/optional-features": "2.0.0",
     "@ember/string": "3.1.1",
     "@ember/test-helpers": "3.2.0",
-    "@embroider/compat": "3.2.0",
-    "@embroider/core": "3.2.0",
+    "@embroider/compat": "^3.2.0",
+    "@embroider/core": "^3.2.0",
     "@embroider/test-setup": "3.0.1",
-    "@embroider/webpack": "3.1.4",
+    "@embroider/webpack": "^3.1.4",
     "@glimmer/component": "1.1.2",
     "@glimmer/tracking": "1.1.2",
     "body-parser": "1.20.2",

diff --git a/packages/test-esa/config/ember-try.js b/packages/test-esa/config/ember-try.js
@@ -67,45 +67,6 @@ module.exports = function() {
             },
           },
         },
-        {
-          name: 'embroider-lts-4.12',
-          env: {
-            ESA_TEST_EMBROIDER: true,
-          },
-          npm: {
-            devDependencies: {
-              'ember-cli': '~4.12.0',
-              'ember-source': '~4.12.0',
-              'ember-data': '~4.12.1',
-              torii: null
-            },
-          }
-        },
-        {
-          name: 'embroider-ember-5',
-          env: {
-            ESA_TEST_EMBROIDER: true,
-          },
-          npm: {
-            devDependencies: {
-              'ember-cli': '~5.0.0',
-              'ember-data': '~5.0.0',
-              'ember-source': '~5.0.0',
-              torii: null,
-            },
-          }
-        },
-        {
-          name: 'embroider-default',
-          env: {
-            ESA_TEST_EMBROIDER: true,
-          },
-          npm: {
-            devDependencies: {
-              torii: null,
-            },
-          }
-        },
         {
           name: 'ember-release',
           npm: {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml