Updated CI and dependencies. Dropped support for Node 12 and Ember 3.24 LTS.

.eslintignore

@@ -1,7 +1,6 @@
 # compiled output
 /test-app/dist/
 /test-app/tmp/
-/scenario
 /dist
 
 # dependencies
@@ -13,4 +12,3 @@
 !.*
 .*/
 .eslintcache
-

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Node CI
+name: CI
 
 on:
   push:
@@ -9,80 +9,110 @@ on:
       - 'v*'
   pull_request:
 
+env:
+  NODE_VERSION: 16
+
 jobs:
-  test:
+  lint:
+    name: Lint files
     runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v1
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
+      - name: Check out a copy of the repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn --frozen-lockfile
-      - name: lint
+          cache: 'yarn'
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Lint
         run: yarn lint
-      - name: test
+
+
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Check out a copy of the repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Test
         run: yarn test:ember
-      - id: set-matrix
-        run: echo "::set-output name=matrix::$(yarn --silent scenario-tester list --files ./scenarios.js --matrix 'yarn qunit ./scenarios.js --filter %s:')"
-        working-directory: test-app
 
-  compat-scenarios:
-    needs: test
-    name: ${{ matrix.name }}
+
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
+    needs: [lint, test]
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.test.outputs.matrix)}}
+      matrix:
+        try-scenario:
+          - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - embroider-safe
+          - embroider-optimized
     steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v1
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
+      - name: Check out a copy of the repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn install --no-lockfile
-      - name: test
-        run: ${{ matrix.command }}
+          cache: 'yarn'
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Test
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
         working-directory: test-app
+
+
   publish:
     name: Publish to npm
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    needs: [lint, test, try-scenarios]
     runs-on: ubuntu-latest
-    needs: [test, compat-scenarios]
+    timeout-minutes: 5
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: Check out a copy of the repo
+        uses: actions/checkout@v3
 
-      - name: Install node
-        uses: actions/setup-node@v2
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
         with:
-          cache: yarn
-          node-version: 14.x
+          cache: 'yarn'
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
 
-      - name: install dependencies
+      - name: Install dependencies
         run: yarn install --frozen-lockfile
 
-      - name: auto-dist-tag
+      - name: Run auto-dist-tag
         run: npx auto-dist-tag@1 --write
 
-      - name: publish to npm
+      - name: Publish
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

.gitignore

@@ -3,7 +3,6 @@
 # compiled output
 /test-app/dist/
 /test-app/tmp/
-/scenario
 /dist
 
 # dependencies

.template-lintrc.js

@@ -5,5 +5,5 @@ module.exports = {
   rules: {
     'no-implicit-this': false,
   },
-  ignore: ['scenario/**', 'test-app/node_modules/**', 'test-app/dist/**'],
+  ignore: ['test-app/node_modules/**', 'test-app/dist/**'],
 };

CONTRIBUTING.md

