Update test-app and addon to latest blueprint (#80)

* Run `npx ember-cli-update --from=3.17 --to=4.9.2` to sync test-app blueprint

* update addon blueprint

.github/workflows/ci.yml

@@ -15,22 +15,27 @@ jobs:
   test:
     name: "Tests"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: yarn
+
       - name: Install Dependencies
         run: until yarn install --frozen-lockfile; do echo "Retrying yarn"; done
+
       - name: Lint Addon
         run: yarn lint
-        working-directory: addon
+        working-directory: ember-engines-router-service
+
       - name: Lint Test App
         run: yarn lint
         working-directory: test-app
+
       - name: Run Tests
         run: yarn test:ember
         working-directory: test-app
@@ -40,15 +45,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: yarn
+
       - name: Install Dependencies
         # Absurdly, yarn always fails on the first try here.
         # https://github.com/yarnpkg/yarn/issues/2629
         run: until yarn install --no-lockfile; do echo "Retrying yarn"; done
+
       - name: Run Tests
         run: yarn test:ember
         working-directory: test-app
@@ -62,28 +69,29 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-#          - ember-lts-3.12
-          - ember-lts-3.16
-          - ember-lts-3.20
           - ember-lts-3.24
           - ember-lts-3.28
-#          - ember-release
-#          - ember-beta
-#          - ember-canary
+          - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-release
+          - ember-beta
+          - ember-canary
           - ember-default-with-jquery
           - ember-classic
 #          - embroider-safe
 #          - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: yarn
+
       - name: Install Dependencies
         run: until yarn install --frozen-lockfile; do echo "Retrying yarn"; done
+
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
         working-directory: test-app

addon/.eslintignore → ember-engines-router-service/.eslintignore

@@ -4,22 +4,12 @@
 
 # compiled output
 /dist/
-/tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
 .eslintcache
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
-
-# type definitions
-*.d.ts

addon/.eslintrc.js → ember-engines-router-service/.eslintrc.js

@@ -23,16 +23,7 @@ module.exports = {
   overrides: [
     // node files
     {
-      files: [
-        './.eslintrc.js',
-        './.prettierrc.js',
-        './.template-lintrc.js',
-        './ember-cli-build.js',
-        './addon-main.js',
-        './testem.js',
-        './blueprints/*/index.js',
-        './config/**/*.js',
-      ],
+      files: ['./.eslintrc.js', './.prettierrc.js', './addon-main.js'],
       parserOptions: {
         sourceType: 'script',
       },
@@ -43,10 +34,5 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
-    {
-      // test files
-      files: ['tests/**/*-test.{js,ts}'],
-      extends: ['plugin:qunit/recommended'],
-    },
   ],
 };

ember-engines-router-service/.gitignore

@@ -0,0 +1,15 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+
+# dependencies
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.*/
+.eslintcache

ember-engines-router-service/.prettierignore

@@ -0,0 +1,15 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+
+# dependencies
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+.lint-todo/

addon/package.json → ember-engines-router-service/package.json

@@ -16,35 +16,44 @@
     "./*": "./dist/*",
     "./addon-main.js": "./addon-main.js"
   },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "types/*"
+      ]
+    }
+  },
   "files": [
     "addon-main.js",
     "dist",
     "types"
   ],
   "scripts": {
     "build": "rollup --config",
-    "prepublishOnly": "rollup --config",
-    "start": "rollup --config --watch",
     "lint": "eslint . --cache",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "prepublishOnly": "rollup --config",
+    "start": "rollup --config --watch"
   },
   "dependencies": {
-    "@embroider/addon-shim": "^1.2.0"
+    "@embroider/addon-shim": "^1.8.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.17.8",
-    "@embroider/addon-dev": "^1.2.0",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@types/ember__routing": "^4.0.10",
-    "eslint": "^8.11.0",
+    "@babel/core": "^7.20.7",
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@embroider/addon-dev": "^3.0.0",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@types/ember__routing": "^4.0.12",
+    "ember-cli-htmlbars": "^6.1.1",
+    "eslint": "^8.30.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.5.9",
+    "eslint-plugin-ember": "^11.3.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "prettier": "^2.6.0",
-    "rollup": "^2.70.1"
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.1",
+    "rollup": "^3.8.1"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
@@ -77,11 +86,7 @@
       "./services/engine-router-service.js": "./dist/_app_/services/engine-router-service.js"
     }
   },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "types/*"
-      ]
-    }
+  "volta": {
+    "extends": "../package.json"
   }
 }

package.json

@@ -6,33 +6,33 @@
     "url": "https://github.com/villander/ember-engines-router-service"
   },
   "workspaces": [
-    "addon",
+    "ember-engines-router-service",
     "test-app"
   ],
   "scripts": {
-    "prepare": "cd addon && yarn build",
+    "prepare": "cd ember-engines-router-service && yarn build",
     "release": "release-it"
   },
   "devDependencies": {
-    "release-it": "^14.13.1",
-    "release-it-lerna-changelog": "^4.0.1",
-    "release-it-yarn-workspaces": "^2.0.1"
+    "release-it": "^15.5.1",
+    "@release-it-plugins/lerna-changelog": "^5.0.0",
+    "@release-it-plugins/workspaces": "^3.2.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "release-it": {
     "hooks": {
-      "before:init": "cp README.md LICENSE.md addon/"
+      "before:init": "cp README.md LICENSE.md ember-engines-router-service/"
     },
     "plugins": {
-      "release-it-lerna-changelog": {
+      "@release-it-plugins/lerna-changelog": {
         "infile": "CHANGELOG.md",
         "launchEditor": false
       },
-      "release-it-yarn-workspaces": {
+      "@release-it-plugins/workspaces": {
         "workspaces": [
-          "addon"
+          "ember-engines-router-service"
         ],
         "additionalManifests": {
           "dependencyUpdates": [
@@ -55,7 +55,7 @@
     "npm": false
   },
   "volta": {
-    "node": "14.19.2",
-    "yarn": "1.22.18"
+    "node": "14.21.2",
+    "yarn": "1.22.19"
   }
-}
+}

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
 }