From 07eeb48f7d4d047f5100c8bd2be64388f6730274 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Mon, 23 Aug 2021 21:41:22 -0500
Subject: [PATCH 01/20] [ci]: @ember/test-helpers partner test

---
 .github/workflows/ci.yml             |  23 ++++
 bin/test-external-partner-project.js | 165 +++++++++++++++++++++++++++
 package.json                         |   5 +-
 yarn.lock                            |  32 ++++++
 4 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 bin/test-external-partner-project.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e00e18af8ba..a928b814173 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -210,6 +210,29 @@ jobs:
       - name: test
         run: yarn ember test -c testem.ci-browsers.js
 
+  external-partners:
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        partner:
+          [
+            ember-test-helpers,
+          ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14.x
+      - name: Install dependencies
+        run: yarn install
+      - name: Run Tests
+        timeout-minutes: 16
+        env:
+          CI: true
+        run: yarn test-external:${{ matrix.partner }}
+
   deploy-tag:
     name: Deploy tags to npm
     runs-on: ubuntu-latest
diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
new file mode 100644
index 00000000000..7691604d1de
--- /dev/null
+++ b/bin/test-external-partner-project.js
@@ -0,0 +1,165 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const execa = require('execa');
+const debug = require('debug')('test-external');
+const rimraf = require('rimraf');
+const chalk = require('chalk');
+const cliArgs = require('command-line-args');
+const root = path.resolve(__dirname, '../');
+
+let cliOptionsDef = [{ name: 'projectName', defaultOption: true }];
+let cliOptions = cliArgs(cliOptionsDef, { stopAtFirstUnknown: true });
+const externalProjectName = cliOptions.projectName;
+
+let argv = cliOptions._unknown || [];
+cliOptionsDef = [{ name: 'gitUrl', defaultOption: true }];
+cliOptions = cliArgs(cliOptionsDef, { stopAtFirstUnknown: true, argv });
+const gitUrl = cliOptions.gitUrl;
+
+const cachePath = '../__emberjs-test-cache';
+const tempDir = path.join(root, cachePath);
+const projectTempDir = path.join(tempDir, externalProjectName);
+
+console.log(
+  `Preparing to test external project ${externalProjectName} located at ${gitUrl} against this ember.js commit.`
+);
+
+function execWithLog(command, force) {
+  debug(chalk.cyan('Executing: ') + chalk.yellow(command));
+
+  if (force) {
+    return execa.sync(command, { stdio: [0, 1, 2], shell: true });
+  }
+
+  return execa.sync(command, { shell: true }).stdout;
+}
+
+function execCommand(command, force) {
+  command = `cd ${projectTempDir} && ${command}`;
+  return execWithLog(command, force);
+}
+
+if (!fs.existsSync(tempDir)) {
+  debug(`Ensuring Cache Root at: ${tempDir}`);
+  fs.mkdirSync(tempDir);
+} else {
+  debug(`Cache Root Exists at: ${tempDir}`);
+}
+
+if (fs.existsSync(projectTempDir)) {
+  debug(`Cleaning Cache at: ${projectTempDir}`);
+  rimraf.sync(projectTempDir);
+} else {
+  debug(`No cache present at: ${projectTempDir}`);
+}
+
+// install the project
+try {
+  execWithLog(`git clone --depth=1 ${gitUrl} ${projectTempDir}`);
+} catch (e) {
+  debug(e);
+  throw new Error(
+    `Install of ${gitUrl} in ${projectTempDir} for external project ${externalProjectName} testing failed.`
+  );
+}
+
+const packageJsonLocation = path.join(projectTempDir, 'package.json');
+
+let smokeTestPassed = true;
+let commitTestPassed = true;
+
+/**
+ * -----------------
+ * SMOKE TESTS FIRST
+ * -----------------
+ */
+try {
+  debug('Running Smoke Test');
+  try {
+    execCommand('yarn install');
+  } catch (e) {
+    debug(e);
+    throw new Error(`Unable to complete install of dependencies for ${externalProjectName}`);
+  }
+  execCommand('./node_modules/.bin/ember test', true);
+} catch (e) {
+  console.log(e);
+  smokeTestPassed = false;
+}
+
+/**
+ * -----------------
+ * INSTALL latest ember.js in external package
+ * -----------------
+ */
+const currentSha = execWithLog(`git rev-parse HEAD`);
+const cacheDir = path.join(root, `../__tarball-cache`);
+const tarballDir = path.join(cacheDir, currentSha);
+
+if (!fs.existsSync(cacheDir)) {
+  debug(`Ensuring Cache Root at: ${cacheDir}`);
+  fs.mkdirSync(cacheDir);
+} else {
+  debug(`Cache Root Exists at: ${cacheDir}`);
+}
+
+if (!fs.existsSync(tarballDir)) {
+  debug(`Ensuring Tarball Cache for SHA ${currentSha} at: ${tarballDir}`);
+  fs.mkdirSync(tarballDir);
+} else {
+  debug(`Tarball Cache Exists for SHA ${currentSha} at: ${tarballDir}`);
+}
+
+function generateTarball() {
+  execWithLog(`cd ${tarballDir}; yarn build ${root}; npm pack ${root};`);
+
+  debug(`npm pack successful at: ${tarballDir}`);
+  const pkgPath = path.join(root, 'package.json');
+  const pkg = require(pkgPath);
+
+  return path.join(tarballDir, `${pkg.name}-${pkg.version}.tgz`);
+}
+
+function insertTarballsToPackageJson(fileLocation) {
+    const location = require.resolve(fileLocation);
+    const pkgInfo = JSON.parse(fs.readFileSync(location, 'utf8'));
+  
+    const thisPkgTarballPath = generateTarball();
+    pkgInfo.devDependencies['ember-source'] = thisPkgTarballPath;
+  
+    fs.writeFileSync(location, JSON.stringify(pkgInfo, null, 2));
+}
+
+try {
+  debug('Preparing Package To Run Tests Against Latest ember.js Commit');
+  insertTarballsToPackageJson(packageJsonLocation);
+
+  // clear node_modules installed for the smoke-test
+  execCommand(`rm -rf node_modules`);
+
+  execCommand('yarn install --cache-folder=tmp/yarn-cache');
+} catch (e) {
+  console.log(`Unable to yarn install tarballs for ${externalProjectName}. Original error below:`);
+
+  throw e;
+}
+
+try {
+  debug('Running tests against ember.js commit');
+  execCommand('./node_modules/.bin/ember build');
+  execCommand('./node_modules/.bin/ember test  --path="./dist"', true);
+} catch (e) {
+  console.error(e);
+  commitTestPassed = false;
+}
+
+if (commitTestPassed && smokeTestPassed) {
+  console.log(`${externalProjectName} tests passed`);
+} else {
+  throw new Error(`Tests failed. smoke: ${smokeTestPassed}, commit: ${commitTestPassed}`);
+}
diff --git a/package.json b/package.json
index 78791baba31..25ce12b8df9 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
     "test": "node bin/run-tests.js",
     "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
     "test:node": "qunit tests/node/**/*-test.js",
-    "test:browserstack": "node bin/run-browserstack-tests.js"
+    "test:browserstack": "node bin/run-browserstack-tests.js",
+    "test-external:ember-test-helpers": "node ./bin/test-external-partner-project.js ember-test-helpers https://github.com/emberjs/ember-test-helpers"
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",
@@ -103,6 +104,7 @@
     "broccoli-string-replace": "^0.1.2",
     "broccoli-typescript-compiler": "^7.0.0",
     "broccoli-uglify-sourcemap": "^4.0.0",
+    "command-line-args": "^5.2.0",
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
@@ -137,6 +139,7 @@
     "prettier": "^2.1.2",
     "puppeteer": "^3.0.4",
     "qunit": "^2.14.0",
+    "rimraf": "^3.0.2",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1b45485be1a..71f96ba485b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3212,6 +3212,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
 
+array-back@^3.0.1, array-back@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
+
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -4730,6 +4735,16 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
+command-line-args@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.0.tgz#087b02748272169741f1fd7c785b295df079b9be"
+  integrity sha512-4zqtU1hYsSJzcJBOcNZIbW5Fbk9BkjCp1pZVhQKoRaWL5J7N4XphDLwo8aWwdQpTugxwu+jf9u2ZhkXiqp5Z6A==
+  dependencies:
+    array-back "^3.1.0"
+    find-replace "^3.0.0"
+    lodash.camelcase "^4.3.0"
+    typical "^4.0.0"
+
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -6569,6 +6584,13 @@ find-index@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
   integrity sha1-UwB8ec0wBA1oFteUWOiDfVxXBe8=
 
+find-replace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
+  dependencies:
+    array-back "^3.0.1"
+
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -8566,6 +8588,11 @@ lodash.bind@~2.3.0:
     lodash._renative "~2.3.0"
     lodash._slice "~2.3.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.castarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
@@ -11921,6 +11948,11 @@ typescript@~4.0.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
   integrity "sha1-FTu9Ro7wdyXB35x36LRT+NNqu6U= sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="
 
+typical@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
+
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"

From 283702e8a1352f2b8cfa954adb4037b1c68d942a Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 24 Aug 2021 22:07:46 -0500
Subject: [PATCH 02/20] fix lint

---
 bin/test-external-partner-project.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 7691604d1de..7dc00660e98 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -1,11 +1,10 @@
-#!/usr/bin/env node
-
 'use strict';
 
 const fs = require('fs');
 const path = require('path');
 
 const execa = require('execa');
+/* eslint-disable-next-line node/no-extraneous-require */
 const debug = require('debug')('test-external');
 const rimraf = require('rimraf');
 const chalk = require('chalk');
@@ -126,13 +125,13 @@ function generateTarball() {
 }
 
 function insertTarballsToPackageJson(fileLocation) {
-    const location = require.resolve(fileLocation);
-    const pkgInfo = JSON.parse(fs.readFileSync(location, 'utf8'));
-  
-    const thisPkgTarballPath = generateTarball();
-    pkgInfo.devDependencies['ember-source'] = thisPkgTarballPath;
-  
-    fs.writeFileSync(location, JSON.stringify(pkgInfo, null, 2));
+  const location = require.resolve(fileLocation);
+  const pkgInfo = JSON.parse(fs.readFileSync(location, 'utf8'));
+
+  const thisPkgTarballPath = generateTarball();
+  pkgInfo.devDependencies['ember-source'] = thisPkgTarballPath;
+
+  fs.writeFileSync(location, JSON.stringify(pkgInfo, null, 2));
 }
 
 try {

From 2e1f2c9514eb3b6c5535e1bedc56ee11b318ab39 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Fri, 12 Nov 2021 22:51:54 -0600
Subject: [PATCH 03/20] try this

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a928b814173..cf65fa9f695 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -212,7 +212,7 @@ jobs:
 
   external-partners:
     needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:

From ac8e383231a23c0e40e088ed75c67f968fad817f Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Fri, 12 Nov 2021 22:52:55 -0600
Subject: [PATCH 04/20] no need for CI

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf65fa9f695..606ddfe8e07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -229,8 +229,6 @@ jobs:
         run: yarn install
       - name: Run Tests
         timeout-minutes: 16
-        env:
-          CI: true
         run: yarn test-external:${{ matrix.partner }}
 
   deploy-tag:

From 252027e6b2edf0f5e6adc141f5a42300d54d3ff2 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 07:58:04 -0600
Subject: [PATCH 05/20] some mods

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 606ddfe8e07..b8bbe7b4612 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -224,11 +224,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 12.x
+          cache: yarn
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile --non-interactive
       - name: Run Tests
-        timeout-minutes: 16
         run: yarn test-external:${{ matrix.partner }}
 
   deploy-tag:

From 5cd1a840f15a82268c86a7faa45e72acfd1f43ac Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 09:26:38 -0600
Subject: [PATCH 06/20] rm cache folder

---
 bin/test-external-partner-project.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 7dc00660e98..6438d2bea32 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 'use strict';
 
 const fs = require('fs');
@@ -141,7 +142,7 @@ try {
   // clear node_modules installed for the smoke-test
   execCommand(`rm -rf node_modules`);
 
-  execCommand('yarn install --cache-folder=tmp/yarn-cache');
+  execCommand('yarn install');
 } catch (e) {
   console.log(`Unable to yarn install tarballs for ${externalProjectName}. Original error below:`);
 

From 472a434c21bb9ec5abdab1042eacfbc3a5910dcd Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 10:47:26 -0600
Subject: [PATCH 07/20] try this

---
 .github/workflows/ci.yml             | 2 +-
 bin/test-external-partner-project.js | 2 +-
 package.json                         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8bbe7b4612..4b8a88ceb21 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,7 +218,7 @@ jobs:
       matrix:
         partner:
           [
-            ember-test-helpers,
+            ember-stateful-promise,
           ]
     steps:
       - uses: actions/checkout@v2
diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 6438d2bea32..8f9acf52755 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -142,7 +142,7 @@ try {
   // clear node_modules installed for the smoke-test
   execCommand(`rm -rf node_modules`);
 
-  execCommand('yarn install');
+  execCommand('yarn install --frozen-lockfile --non-interactive');
 } catch (e) {
   console.log(`Unable to yarn install tarballs for ${externalProjectName}. Original error below:`);
 
diff --git a/package.json b/package.json
index 25ce12b8df9..954c569d9f0 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
     "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",
-    "test-external:ember-test-helpers": "node ./bin/test-external-partner-project.js ember-test-helpers https://github.com/emberjs/ember-test-helpers"
+    "test-external:ember-test-helpers": "node ./bin/test-external-partner-project.js ember-test-helpers https://github.com/emberjs/ember-test-helpers",
+    "test-external:ember-stateful-promise": "node ./bin/test-external-partner-project.js ember-stateful-promise https://github.com/snewcomer/ember-stateful-promise"
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",

From 281c5219540369b1f32cd42e8ac55f01b5b70e19 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 11:32:35 -0600
Subject: [PATCH 08/20] add ember-string and ember-legacy-built-in-components

---
 .github/workflows/ci.yml             | 3 ++-
 bin/test-external-partner-project.js | 7 ++++---
 package.json                         | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b8a88ceb21..b70ded92586 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,7 +218,8 @@ jobs:
       matrix:
         partner:
           [
-            ember-stateful-promise,
+            ember-string,
+            ember-legacy-built-in-components,
           ]
     steps:
       - uses: actions/checkout@v2
diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 8f9acf52755..9dbaef9cbb8 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -68,6 +68,7 @@ try {
   );
 }
 
+const useYarn = fs.existsSync(path.join(projectTempDir, 'yarn.lock'));
 const packageJsonLocation = path.join(projectTempDir, 'package.json');
 
 let smokeTestPassed = true;
@@ -81,7 +82,7 @@ let commitTestPassed = true;
 try {
   debug('Running Smoke Test');
   try {
-    execCommand('yarn install');
+    execCommand(`${useYarn ? 'yarn install' : 'npm install'}`);
   } catch (e) {
     debug(e);
     throw new Error(`Unable to complete install of dependencies for ${externalProjectName}`);
@@ -142,9 +143,9 @@ try {
   // clear node_modules installed for the smoke-test
   execCommand(`rm -rf node_modules`);
 
-  execCommand('yarn install --frozen-lockfile --non-interactive');
+  execCommand(`${useYarn ? 'yarn install' : 'npm install'}`);
 } catch (e) {
-  console.log(`Unable to yarn install tarballs for ${externalProjectName}. Original error below:`);
+  console.log(`Unable to npm install tarballs for ${externalProjectName}. Original error below:`);
 
   throw e;
 }
diff --git a/package.json b/package.json
index 954c569d9f0..5e67f5309e4 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",
     "test-external:ember-test-helpers": "node ./bin/test-external-partner-project.js ember-test-helpers https://github.com/emberjs/ember-test-helpers",
-    "test-external:ember-stateful-promise": "node ./bin/test-external-partner-project.js ember-stateful-promise https://github.com/snewcomer/ember-stateful-promise"
+    "test-external:ember-string": "node ./bin/test-external-partner-project.js ember-string https://github.com/emberjs/ember-string",
+    "test-external:ember-legacy-built-in-components": "node ./bin/test-external-partner-project.js ember-legacy-built-in-components https://github.com/emberjs/ember-legacy-built-in-components"
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",

From 9bf5dc838697382b20fbcb296f95c8aee62633e6 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 20:18:04 -0600
Subject: [PATCH 09/20] try this

---
 bin/test-external-partner-project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 9dbaef9cbb8..9b72e573e5e 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -152,7 +152,7 @@ try {
 
 try {
   debug('Running tests against ember.js commit');
-  execCommand('./node_modules/.bin/ember build');
+  execCommand('ember build');
   execCommand('./node_modules/.bin/ember test  --path="./dist"', true);
 } catch (e) {
   console.error(e);

From aefd5f1c54953248a8d386576537a980602971ba Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 20:25:03 -0600
Subject: [PATCH 10/20] rm .gitkeep

ref https://github.com/emberjs/ember-test-helpers/pull/1053
---
 bin/test-external-partner-project.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 9b72e573e5e..6687a79cc85 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -152,8 +152,9 @@ try {
 
 try {
   debug('Running tests against ember.js commit');
-  execCommand('ember build');
-  execCommand('./node_modules/.bin/ember test  --path="./dist"', true);
+  execCommand('rm -rf vendor/.gitkeep');
+  execCommand('./node_modules/.bin/ember build');
+  execCommand('./node_modules/.bin/ember test --path="./dist"', true);
 } catch (e) {
   console.error(e);
   commitTestPassed = false;

From 08ec5c09434123385a43fcda77b03fd21b069aa0 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 20:53:05 -0600
Subject: [PATCH 11/20] rm vendor

---
 bin/test-external-partner-project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 6687a79cc85..2eba58ec013 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -152,7 +152,7 @@ try {
 
 try {
   debug('Running tests against ember.js commit');
-  execCommand('rm -rf vendor/.gitkeep');
+  execCommand('rm -rf vendor');
   execCommand('./node_modules/.bin/ember build');
   execCommand('./node_modules/.bin/ember test --path="./dist"', true);
 } catch (e) {

From 8cd6f23312784f2854ce6dbefb6f6813dd3e8f81 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 13 Nov 2021 21:19:19 -0600
Subject: [PATCH 12/20] try this

---
 bin/test-external-partner-project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 2eba58ec013..11546b6b4e4 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -153,7 +153,7 @@ try {
 try {
   debug('Running tests against ember.js commit');
   execCommand('rm -rf vendor');
-  execCommand('./node_modules/.bin/ember build');
+  execCommand('./node_modules/.bin/ember build', true);
   execCommand('./node_modules/.bin/ember test --path="./dist"', true);
 } catch (e) {
   console.error(e);

From a47d6dae8294db7b073e47fca08aa0c5fdb29a6a Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 14 Nov 2021 09:47:27 -0600
Subject: [PATCH 13/20] try this

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b70ded92586..a43ef3e37c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -229,6 +229,10 @@ jobs:
           cache: yarn
       - name: Install dependencies
         run: yarn install --frozen-lockfile --non-interactive
+      - uses: actions/download-artifact@v2.0.10
+        with:
+          name: dist
+          path: dist
       - name: Run Tests
         run: yarn test-external:${{ matrix.partner }}
 

From 7c6290acaa4bedcb4a9bfc6de4db2243971bdece Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 14 Nov 2021 10:13:56 -0600
Subject: [PATCH 14/20] leave vendor

---
 bin/test-external-partner-project.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 11546b6b4e4..99d818dcf41 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -152,7 +152,6 @@ try {
 
 try {
   debug('Running tests against ember.js commit');
-  execCommand('rm -rf vendor');
   execCommand('./node_modules/.bin/ember build', true);
   execCommand('./node_modules/.bin/ember test --path="./dist"', true);
 } catch (e) {

From a9c1908acde97e86d4a1bc63b4dc526f8eb40b7a Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 14 Nov 2021 10:27:03 -0600
Subject: [PATCH 15/20] add ember-test-helpers

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a43ef3e37c1..3f0591d6862 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,6 +218,7 @@ jobs:
       matrix:
         partner:
           [
+            ember-test-helpers,
             ember-string,
             ember-legacy-built-in-components,
           ]

From 5a1916a9f1bf6f34cf458ba5b79f6b9b9db6d596 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 14 Nov 2021 10:32:11 -0600
Subject: [PATCH 16/20] add to needs

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f0591d6862..c632c755dd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -240,7 +240,7 @@ jobs:
   deploy-tag:
     name: Deploy tags to npm
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test, external-partners]
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v2
@@ -261,7 +261,7 @@ jobs:
   publish:
     name: Publish channel to s3
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test, external-partners]
     # Only run on pushes to branches that are not from the cron workflow
     if: github.event_name == 'push' && contains(github.ref, 'cron') != true
     steps:
@@ -284,7 +284,7 @@ jobs:
   publish-alpha:
     name: Publish alpha from default branch
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test, external-partners]
     # Only run on pushes to master
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:

From c9221ef0bd06086c6e984dbb60d262fd660d85b5 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Wed, 17 Nov 2021 16:13:58 -0600
Subject: [PATCH 17/20] cleanup

---
 bin/test-external-partner-project.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/test-external-partner-project.js b/bin/test-external-partner-project.js
index 99d818dcf41..017309bca86 100644
--- a/bin/test-external-partner-project.js
+++ b/bin/test-external-partner-project.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 'use strict';
 
 const fs = require('fs');

From a66d3c68eea43eb2783824d92bce2865a107fa60 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sat, 20 Nov 2021 10:55:39 -0600
Subject: [PATCH 18/20] no test-helpers for now

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c632c755dd5..1911b9c3f6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,7 +218,7 @@ jobs:
       matrix:
         partner:
           [
-            ember-test-helpers,
+            # ember-test-helpers,
             ember-string,
             ember-legacy-built-in-components,
           ]

From 981547116187daa33c842f4d3a99480534d340a8 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 30 Nov 2021 18:20:13 -0600
Subject: [PATCH 19/20] add back ember-test-helpers

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1911b9c3f6a..c632c755dd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,7 +218,7 @@ jobs:
       matrix:
         partner:
           [
-            # ember-test-helpers,
+            ember-test-helpers,
             ember-string,
             ember-legacy-built-in-components,
           ]

From b9a2a43ae969660c8650839cf8a872cc2b6af7a8 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 11 Jan 2022 10:36:13 -0600
Subject: [PATCH 20/20] try without ember-string for now

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c632c755dd5..44f509bbbbc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,7 +219,6 @@ jobs:
         partner:
           [
             ember-test-helpers,
-            ember-string,
             ember-legacy-built-in-components,
           ]
     steps: