hbs -> gjs

Author: NullVoxPopuli

.github/workflows/ci.yml

@@ -103,8 +103,8 @@ jobs:
         working-directory: ./docs
         run: |
           pnpm tsc -v
-          pnpm glint --version
-          pnpm glint
+          pnpm ember-tsc --version
+          pnpm ember-tsc
 
   try-scenarios:
     name: Tests - ${{ matrix.ember-try-scenario }}

.gitignore

@@ -1,3 +1,3 @@
 node_modules
 yarn-error.log
-.DS_Store
+.DS_Store

.prettierignore

@@ -4,6 +4,7 @@
 
 # compiled output
 /dist/
+/declarations/
 /tmp/
 
 # dependencies

addon/.prettierignore

@@ -4,6 +4,7 @@
 
 # compiled output
 /dist/
+/declarations/
 /tmp/
 
 # dependencies

addon/README.md

@@ -104,6 +104,10 @@ module('Acceptance | Register Page', function (hooks) {
 });
 ```
 
+### TypeScript and Glint v2
+
+There is nothing to configure as only gjs/gts is supported
+
 ### TypeScript and Glint
 
 If your project uses loose-mode templates, you can merge in the template registry interface provided by ember-page-title, 

addon/package.json

@@ -58,7 +58,7 @@
     "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
-    "lint:types": "glint --declaration",
+    "lint:types": "ember-tsc --noEmit --declaration false --declarationMap false --emitDeclarationOnly false",
     "prepack": "rollup --config",
     "start": "rollup --config --watch --no-watch.clearScreen"
   },
@@ -73,10 +73,9 @@
     "@babel/plugin-proposal-decorators": "^7.23.6",
     "@ember/library-tsconfig": "^2.0.0",
     "@embroider/addon-dev": "^8.3.0",
-    "@glint/core": "^1.5.2",
-    "@glint/environment-ember-loose": "^1.5.2",
-    "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.5.2",
+    "@glint/ember-tsc": "^1.5.0",
+    "@glint/template": "^1.7.7",
+    "@glint/tsserver-plugin": "^2.4.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@types/rsvp": "^4.0.8",
     "@typescript-eslint/eslint-plugin": "^6.15.0",

addon/rollup.config.mjs

@@ -38,10 +38,12 @@ export default {
     // `dependencies` and `peerDependencies` as well as standard Ember-provided
     // package names.
     addon.dependencies(),
+    addon.declarations(
+      'declarations',
+      'pnpm ember-tsc --declaration --declarationDir declarations',
+    ),
 
     // Remove leftover build artifacts when starting a new build.
     addon.clean(),
-
-    addon.declarations('declarations'),
   ],
 };

addon/tsconfig.json

@@ -4,11 +4,8 @@
     "src/**/*",
     "unpublished-development-types/**/*"
   ],
-  "glint": {
-    "environment": ["ember-loose", "ember-template-imports"]
-  },
   "compilerOptions": {
-    "declarationDir": "declarations",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "types": ["ember-source/types", "@glint/ember-tsc/types"]
   }
 }

addon/unpublished-development-types/index.d.ts

@@ -1,18 +1,5 @@
-// Add any types here that you need for local development only.
-// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
-import 'ember-source/types';
-
-import '@glint/environment-ember-loose';
-
-declare module '@glint/environment-ember-loose/registry' {
-  // Remove this once entries have been added! 👇
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  export default interface Registry {
-    // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
-    // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
-  }
-}
-
 declare global {
   const FastBoot: unknown;
 }
+
+export {};

docs/app/components/icons.gts

@@ -0,0 +1,32 @@
+export const IconSvg = <template>
+  <svg width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g fill="#FFFFFF">
+        <path d="M14,5 L14,16 L12.5,16 L4,16 L2,16 L2,0 L3.5,0 L9,0 L11,2 L11,3 L12,3 L14,5 L14,5 Z M12,5 L12,14 L4,14 L4,14 L4,2 L4,2 L9,2 L9,5 L10.5,5 L12,5 L12,5 Z"></path>
+      </g>
+    </g>
+  </svg>
+</template>;
+
+export const EmberLogoSvg = <template>
+  <svg width="101px" height="40px" viewBox="0 0 101 40" xmlns="http://www.w3.org/2000/svg">
+    <g fill="#FFFFFF">
+      <path d="M69.0824302,29.1786144 C69.0824302,29.1786144 68.6206299,27.5413224 70.3418856,24.3926839 C72.0631414,21.2440454 73.4065605,22.9653011 73.4065605,22.9653011 C73.4065605,22.9653011 74.8759251,24.5606113 73.1966512,26.9535765 C71.5173773,29.3465418 69.0824302,29.1786144 69.0824302,29.1786144 Z M55.8581484,31.4456342 C53.8850016,36.6094014 49.0990711,34.510309 49.0990711,34.510309 C49.0990711,34.510309 48.553307,32.6631077 50.1066354,27.4993406 C51.6599637,22.3355734 55.3123844,24.350702 55.3123844,24.350702 C55.3123844,24.350702 57.8312952,26.281867 55.8581484,31.4456342 Z M52.2896914,9.82498297 C52.2896914,9.82498297 55.2704026,2.05834128 55.984094,5.83670751 C56.6977854,9.61507374 49.7287988,20.8662087 49.7287988,20.8662087 C49.8127624,18.3472979 52.2896914,9.82498297 52.2896914,9.82498297 Z M9.6779488,29.1786144 C9.80389434,24.1827746 13.0784784,21.9997186 14.2119883,23.0912466 C15.3454981,24.1827746 14.9256797,26.5337581 12.7846055,28.0031227 C10.6435313,29.4724874 9.6779488,29.1786144 9.6779488,29.1786144 Z M99.9810696,28.3495569 C99.8131422,26.670283 98.3017957,27.2946371 98.3017957,27.2946371 C98.3017957,27.2946371 95.8668486,29.1816371 93.7257744,28.97156 C91.5847002,28.7614828 92.2564098,23.9742088 92.2564098,23.9742088 C92.2564098,23.9742088 92.7182101,19.5872737 91.4587547,19.2195128 C90.1992993,18.8517518 88.6459709,20.3627624 88.6459709,20.3627624 C88.6459709,20.3627624 86.714806,22.5036687 85.7912053,25.2324887 L85.5393142,25.3164524 C85.5393142,25.3164524 85.8331872,20.530354 85.4973324,19.4388259 C85.2454413,18.8930619 82.9364397,18.9350438 82.5586031,19.9006262 C82.1807665,20.8662087 80.3335652,27.5833042 80.2076197,30.396088 C80.2076197,30.396088 76.5971808,33.4607628 73.4485423,33.964545 C70.2999038,34.4683272 69.5442305,32.4951803 69.5442305,32.4951803 C69.5442305,32.4951803 78.1085273,30.1022151 77.8146544,23.259174 C77.5207815,16.4161329 70.9086406,18.9462949 70.1598523,19.5088517 C69.4360853,20.0527685 65.5712365,22.3842723 64.4439399,28.8390653 C64.4054845,29.0592181 64.3384815,30.0182514 64.3384815,30.0182514 C64.3384815,30.0182514 61.0219156,32.2432893 59.1747143,32.8310351 C59.1747143,32.8310351 64.3384815,24.1407928 58.0412045,20.1944992 C55.1864389,18.4732435 52.9194191,22.0836823 52.9194191,22.0836823 C52.9194191,22.0836823 61.4417341,12.5957849 59.552551,4.5772521 C58.652796,0.75891915 56.7441333,0.348504614 54.9913072,0.966477402 C52.3316733,2.01635943 51.3241089,3.56968777 51.3241089,3.56968777 C51.3241089,3.56968777 47.8815975,8.56552756 47.0839424,15.9963145 C46.2862873,23.4271014 45.1107956,32.4112167 45.1107956,32.4112167 C45.1107956,32.4112167 43.4735036,34.0065268 41.9621571,34.0904905 C40.4508106,34.1744542 41.1225201,29.5984329 41.1225201,29.5984329 C41.1225201,29.5984329 42.2980118,22.6294463 42.2140481,21.4539546 C42.1300845,20.2784629 42.0461208,19.6487352 40.6607198,19.2289167 C39.2753189,18.8090982 37.7639724,20.5723358 37.7639724,20.5723358 C37.7639724,20.5723358 33.7756969,26.6177218 33.4398421,27.5413224 L33.2299329,27.919159 L33.0200237,27.6672679 C33.0200237,27.6672679 35.8328074,19.4388259 33.1459692,19.3128804 C30.459131,19.1869349 28.6958934,22.2516097 28.6958934,22.2516097 C28.6958934,22.2516097 25.6312186,27.373395 25.505273,27.9611409 L25.2953638,27.7092498 C25.2953638,27.7092498 26.5548192,21.7478275 26.3029281,20.2784629 C26.0510371,18.8090982 24.6656361,19.1029712 24.6656361,19.1029712 C24.6656361,19.1029712 22.9023985,18.8930619 22.4405982,20.0265718 C21.9787979,21.1600817 20.299524,28.6748323 20.0896148,31.0677975 C20.0896148,31.0677975 15.6813529,34.2164361 12.7846055,34.2584179 C9.88785803,34.3003998 10.181731,32.4216282 10.181731,32.4216282 C10.181731,32.4216282 20.8033062,28.7849926 17.9065587,21.6060968 C16.6049536,19.7588955 15.0936071,19.1790423 12.9525329,19.2210241 C10.8114587,19.263006 8.21714845,20.5684735 6.49589272,24.4308034 C5.67439194,26.2741423 5.43778225,28.0212589 5.26985487,29.3451984 L5.26985487,29.3446946 C5.26985487,29.3446946 3.3472542,29.7243784 2.33968987,28.8847415 C1.33212554,28.0451046 0.782163349,28.8847415 0.782163349,28.8847415 C0.782163349,28.8847415 -0.962266357,31.0572181 0.75898937,31.7289277 C2.4802451,32.4006372 5.1511302,32.683259 5.1511302,32.683259 L5.149283,32.683259 C5.39596833,33.8587507 6.11402584,35.8868098 8.20959172,37.4794331 C11.3582302,39.8723984 17.4031124,37.2754014 17.4031124,37.2754014 L19.8798735,35.8928552 C19.8798735,35.8928552 19.9636692,38.1694468 21.7688887,38.5011034 C23.5741081,38.8329279 24.3297813,38.4979128 27.4784199,30.8572166 C29.3256211,26.9529048 29.4515667,27.1631499 29.4515667,27.1631499 L29.6614759,27.121336 C29.6614759,27.121336 28.2340931,34.5942727 28.7798571,36.6094014 C29.3256211,38.62453 31.7185864,38.4144528 31.7185864,38.4144528 C31.7185864,38.4144528 33.0200237,38.6346057 34.0695698,34.9402031 C35.119116,31.2458006 37.1342447,27.1416552 37.1342447,27.1416552 L37.3861357,27.1416552 C37.3861357,27.1416552 36.504517,34.8142576 37.8479361,37.2492047 C39.1913552,39.6841518 42.6758485,38.0838038 42.6758485,38.0838038 C42.6758485,38.0838038 45.1107956,36.8638113 45.4886322,36.4859747 C45.4886322,36.4859747 48.3793343,38.9487978 52.4550999,38.5037902 C61.5676796,36.7103257 64.8086782,34.2903241 64.8086782,34.2903241 C64.8086782,34.2903241 66.3746011,38.2574407 71.2235044,38.6248659 C76.7651082,39.0446843 79.7878012,35.5600231 79.7878012,35.5600231 C79.7878012,35.5600231 79.7458194,37.8270428 81.6769843,38.6246979 C83.6081493,39.422353 84.9095865,34.9086328 84.9095865,34.9086328 L88.1421888,25.9661635 L88.4360617,25.9661635 C88.4360617,25.9661635 88.6039891,31.7915646 91.7946094,32.7151652 C94.9852298,33.6387659 99.1414327,30.5690532 99.1414327,30.5690532 C99.1414327,30.5690532 100.148997,30.0288308 99.9810696,28.3495569 L99.9810696,28.3495569 Z"></path>
+      <text font-family="LucidaGrande, Lucida Grande" font-size="0">ember</text>
+      <text font-family="LucidaGrande, Lucida Grande" font-size="8" font-weight="normal">
+        <tspan x="87" y="41">®</tspan>
+      </text>
+    </g>
+    <title>Ember</title>
+  </svg>
+</template>;
+
+export const ArrowSvg = <template>
+  <svg width="32px" height="12px" viewBox="0 0 32 12" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g fill="#FFFFFF">
+        <path d="M15.982229,1.20695922 L1,9.85517795 L1.54158651,10.7930408 L16,2.44718501 L16.2869741,2.61283555 L30.4584135,10.7930408 L31,9.85517795 L15.982229,1.20695922 Z" transform="translate(16.000000, 6.000000) scale(1, -1) translate(-16.000000, -6.000000)"></path>
+      </g>
+    </g>
+  </svg>
+</template>;