chore(ember-try): test embroider only with ember 4+

NullVoxPopuli · Feb 3, 2022 · da31d91 · da31d91
1 parent 3148557
commit da31d91
Show file tree

Hide file tree

Showing 5 changed files with 983 additions and 381 deletions.
diff --git a/package.json b/package.json
@@ -11,9 +11,6 @@
     "build": "yarn workspace ember-resources build",
     "prepare": "yarn build"
   },
-  "resolutions": {
-    "@embroider/addon-shim": "1.0.0"
-  },
   "devDependencies": {
     "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",

diff --git a/testing/ember-app/config/ember-try.js b/testing/ember-app/config/ember-try.js
@@ -80,8 +80,28 @@ module.exports = async function () {
           },
         },
       },
-      embroiderSafe(),
-      embroiderOptimized(),
+      embroiderSafe({
+        npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+            webpack: '^5.0.0',
+          },
+        },
+      }),
+      embroiderOptimized({
+        npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
+            webpack: '^5.0.0',
+          },
+        },
+      }),
     ],
   };
 };
diff --git a/testing/ember-app/package.json b/testing/ember-app/package.json
@@ -23,16 +23,16 @@
     "test:ember": "ember test"
   },
   "dependencies": {
-    "@embroider/macros": "^0.48.1",
+    "@embroider/macros": "^0.50.2",
     "ember-concurrency": "^2.0.0",
     "ember-concurrency-ts": "^0.3.1",
     "ember-resources": "*"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@ember/test-waiters": "^3.0.0",
-    "@embroider/test-setup": "^0.48.1",
+    "@ember/test-waiters": "^3.0.1",
+    "@embroider/test-setup": "^0.50.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "@nullvoxpopuli/eslint-configs": "^2.1.1",
@@ -65,10 +65,10 @@
     "@types/rsvp": "^4.0.4",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "2.2.4",
+    "ember-auto-import": "2.3.0",
     "ember-cli": "~4.0.1",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -101,7 +101,7 @@
     "qunit": "^2.16.0",
     "qunit-dom": "^2.0.0",
     "typescript": "^4.4.4",
-    "webpack": "^5.61.0"
+    "webpack": "^5.66.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

diff --git a/testing/ember-concurrency-v1/package.json b/testing/ember-concurrency-v1/package.json
@@ -32,8 +32,8 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@ember/test-waiters": "^3.0.0",
-    "@embroider/test-setup": "^0.48.1",
+    "@ember/test-waiters": "^3.0.1",
+    "@embroider/test-setup": "^0.50.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "@nullvoxpopuli/eslint-configs": "^2.1.1",
@@ -66,10 +66,10 @@
     "@types/rsvp": "^4.0.4",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "2.2.4",
+    "ember-auto-import": "2.3.0",
     "ember-cli": "~4.0.1",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.0",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -102,7 +102,7 @@
     "qunit": "^2.16.0",
     "qunit-dom": "^2.0.0",
     "typescript": "^4.5.2",
-    "webpack": "^5.61.0"
+    "webpack": "^5.66.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"