Merge branch 'typed-ember:main' into allow-generics-in-signatures

gossi · web-flow · commit 113c42a9ec12 · 2023-09-09T16:31:38.000+02:00
diff --git a/docs/ember/helper-and-modifier-signatures.md b/docs/ember/helper-and-modifier-signatures.md
@@ -24,8 +24,8 @@ export interface AddSignature {
 }
 
 export default class AddHelper extends Helper<AddSignature> {
-  public compute(positional: Positional, named: Named): number {
-    let total = positional.reduce((sum, next) => sum + next, 0);
+  public compute(values: Positional, named: Named): number {
+    let total = values.reduce((sum, next) => sum + next, 0);
     if (typeof named.andThenMultiplyBy === 'number') {
       total *= named.andThenMultiplyBy;
     }
@@ -49,7 +49,7 @@ export interface AddSignature {
 }
 
 const add = helper<AddSignature>((values, { andThenMultiplyBy }) => {
-  let total = positional.reduce((sum, next) => sum + next, 0);
+  let total = values.reduce((sum, next) => sum + next, 0);
   if (typeof andThenMultiplyBy === 'number') {
     total *= andThenMultiplyBy;
   }
@@ -66,7 +66,7 @@ export default add;
 import { helper } from '@ember/component/helper';
 
 const add = helper((values: Array<number>, named: { andThenMultiplyBy?: number }) => {
-  let total = positional.reduce((sum, next) => sum + next, 0);
+  let total = values.reduce((sum, next) => sum + next, 0);
   if (typeof named.andThenMultiplyBy === 'number') {
     total *= named.andThenMultiplyBy;
   }
diff --git a/package.json b/package.json
@@ -37,5 +37,5 @@
     "@types/yargs": "17.0.13",
     "ember-cli-htmlbars": "^6.0.1"
   },
-  "version": "1.0.2"
+  "version": "1.1.0"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/core",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "A CLI for performing typechecking on Glimmer templates",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "glint-monorepo-test-utils": "^1.0.2",
+    "glint-monorepo-test-utils": "^1.1.0",
     "@types/common-tags": "^1.8.0",
     "@types/node": "^18.11.5",
     "@types/semver": "^7.3.13",
diff --git a/packages/environment-ember-loose/package.json b/packages/environment-ember-loose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/environment-ember-loose",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "A Glint environment to support loose-mode Ember.js projects",
   "license": "MIT",
@@ -28,7 +28,7 @@
   ],
   "peerDependencies": {
     "@glimmer/component": "^1.1.2",
-    "@glint/template": "^1.0.2",
+    "@glint/template": "^1.1.0",
     "@types/ember__array": "^4.0.2",
     "@types/ember__component": "^4.0.10",
     "@types/ember__controller": "^4.0.2",
diff --git a/packages/environment-ember-template-imports/package.json b/packages/environment-ember-template-imports/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/environment-ember-template-imports",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "A Glint environment to support ember-template-imports projects",
   "license": "MIT",
@@ -27,8 +27,8 @@
     "globals/index.d.ts"
   ],
   "peerDependencies": {
-    "@glint/environment-ember-loose": "^1.0.2",
-    "@glint/template": "^1.0.2",
+    "@glint/environment-ember-loose": "^1.1.0",
+    "@glint/template": "^1.1.0",
     "@types/ember__component": "^4.0.10",
     "@types/ember__helper": "^4.0.1",
     "@types/ember__modifier": "^4.0.3",
diff --git a/packages/environment-glimmerx/package.json b/packages/environment-glimmerx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/environment-glimmerx",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "A Glint environment to support GlimmerX projects",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "component/**/*.{js,d.ts}"
   ],
   "peerDependencies": {
-    "@glint/template": "^1.0.2",
+    "@glint/template": "^1.1.0",
     "@glimmerx/component": "^0.6.7",
     "@glimmerx/modifier": "^0.6.7",
     "@glimmerx/helper": "^0.6.7"
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/scripts",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "type": "module",
   "repository": "typed-ember/glint",
   "description": "Scripts for working with Glint",
diff --git a/packages/template/package.json b/packages/template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/template",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "Type definitions to back typechecking for Glimmer templates",
   "license": "MIT",
diff --git a/packages/type-test/package.json b/packages/type-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glint/type-test",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "repository": "typed-ember/glint",
   "description": "Tools for testing inferred types in Glint-enabled templates",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "expect-type": "^0.15.0"
   },
   "peerDependencies": {
-    "@glint/template": "^1.0.2"
+    "@glint/template": "^1.1.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "glint-vscode",
   "displayName": "Glint",
   "description": "Glint language server integration for VS Code",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "publisher": "typed-ember",
   "private": true,
   "author": "James C. Davis (https://github.com/jamescdavis)",
@@ -92,7 +92,7 @@
     "@vscode/test-electron": "Dropped support for Node < 16 in the 2.2.1 patch release, so locking to 2.2.0 while we still support Node 14."
   },
   "devDependencies": {
-    "@glint/core": "^1.0.2",
+    "@glint/core": "^1.1.0",
     "@types/mocha": "^10.0.1",
     "@types/vscode": "^1.68.1",
     "@vscode/test-electron": "2.2.0",
diff --git a/test-packages/js-glimmerx-app/package.json b/test-packages/js-glimmerx-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-glimmerx-app",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A brand new Glimmer app.",
   "directories": {
     "doc": "doc",
@@ -23,7 +23,7 @@
     "@glimmerx/eslint-plugin": "^0.6.7",
     "@glimmerx/helper": "^0.6.7",
     "@glimmerx/modifier": "^0.6.7",
-    "@glint/core": "^1.0.2",
+    "@glint/core": "^1.1.0",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
diff --git a/test-packages/test-utils/package.json b/test-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "glint-monorepo-test-utils",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "private": true,
   "type": "module",
   "exports": {
diff --git a/test-packages/ts-ember-app/package.json b/test-packages/ts-ember-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-ember-app",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "private": true,
   "description": "Small description for ts-ember-app goes here",
   "repository": "",
@@ -28,8 +28,8 @@
     "@ember/test-helpers": "^2.9.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@glint/core": "^1.0.2",
-    "@glint/environment-ember-loose": "^1.0.2",
+    "@glint/core": "^1.1.0",
+    "@glint/environment-ember-loose": "^1.1.0",
     "@types/ember": "~4.0.0",
     "@types/qunit": "^2.11.1",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/test-packages/ts-ember-preview-types/package.json b/test-packages/ts-ember-preview-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-ember-preview-types",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "private": true,
   "description": "Small description for ts-ember-preview-types goes here",
   "repository": "",
diff --git a/test-packages/ts-glimmerx-app/package.json b/test-packages/ts-glimmerx-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-glimmerx-app",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A brand new Glimmer app.",
   "directories": {
     "doc": "doc",
@@ -27,8 +27,8 @@
     "@glimmerx/helper": "^0.6.7",
     "@glimmerx/modifier": "^0.6.7",
     "@glimmerx/service": "^0.6.7",
-    "@glint/core": "^1.0.2",
-    "@glint/environment-glimmerx": "^1.0.2",
+    "@glint/core": "^1.1.0",
+    "@glint/environment-glimmerx": "^1.1.0",
     "@types/qunit": "^2.9.1",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
diff --git a/test-packages/ts-template-imports-app/package.json b/test-packages/ts-template-imports-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-template-imports-app",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "private": true,
   "license": "MIT",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ export interface AddSignature {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`export default class AddHelper extends Helper<AddSignature> {`
`27`		`- public compute(positional: Positional, named: Named): number {`
`28`		`- let total = positional.reduce((sum, next) => sum + next, 0);`
	`27`	`+ public compute(values: Positional, named: Named): number {`
	`28`	`+ let total = values.reduce((sum, next) => sum + next, 0);`
`29`	`29`	`if (typeof named.andThenMultiplyBy === 'number') {`
`30`	`30`	`total *= named.andThenMultiplyBy;`
`31`	`31`	`}`
`@@ -49,7 +49,7 @@ export interface AddSignature {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`const add = helper<AddSignature>((values, { andThenMultiplyBy }) => {`
`52`		`- let total = positional.reduce((sum, next) => sum + next, 0);`
	`52`	`+ let total = values.reduce((sum, next) => sum + next, 0);`
`53`	`53`	`if (typeof andThenMultiplyBy === 'number') {`
`54`	`54`	`total *= andThenMultiplyBy;`
`55`	`55`	`}`
`@@ -66,7 +66,7 @@ export default add;`
`66`	`66`	`import { helper } from '@ember/component/helper';`
`67`	`67`
`68`	`68`	`const add = helper((values: Array<number>, named: { andThenMultiplyBy?: number }) => {`
`69`		`- let total = positional.reduce((sum, next) => sum + next, 0);`
	`69`	`+ let total = values.reduce((sum, next) => sum + next, 0);`
`70`	`70`	`if (typeof named.andThenMultiplyBy === 'number') {`
`71`	`71`	`total *= named.andThenMultiplyBy;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@`
`37`	`37`	`"@types/yargs": "17.0.13",`
`38`	`38`	`"ember-cli-htmlbars": "^6.0.1"`
`39`	`39`	`},`
`40`		`- "version": "1.0.2"`
	`40`	`+ "version": "1.1.0"`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@glint/scripts",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"repository": "typed-ember/glint",`
`6`	`6`	`"description": "Scripts for working with Glint",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@glint/template",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"repository": "typed-ember/glint",`
`5`	`5`	`"description": "Type definitions to back typechecking for Glimmer templates",`
`6`	`6`	`"license": "MIT",`