Pick change from ts-convert branch which make not part of TS migration

Author: mkszepp

.github/workflows/ci.yml

@@ -67,11 +67,13 @@ jobs:
           - ember-lts-4.8
           - ember-lts-4.12
           - ember-lts-5.4
+          - ember-lts-5.8
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-modifier-4
-          - ember-test-helpers-3
+          - ember-modifier-3
+          - ember-test-helpers-2
+          - ember-test-helpers-4
           - embroider-safe
           - embroider-optimized
 

.npmrc

@@ -0,0 +1,9 @@
+# Docs: https://pnpm.io/npmrc
+# https://github.com/emberjs/rfcs/pull/907
+
+# we don't want addons to be bad citizens of the ecosystem
+auto-install-peers=false
+
+# we want true isolation,
+# if a dependency is not declared, we want an error
+resolve-peers-from-workspace-root=false

addon/package.json

@@ -47,9 +47,13 @@
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@ember/test-helpers": "^3.0.0",
+    "@ember/test-waiters": "^3.1.0",
     "@embroider/addon-dev": "^3.0.0",
+    "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",
     "@babel/eslint-parser": "^7.11.0",
+    "ember-modifier": "^4.2.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.4.0",
     "eslint-plugin-ember": "^10.5.9",
@@ -59,7 +63,9 @@
     "npm-run-all2": "^5.0.0",
     "prettier": "^2.5.1",
     "rollup": "^3.10.0",
-    "rollup-plugin-copy": "^3.4.0"
+    "rollup-plugin-copy": "^3.4.0",
+    "typescript": "^5.5.4",
+    "webpack": "^5.94.0"
   },
   "engines": {
     "node": "14.* || >= 16"

docs/app/components/item-presenter/template.hbs docs/app/components/item-presenter/index.hbs

@@ -7,14 +7,11 @@ module.exports = function (environment) {
     rootURL: '/',
     locationType: 'history',
     EmberENV: {
+      EXTEND_PROTOTYPES: false,
       FEATURES: {
         // 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: {

docs/app/components/item-presenter/component.js docs/app/components/item-presenter/index.js

@@ -23,15 +23,15 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.6.0",
+    "@ember/test-helpers": "^3.0.0",
     "@ember/test-waiters": "^3.0.1",
     "@embroider/macros": "^1.9.0",
-    "@embroider/test-setup": "^1.2.0",
+    "@embroider/test-setup": "^4.0.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-a11y-testing": "^5.0.0",
+    "ember-a11y-testing": "^7.0.0",
     "ember-auto-import": "^2.4.0",
     "ember-cli": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
@@ -40,11 +40,9 @@
     "ember-cli-inject-live-reload": "^2.0.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.0",
     "ember-load-initializers": "^2.1.2",
-    "ember-modifier": "^3.2.0",
-    "ember-qunit": "mydea/ember-qunit#fn/ember-auto-import-v2-node-12",
+    "ember-modifier": "^4.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^8.0.3",
     "ember-source": "^4.2.0",
     "ember-source-channel-url": "^3.0.0",

docs/app/components/row/template.hbs docs/app/components/row/index.hbs

@@ -511,8 +511,10 @@ module('Acceptance | smoke modifier', function (hooks) {
     let result = '';
     for (const index in elements) {
       const element = elements[index];
-      result += element.textContent.replace(/⇕/g, '').replace(/\s+/g, ' ').replace(/^\s+/, '').replace(/\s+$/, '');
-      result += ' ';
+      if (element.textContent) {
+        result += element.textContent.replace(/⇕/g, '').replace(/\s+/g, ' ').replace(/^\s+/, '').replace(/\s+$/, '');
+        result += ' ';
+      }
     }
     return result;
   }

docs/app/components/row/component.js docs/app/components/row/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
+// 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, 'en-us'); // 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 };