Merge pull request #79 from ef4/fix-canary

breaking: Drop support for Node 16 and Fix CI

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
       - name: Lint
@@ -40,7 +40,7 @@ jobs:
       - name: Setup node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
         with:
@@ -54,6 +54,7 @@ jobs:
     needs:
       - test
     strategy:
+      fail-fast: false
       matrix:
         scenario:
           - ember-lts-3.20
@@ -69,7 +70,7 @@ jobs:
       - name: Setup node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
       - name: Test

lib/prerender.js

@@ -1,10 +1,7 @@
 const Plugin = require('broccoli-plugin');
 const FastBoot = require('fastboot');
-const fs = require('fs');
-const denodeify = require('denodeify');
-const writeFile = denodeify(fs.writeFile);
-const readFile = denodeify(fs.readFile);
-const mkdirp = denodeify(require('mkdirp'));
+const { writeFile, readFile } = require('fs/promises');
+const { mkdirp } = require('mkdirp');
 const path = require('path');
 const chalk = require('chalk');
 const express = require('express');

package.json

@@ -25,17 +25,17 @@
   },
   "dependencies": {
     "broccoli-debug": "^0.6.3",
-    "broccoli-merge-trees": "^2.0.0",
-    "broccoli-plugin": "^1.3.0",
-    "chalk": "^2.3.0",
-    "denodeify": "^1.2.1",
-    "ember-cli-babel": "^7.26.6",
-    "express": "^4.16.2",
-    "fastboot": "^3.1.2",
-    "mkdirp": "^0.5.1"
+    "broccoli-merge-trees": "^4.2.0",
+    "broccoli-plugin": "^4.0.7",
+    "chalk": "^4.0.0",
+    "ember-cli-babel": "^7.26.11",
+    "express": "^4.18.2",
+    "fastboot": "^4.1.1",
+    "mkdirp": "^3.0.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.4.2",
     "@embroider/test-setup": "^0.43.5",
     "@glimmer/component": "^1.0.4",
@@ -45,18 +45,17 @@
     "ember-auto-import": "^2.2.3",
     "ember-cli": "~3.28.3",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "^3.2.0-beta.4",
+    "ember-cli-fastboot": "^4.1.1",
     "ember-cli-head": "^2.0.0",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-page-title": "^6.2.2",
+    "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.0",

tests/dummy/app/routes/redirects.js

@@ -1,7 +1,9 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class RedirectsRoute extends Route {
+  @service router;
   beforeModel() {
-    this.transitionTo('from-sample-data');
+    return this.router.transitionTo('from-sample-data');
   }
 }