Merge remote-tracking branch 'origin/main' into feature/rfc-0931

Author: wycats

.github/workflows/ci.yml

@@ -43,6 +43,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
+      - name: build types
+        run: pnpm build:types
       - name: Check published and internal types
         run: pnpm type-check
 

package.json

@@ -111,7 +111,7 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/types": "^7.22.5",
     "@embroider/shared-internals": "^2.5.0",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "workspace:^",
     "@rollup/plugin-babel": "^6.0.4",
     "@simple-dom/document": "^1.4.0",
     "@swc-node/register": "^1.6.8",
@@ -173,7 +173,7 @@
     }
   },
   "peerDependencies": {
-    "@glimmer/component": "^1.1.2"
+    "@glimmer/component": ">= 1.1.2"
   },
   "engines": {
     "node": ">= 18.*"

packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js

@@ -1,4 +1,10 @@
-import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
+import {
+  RenderingTestCase,
+  defineComponent,
+  moduleFor,
+  runTask,
+  strip,
+} from 'internal-test-helpers';
 
 import { set } from '@ember/object';
 
@@ -20,6 +26,21 @@ moduleFor(
       this.assertStableRerender();
     }
 
+    ['@test the array helper can be shadowed']() {
+      function array(...list) {
+        return list.map((n) => n * 2);
+      }
+
+      let First = defineComponent({ array }, `{{#each (array 1 2 3) as |n|}}[{{n}}]{{/each}}`);
+
+      let Root = defineComponent(
+        { shadowArray: array, First },
+        `{{#let shadowArray as |array|}}{{#each (array 5 10 15) as |n|}}[{{n}}]{{/each}}{{/let}}<First />`
+      );
+
+      this.renderComponent(Root, { expect: '[10][20][30][2][4][6]' });
+    }
+
     ['@test can have more than one value']() {
       this.render(strip`
       {{#let (array "Sergio" "Robert") as |people|}}

packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js

@@ -1,6 +1,6 @@
 import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
-import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import { RenderingTestCase, defineComponent, moduleFor, runTask } from 'internal-test-helpers';
 import { Component } from '../../utils/helpers';
 
 moduleFor(
@@ -22,6 +22,14 @@ moduleFor(
       });
     }
 
+    '@test fn can be shadowed'() {
+      let First = defineComponent(
+        { fn: boundFn, boundFn, id, invoke },
+        `[{{invoke (fn id 1)}}]{{#let boundFn as |fn|}}[{{invoke (fn id 2)}}{{/let}}]`
+      );
+      this.renderComponent(First, { expect: `[bound:1][bound:2]` });
+    }
+
     '@test updates when arguments change'() {
       this.render(`{{invoke (fn this.myFunc this.arg1 this.arg2)}}`, {
         myFunc(arg1, arg2) {
@@ -209,3 +217,13 @@ moduleFor(
     }
   }
 );
+
+function invoke(fn) {
+  return fn();
+}
+
+function boundFn(fn, ...args) {
+  return () => fn(...args.map((arg) => `bound:${arg}`));
+}
+
+let id = (arg) => arg;

packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js

@@ -1,4 +1,4 @@
-import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import { RenderingTestCase, defineComponent, moduleFor, runTask } from 'internal-test-helpers';
 
 import { set, get } from '@ember/object';
 
@@ -32,6 +32,17 @@ moduleFor(
       this.assertText('[red] [red]');
     }
 
+    ['@test can be shadowed']() {
+      let get = (obj, key) => `obj.${key}=${obj[key]}`;
+      let obj = { apple: 'red', banana: 'yellow' };
+      let Root = defineComponent(
+        { get, outerGet: get, obj },
+        `[{{get obj 'apple'}}][{{#let outerGet as |get|}}{{get obj 'banana'}}{{/let}}]`
+      );
+
+      this.renderComponent(Root, { expect: '[obj.apple=red][obj.banana=yellow]' });
+    }
+
     ['@test should be able to get an object value with nested static key']() {
       this.render(
         `[{{get this.colors "apple.gala"}}] [{{if true (get this.colors "apple.gala")}}]`,

packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js

@@ -1,4 +1,4 @@
-import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import { RenderingTestCase, defineComponent, moduleFor, runTask } from 'internal-test-helpers';
 
 import { Component } from '../../utils/helpers';
 
@@ -17,6 +17,21 @@ moduleFor(
       this.assertText('Sergio');
     }
 
+    ['@test can be shadowed']() {
+      let hash = (obj) =>
+        Object.entries(obj)
+          .map(([key, value]) => `hash:${key}=${value}`)
+          .join(',');
+      let Root = defineComponent(
+        { hash, shadowHash: hash },
+        `({{hash apple='red' banana='yellow'}}) ({{#let shadowHash as |hash|}}{{hash apple='green'}}{{/let}})`
+      );
+
+      this.renderComponent(Root, {
+        expect: '(hash:apple=red,hash:banana=yellow) (hash:apple=green)',
+      });
+    }
+
     ['@test can have more than one key-value']() {
       this.render(
         `{{#let (hash name="Sergio" lastName="Arbeo") as |person|}}{{person.name}} {{person.lastName}}{{/let}}`

packages/@ember/-internals/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "description": "Internal APIs shared by Ember packages. Warning: this package does not follow SemVer and is subject to break at any time!",
   "type": "module",
+  "private": true,
   "exports": {
     "./browser-environment": "./browser-environment/index.ts",
     "./container": "./container/index.ts",
@@ -23,7 +24,7 @@
     "@ember/application": "workspace:*",
     "@ember/array": "workspace:*",
     "@ember/canary-features": "workspace:*",
-    "@ember/component": "workspace:*",
+    "@ember/component": "workspace:^",
     "@ember/controller": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
@@ -40,7 +41,7 @@
     "@ember/template-factory": "workspace:*",
     "@ember/utils": "workspace:*",
     "@glimmer/compiler": "0.92.4",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "workspace:^",
     "@glimmer/destroyable": "0.92.3",
     "@glimmer/env": "^0.1.7",
     "@glimmer/global-context": "0.92.3",

packages/@ember/owner/package.json

@@ -13,8 +13,8 @@
     "@ember/object": "workspace:*",
     "@ember/routing": "workspace:*",
     "@ember/runloop": "workspace:*",
-    "@glimmer/component": "^1.1.2",
+    "@glimmer/component": "workspace:^",
     "@glimmer/env": "^0.1.7",
     "expect-type": "^0.15.0"
   }
-}
+}

packages/@glimmer/component/CHANGELOG.md

@@ -0,0 +1,11 @@
+# @glimmer/component
+
+## 2.0.0-beta.22 2024-10-29
+
+ - BREAKING: converted to V2 addon
+ - BREAKING: dropped support for ember < 3.13
+
+
+## Older Releases
+
+Versions up to 1.1.12 and 2.0.0-beta.21 were maintained in https://github.com/glimmerjs/glimmer.js

packages/@glimmer/component/addon-main.cjs

@@ -0,0 +1,5 @@
+/* eslint-env node */
+'use strict';
+
+const { addonV1Shim } = require('@embroider/addon-shim');
+module.exports = addonV1Shim(__dirname);