@@ -16,15 +16,7 @@
 - `yarn start` - Run the test-app for interactive development
   - view the app at [http://localhost:4200](http://localhost:4200).
   - run the test suite at [http://localhost:4200/tests](http://localhost:4200/tests)
-- `yarn test:ember` – Run the test suite (with its default dependencies) and then exit.
-- `yarn test` – Run the test suite under each tested scenario and then exit.
-- `yarn scenario:list` - List the names of all tested scenarios.
-- `yarn scenario:run $SCENARIO_NAME` - Run only one scenario and then exit.
-- `yarn scenario:output $SCENARIO_NAME` - Create a copy of the test-app in the `./scenario` directory that is configured for the named scenario. Useful to interactively run and debug individual scenarios. (Caution: due to https://github.com/stefanpenner/node-fixturify-project/issues/56 you may need to invoke commands like "ember" as `./node_modules/ember-cli/bin/ember` because executables are not linked automatically into the scenario yet.)
-
-We use [scenario-tester](https://github.com/ef4/scenario-tester) to reconfigure the test-app with different dependencies to ensure that the addon works with all the intended Ember versions and build system variations.
-
-`./test-app/scenarios.js` defines the scenarios, which link to dependencies that all appear in `package.json`. We can test multiple versions of the same package without multiple NPM installs by using NPM aliasing.
+- `yarn test` – Run `lint` and `test` scripts
 
 ## The test-app
 

README.md

@@ -6,9 +6,9 @@ Displays a nice welcome page for newly generated applications with links to reso
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.20 or above
-* Ember CLI v3.20 or above
-* Node.js v12 or above
+* Ember.js v3.28 or above
+* Ember CLI v3.28 or above
+* Node.js v14 or above
 
 
 Installation

package.json

@@ -22,88 +22,74 @@
     "images"
   ],
   "scripts": {
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "link-test-app": "addon-dev link-test-app",
+    "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:devdeps": "addon-dev sync-dev-deps --lint",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
-    "lint:devdeps": "addon-dev sync-dev-deps --lint",
-    "scenario:list": "scenario-tester list --files test-app/scenarios.js",
-    "scenario:output": "scenario-tester output --files test-app/scenarios.js --outdir scenario --scenario ",
-    "scenario:run": "cd test-app && qunit scenarios.js --filter ",
-    "start": "npm-run-all --parallel start:*",
-    "start:test-app": "cd test-app && ember serve",
+    "prepare": "concurrently \"npm:prepublishOnly\" \"npm:link-test-app\"",
+    "prepublishOnly": "rollup --config",
+    "start": "concurrently \"npm:start:*\"",
     "start:build": "rollup --config --watch",
+    "start:test-app": "cd test-app && ember serve",
     "sync-dev-deps": "addon-dev sync-dev-deps",
-    "test": "npm-run-all lint:* test:*",
-    "test:ember": "cd test-app && ember test",
-    "test:ember-compatibility": "cd test-app && qunit scenarios.js",
-    "prepare": "npm-run-all prepublishOnly link-test-app",
-    "link-test-app": "addon-dev link-test-app",
-    "prepublishOnly": "rollup --config"
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
+    "test:ember": "cd test-app && ember test"
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.15.5",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.4.2",
+    "@ember/test-helpers": "^2.8.1",
     "@embroider/addon-dev": "^1.5.0",
-    "@embroider/compat-latest": "npm:@embroider/compat@latest",
-    "@embroider/core-latest": "npm:@embroider/core@latest",
     "@embroider/test-setup": "^1.5.0",
-    "@embroider/webpack-latest": "npm:@embroider/webpack@latest",
-    "@glimmer/component": "^1.0.4",
-    "@glimmer/tracking": "^1.0.4",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-babel": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^2.4.0",
-    "ember-cli": "~3.28.0",
-    "ember-cli-3.20": "npm:ember-cli@~3.20.0",
-    "ember-cli-3.24": "npm:ember-cli@~3.24.0",
+    "concurrently": "^7.6.0",
+    "ember-auto-import": "^2.5.0",
+    "ember-cli": "~4.9.2",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.6",
-    "ember-cli-beta": "npm:ember-cli@beta",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-latest": "npm:ember-cli@latest",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-export-application-global": "^2.0.1",
-    "ember-fetch": "^8.1.1",
+    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-page-title": "^6.2.2",
-    "ember-qunit": "^5.1.4",
-    "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0",
-    "ember-source-3.20": "npm:ember-source@~3.20.0",
-    "ember-source-3.24": "npm:ember-source@~3.24.0",
-    "ember-source-beta": "npm:ember-source@beta",
-    "ember-source-canary": "npm:ember-source@alpha",
-    "ember-source-latest": "npm:ember-source@latest",
-    "ember-template-lint": "^3.6.0",
+    "ember-page-title": "^7.0.0",
+    "ember-qunit": "^6.0.0",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.9.1",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^5.2.0",
+    "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.4",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-ember": "^11.2.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-qunit": "^6.2.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.2",
-    "qunit": "^2.16.0",
-    "qunit-dom": "^1.6.0",
+    "prettier": "^2.8.1",
+    "qunit": "^2.19.3",
+    "qunit-dom": "^2.0.0",
     "release-it": "^14.2.1",
     "release-it-lerna-changelog": "^3.1.0",
     "rollup": "^2.57.0",
-    "scenario-tester": "^2.0.1",
     "semver": "^7.3.5",
-    "webpack": "^5.53.0"
+    "webpack": "^5.75.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

test-app/.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false
 }

test-app/.eslintignore

@@ -19,4 +19,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

test-app/.eslintrc.js

@@ -33,7 +33,6 @@ module.exports = {
         './config/**/*.js',
         './lib/*/index.js',
         './server/**/*.js',
-        './scenarios.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -51,7 +50,7 @@ module.exports = {
       },
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

test-app/.gitignore

@@ -23,4 +23,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/