Merge pull request #1313 from embroider-build/update-upstream-types

Update for upstream type changes
embroider-build · Dec 21, 2022 · 35c1db2 · 35c1db2
2 parents ea67db3 + a3fd7f8
commit 35c1db2
Show file tree

Hide file tree

Showing 8 changed files with 1,049 additions and 2,433 deletions.
diff --git a/packages/router/package.json b/packages/router/package.json
@@ -58,7 +58,6 @@
     "@types/ember__error": "^4.0.0",
     "@types/ember__component": "^4.0.0",
     "@types/ember__routing": "^4.0.0",
-    "@types/ember__test-helpers": "^2.6.1",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "concurrently": "^7.2.1",

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -44,7 +44,7 @@
     "@babel/core": "^7.19.6",
     "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.8.1",
+    "@ember/test-helpers": "^2.9.1",
     "@embroider/compat": "2.0.2",
     "@embroider/core": "2.0.2",
     "@embroider/test-setup": "2.0.2",
@@ -68,8 +68,8 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-qunit": "^6.1.1",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~4.6.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.10.1",

diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json
@@ -25,7 +25,7 @@
   "private": true,
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
-    "@ember/test-helpers": "^2.4.2",
+    "@ember/test-helpers": "^2.9.1",
     "@embroider/test-support": "0.36.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.0",
@@ -40,8 +40,8 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-qunit": "^5.1.4",
-    "ember-resolver": "^5.0.1",
+    "ember-qunit": "^6.1.1",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~3.26",
     "ember-source-channel-url": "^1.1.0",
     "ember-template-lint": "^3.6.0",

diff --git a/test-packages/support/package.json b/test-packages/support/package.json
@@ -17,7 +17,7 @@
     "ember-cli": "~3.28.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-htmlbars": "^6.0.0",
-    "ember-resolver": "^7.0.0",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~3.26",
     "execa": "^4.0.3",
     "fs-extra": "^7.0.0",

diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.8.1",
+    "@ember/test-helpers": "^2.9.1",
     "@embroider/test-setup": "^2.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -48,8 +48,8 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-qunit": "^6.1.1",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~4.6.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.10.1",

diff --git a/tests/app-template/package.json b/tests/app-template/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.8.1",
+    "@ember/test-helpers": "^2.9.1",
     "@embroider/compat": "2.0.2",
     "@embroider/core": "2.0.2",
     "@embroider/router": "2.0.0",
@@ -49,8 +49,8 @@
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-qunit": "^6.1.1",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~4.6.0",
     "ember-template-lint": "^4.10.1",
     "eslint": "^7.32.0",

diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.7.0",
+    "@ember/test-helpers": "^2.9.0",
     "@embroider/compat": "2.0.2",
     "@embroider/core": "2.0.2",
     "@embroider/router": "2.0.0",
@@ -34,10 +34,9 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glimmer/interfaces": "^0.84.2",
+    "@glimmer/reference": "^0.84.2",
     "@tsconfig/ember": "^1.0.0",
     "@types/ember": "^4.0.2",
-    "@types/ember-qunit": "^5.0.0",
-    "@types/ember-resolver": "^5.0.11",
     "@types/ember__application": "^4.0.0",
     "@types/ember__array": "^4.0.1",
     "@types/ember__component": "^4.0.8",
@@ -46,14 +45,14 @@
     "@types/ember__engine": "^4.0.0",
     "@types/ember__error": "^4.0.0",
     "@types/ember__object": "^4.0.3",
+    "@types/ember__owner": "^4.0.3",
     "@types/ember__polyfills": "^4.0.0",
     "@types/ember__routing": "^4.0.7",
     "@types/ember__runloop": "^4.0.1",
     "@types/ember__service": "^4.0.0",
     "@types/ember__string": "^3.0.9",
     "@types/ember__template": "^4.0.0",
     "@types/ember__test": "^4.0.0",
-    "@types/ember__test-helpers": "^2.8.0",
     "@types/ember__utils": "^4.0.0",
     "@types/htmlbars-inline-precompile": "^3.0.0",
     "@types/qunit": "^2.19.2",
@@ -73,8 +72,8 @@
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
+    "ember-qunit": "^6.1.1",
+    "ember-resolver": "^8.1.0",
     "ember-source": "~4.4.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",