Ember 4.8, require Ember 3.28+ (#1363)

* Ember 4.8, bump ember-auto-import

* Ember 4.8

* Update ember-classy-page-object

* Bump some deps

* Remove unused deps from test apps

* Yarn upgrade

* Add ember-lts-4.4

.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
 }

.github/workflows/ci-cd.yml

@@ -96,8 +96,8 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          # - 'ember-lts-3.24'
           - 'ember-lts-3.28'
+          - 'ember-lts-4.4'
           - 'ember-release'
           - 'ember-beta'
           - 'ember-canary'

.gitignore

@@ -29,6 +29,9 @@
 /package-lock.json.ember-try
 /yarn.lock.ember-try
 
+# broccoli-debug
+/DEBUG/
+
 # intellij
 /.idea/
 ember-cli-addon-docs.iml

CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

@@ -9,8 +9,8 @@ ember-cli-addon-docs
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.24 or above
-* Ember CLI v3.24 or above
+* Ember.js v3.28 or above
+* Ember CLI v3.28 or above
 * Node.js v14 or above
 
 The original maintainers of AddonDocs have moved on, but this addon is still very much actively maintained and is still being used by many addons.

config/ember-try.js

@@ -8,18 +8,18 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.24',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.3',
+            'ember-source': '~3.28.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.28',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.4.0',
           },
         },
       },

package.json

@@ -16,15 +16,15 @@
   "scripts": {
     "build": "ember build --environment=production",
     "deploy": "ember deploy production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "prepare": "./scripts/link-them.sh",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test --test-port=0",
     "test:node": "mocha tests-node --recursive",
     "test:test-apps": "cd test-apps/new-addon && yarn test"
@@ -33,9 +33,9 @@
     "@csstools/postcss-sass": "^5.0.0",
     "@ember/render-modifiers": "^2.0.0",
     "@ember/test-waiters": "^3.0.0",
-    "@glimmer/component": "^1.0.4",
+    "@glimmer/component": "^1.1.2",
     "@glimmer/syntax": "^0.84.0",
-    "@glimmer/tracking": "^1.0.4",
+    "@glimmer/tracking": "^1.1.2",
     "@handlebars/parser": "^2.1.0",
     "broccoli-bridge": "^1.0.0",
     "broccoli-caching-writer": "^3.0.3",
@@ -47,11 +47,11 @@
     "broccoli-source": "^3.0.0",
     "broccoli-stew": "^3.0.0",
     "chalk": "4.1.2",
-    "ember-auto-import": "^2.4.0",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-autoprefixer": "^2.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-clipboard": "^0.16.0",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-postcss": "^8.0.0",
     "ember-cli-string-helpers": "^6.1.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -66,7 +66,7 @@
     "ember-router-generator": "^2.0.0",
     "ember-router-scroll": "^4.1.2",
     "ember-set-helper": "^2.0.1",
-    "ember-svg-jar": "^2.3.4",
+    "ember-svg-jar": "^2.4.2",
     "ember-tether": "^2.0.1",
     "ember-truth-helpers": "^3.0.0",
     "esm": "^3.2.25",
@@ -90,7 +90,7 @@
     "postcss-nested": "^5.0.6",
     "postcss-scss": "^4.0.0",
     "quick-temp": "^0.1.8",
-    "semver": "^7.3.2",
+    "semver": "^7.3.8",
     "striptags": "^3.1.1",
     "tailwindcss": "1.9.6",
     "tracked-toolbox": "^2.0.0",
@@ -101,17 +101,17 @@
     "@babel/eslint-parser": "^7.16.3",
     "@babel/preset-env": "^7.16.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^1.2.0",
+    "@ember/test-helpers": "^2.8.1",
+    "@embroider/test-setup": "^2.0.2",
     "@fullhuman/postcss-purgecss": "^4.0.3",
     "broccoli-asset-rev": "^3.0.0",
     "chai": "^4.2.0",
     "common-tags": "^1.8.2",
-    "ember-classy-page-object": "rwwagner90/ember-classy-page-object#1a126eaf9077587fa85bfe9fd2c6d3cc6d1f7f1b",
-    "ember-cli": "~4.1.1",
+    "ember-classy-page-object": "0.8.0-beta.2",
+    "ember-cli": "~4.8.0",
     "ember-cli-addon-docs-yuidoc": "^1.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-git": "^1.3.4",
@@ -121,32 +121,30 @@
     "ember-cli-terser": "^4.0.2",
     "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator-for-testing": "^1.0.0",
-    "ember-qunit": "^5.1.5",
+    "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.6.0",
+    "ember-source": "~4.8.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^4.0.0",
+    "ember-template-lint": "^4.16.1",
     "ember-test-selectors": "^6.0.0",
     "ember-try": "^2.0.0",
     "eslint": "^8.3.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.8",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-ember": "^11.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.1",
     "loader.js": "^4.7.0",
-    "miragejs": "^0.1.43",
-    "mocha": "^10.0.0",
+    "miragejs": "^0.1.46",
+    "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
-    "qunit": "^2.17.2",
+    "prettier": "^2.7.1",
+    "qunit": "^2.19.2",
     "qunit-dom": "^2.0.0",
-    "release-it": "^14.12.1",
+    "release-it": "^15.5.0",
     "release-it-lerna-changelog": "^5.0.0",
-    "webpack": "^5.68.0"
+    "webpack": "^5.74.0"
   },
   "peerDependencies": {
     "ember-data": ">= 3.0.0",

test-apps/new-addon/package.json

@@ -26,7 +26,6 @@
   "devDependencies": {
     "@ember/optional-features": "*",
     "@ember/test-helpers": "*",
-    "@ember/optional-features": "*",
     "ember-cli-addon-docs": "*",
     "ember-cli-addon-docs-yuidoc": "*",
     "broccoli-asset-rev": "*",
@@ -40,9 +39,7 @@
     "ember-cli-sri": "*",
     "ember-cli-terser": "*",
     "ember-disable-prototype-extensions": "*",
-    "ember-export-application-global": "*",
     "ember-load-initializers": "*",
-    "ember-maybe-import-regenerator-for-testing": "*",
     "ember-resolver": "*",
     "ember-source": "*",
     "ember-source-channel-url": "*",

tests/dummy/app/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Ember CLI AddonDocs</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.1.1",
+      "version": "4.8.0",
       "blueprints": [
         {
           "name": "addon",

tests/dummy/config/environment.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function (environment) {
-  let ENV = {
+  const ENV = {
     modulePrefix: 'dummy',
     podModulePrefix: 'dummy/pods',
     environment,
@@ -12,10 +12,6 @@ module.exports = function (environment) {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
-      EXTEND_PROTOTYPES: {
-        // Prevent Ember Data from overriding Date.parse.
-        Date: false,
-      },
     },
 
     APP: {

tests/helpers/index.js

@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };

tests/index.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">