chore: cleanup glint impl (#9593)

* chore: cleanup glint impl * fixup lock * fix lint
emberjs · Nov 11, 2024 · 6bcc003 · 6bcc003
1 parent 0ff7675
commit 6bcc003
Show file tree

Hide file tree

Showing 7 changed files with 681 additions and 544 deletions.
diff --git a/package.json b/package.json
@@ -36,10 +36,10 @@
     "@babel/core": "^7.24.5",
     "@ember/test-helpers": "3.3.0",
     "@glimmer/component": "^1.1.2",
-    "@glint/core": "^1.4.0",
-    "@glint/environment-ember-loose": "^1.4.0",
-    "@glint/environment-ember-template-imports": "^1.4.0",
-    "@glint/template": "^1.4.0",
+    "@glint/core": "1.5.0",
+    "@glint/environment-ember-loose": "1.5.0",
+    "@glint/environment-ember-template-imports": "1.5.0",
+    "@glint/template": "1.5.0",
     "@types/semver": "^7.5.8",
     "bun-types": "^1.1.30",
     "chalk": "^4.1.2",
@@ -137,7 +137,10 @@
       "broccoli-funnel": "^3.0.8",
       "broccoli-merge-trees": "^4.2.0",
       "@glimmer/validator": "^0.92.3",
-      "@glint/template": "^1.4.0",
+      "@glint/core": "1.5.0",
+      "@glint/environment-ember-loose": "1.5.0",
+      "@glint/environment-ember-template-imports": "1.5.0",
+      "@glint/template": "1.5.0",
       "ember-cli-babel": "^8.2.0",
       "ember-cli-htmlbars": "^6.3.0",
       "ember-cli-typescript": "^5.3.0",

diff --git a/packages/ember/package.json b/packages/ember/package.json
@@ -88,10 +88,10 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glimmer/validator": "^0.92.3",
-    "@glint/core": "^1.4.0",
-    "@glint/environment-ember-loose": "^1.4.0",
-    "@glint/environment-ember-template-imports": "^1.4.0",
-    "@glint/template": "^1.4.0",
+    "@glint/core": "1.5.0",
+    "@glint/environment-ember-loose": "1.5.0",
+    "@glint/environment-ember-template-imports": "1.5.0",
+    "@glint/template": "1.5.0",
     "decorator-transforms": "^2.2.2",
     "@embroider/addon-dev": "^4.3.1",
     "@ember-data/request": "workspace:5.4.0-alpha.115",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/main/package.json b/tests/main/package.json
@@ -102,6 +102,10 @@
     "@embroider/macros": "^1.16.6",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
+    "@glint/core": "1.5.0",
+    "@glint/environment-ember-loose": "1.5.0",
+    "@glint/environment-ember-template-imports": "1.5.0",
+    "@glint/template": "1.5.0",
     "@types/qunit": "^2.19.10",
     "@warp-drive/core-types": "workspace:0.0.0-alpha.101",
     "@warp-drive/schema-record": "workspace:0.0.0-alpha.101",

diff --git a/tests/main/tsconfig.json b/tests/main/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "include": ["app/**/*", "config/**/*", "tests/**/*", "../../@types/ember-data-qunit-asserts"],
+  "glint": {
+    "environment": ["ember-loose", "ember-template-imports"]
+  },
   "compilerOptions": {
     "lib": ["DOM", "ESNext"],
     "module": "esnext",

diff --git a/tests/warp-drive__ember/package.json b/tests/warp-drive__ember/package.json
@@ -94,9 +94,10 @@
     "@embroider/macros": "^1.16.6",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@glint/environment-ember-loose": "^1.4.0",
-    "@glint/environment-ember-template-imports": "^1.4.0",
-    "@glint/template": "^1.4.0",
+    "@glint/core": "1.5.0",
+    "@glint/environment-ember-loose": "1.5.0",
+    "@glint/environment-ember-template-imports": "1.5.0",
+    "@glint/template": "1.5.0",
     "@warp-drive/core-types": "workspace:0.0.0-alpha.101",
     "@warp-drive/internal-config": "workspace:5.4.0-alpha.115",
     "@warp-drive/schema-record": "workspace:0.0.0-alpha.101",

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,4 +1,7 @@
 {
+  "glint": {
+    "environment": ["ember-loose", "ember-template-imports"]
+  },
   "files": [],
   "include": [],
   "references": [