Allow @glimmer/component v2

cibernox · Nov 11, 2024 · 504eaca · 504eaca
1 parent 274719d
commit 504eaca
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -121,6 +121,7 @@ jobs:
           - ember-lts-4.12
           - ember-lts-5.4
           - ember-lts-5.8
+          - glimmer-component-v1
           - ember-release
           - ember-beta
           - ember-canary

diff --git a/docs/package.json b/docs/package.json
@@ -35,7 +35,7 @@
     "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^4.0.2",
     "@embroider/test-setup": "^4.0.0",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2",
     "@glint/core": "^1.4.0",
     "@glint/environment-ember-loose": "^1.4.0",

diff --git a/ember-basic-dropdown/package.json b/ember-basic-dropdown/package.json
@@ -86,7 +86,7 @@
     "@glint/environment-ember-loose": "^1.4.0",
     "@glint/environment-ember-template-imports": "^1.4.0",
     "@glint/template": "^1.4.0",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.4",
     "@tsconfig/ember": "^3.0.8",
@@ -136,7 +136,7 @@
   "peerDependencies": {
     "ember-source": "^3.28.0 || ^4.0.0 || >=5.0.0",
     "@ember/test-helpers": "^2.9.4 || ^3.2.1 || ^4.0.2",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "^1.1.2 || ^2.0.0",
     "@glimmer/tracking": "^1.1.2"
   },
   "publishConfig": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -61,6 +61,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'glimmer-component-v1',
+        npm: {
+          devDependencies: {
+            '@glimmer/component': '^1.1.2',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

diff --git a/test-app/package.json b/test-app/package.json
@@ -33,7 +33,7 @@
     "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^4.0.2",
     "@embroider/test-setup": "^4.0.0",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2",
     "@glint/core": "^1.4.0",
     "@glint/environment-ember-loose": "^1.4.0",