Merge pull request #268 from embroider-build/internal-ember-cli

use our own version of ember-cli so the test app is always generated with the latest blueprint

.github/workflows/ci.yml

@@ -91,22 +91,17 @@ jobs:
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-      - run: pnpm add --global ember-cli yarn
       - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
         working-directory: tests
 
 
   defaults_tests:
-    name: "ember-cli@${{ matrix.ember-cli }} : ${{ matrix.slow-test }}"
+    name: "Slow tests: ${{ matrix.slow-test }}"
     timeout-minutes: 5
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ember-cli:
-          - 5.4.1
-          - 5.3.0
-
         slow-test:
           - defaults with npm
           - defaults with yarn
@@ -122,22 +117,16 @@ jobs:
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-      - run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn
       - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
         working-directory: tests
 
   typescript_tests:
-    name: "ember-cli@${{ matrix.ember-cli }} : ${{ matrix.slow-test }}"
+    name: "Slow tests: ${{ matrix.slow-test }}"
     timeout-minutes: 5
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ember-cli:
-          - 5.4.1
-          # Not testing against 5.3.0, because it has non-passing typechecking
-          # - 5.3.0
-
         slow-test:
           - typescript with npm
           - typescript with yarn
@@ -153,6 +142,5 @@ jobs:
           cache: pnpm
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-      - run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn
       - run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
         working-directory: tests

index.js

@@ -11,6 +11,8 @@ const execa = require('execa');
 const { merge } = require('lodash');
 const { lt } = require('semver');
 
+const Blueprint = require('ember-cli/lib/models/blueprint');
+
 let date = new Date();
 
 const { addonInfoFromOptions, testAppInfoFromOptions, withoutAddonOptions } = require('./src/info');
@@ -164,7 +166,7 @@ module.exports = {
         `If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`,
     );
 
-    const appBlueprint = this.lookupBlueprint('app');
+    const appBlueprint = Blueprint.lookup('app');
 
     if (!appBlueprint) {
       throw new SilentError('Cannot find app blueprint for generating test-app!');

package.json

@@ -14,6 +14,7 @@
     "test": "pnpm --filter 'blueprint-tests' test"
   },
   "dependencies": {
+    "ember-cli": "^5.6.0",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
     "execa": "^5.1.1",