Merge pull request #20842 from NullVoxPopuli/nvp/upgrade-glimmer-vm-0-94

Upgrade glimmer-vm
emberjs · Feb 13, 2025 · 91467a6 · 91467a6
2 parents 930df88 + 64fc979
commit 91467a6
Show file tree

Hide file tree

Showing 66 changed files with 690 additions and 680 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,12 +26,8 @@ module.exports = {
 
     'disable-features/disable-async-await': 'error',
     'disable-features/disable-generator-functions': 'error',
-    'import/no-unresolved': [
-      'error',
-      {
-        ignore: ['@ember/template-compiler'],
-      },
-    ],
+    // Doesn't work with package.json#exports
+    'import/no-unresolved': 'off',
   },
 
   settings: {

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
       matrix:
         # I removed 'next' from this list because we're seeing buggy behavior in
         # the so-far unreleased 5.4. -ef4
-        ts-version: ['4.9', '5.0', '5.1', '5.2', '5.3']
+        ts-version: ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup

diff --git a/bin/run-tests-browser-runner.js b/bin/run-tests-browser-runner.js
@@ -65,7 +65,17 @@ module.exports = class BrowserRunner {
   }
 
   async newBrowser() {
-    let browser = await puppeteer.launch({ dumpio: true, headless: 'new' });
+    let browser = await puppeteer.launch({
+      dumpio: true,
+      headless: 'new',
+      userDataDir: '/tmp/new-profile',
+      args: [
+        '--no-sandbox',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
+      ],
+    });
     return browser;
   }
 

diff --git a/bin/run-tests.js b/bin/run-tests.js
@@ -81,7 +81,13 @@ run()
     process.exit(0); // eslint-disable-line n/no-process-exit
   })
   .catch(function (err) {
-    console.error(chalk.red(err.toString()));
+    console.error(chalk.red(`Error!`));
+
+    if ('passed' in err) {
+      console.error(err);
+    } else {
+      console.error(chalk.red(err.toString()));
+    }
     console.error(chalk.red('Failed!'));
     process.exit(1); // eslint-disable-line n/no-process-exit
   });
diff --git a/broccoli/amd-compat-entrypoints/ember.debug.js b/broccoli/amd-compat-entrypoints/ember.debug.js
@@ -419,9 +419,6 @@ d('@ember/utils/lib/type-of', emberUtilsLibTypeOf);
 import * as emberVersionIndex from '@ember/version/index';
 d('@ember/version/index', emberVersionIndex);
 
-import * as glimmerDebug from '@glimmer/debug';
-d('@glimmer/debug', glimmerDebug);
-
 import * as glimmerDestroyable from '@glimmer/destroyable';
 d('@glimmer/destroyable', glimmerDestroyable);
 

diff --git a/package.json b/package.json
@@ -66,23 +66,23 @@
     "@babel/core": "^7.24.4",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/addon-shim": "^1.9.0",
-    "@glimmer/compiler": "0.92.4",
-    "@glimmer/destroyable": "0.92.3",
+    "@glimmer/compiler": "0.94.8",
+    "@glimmer/destroyable": "0.94.6",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.92.3",
-    "@glimmer/interfaces": "0.92.3",
-    "@glimmer/manager": "0.92.4",
-    "@glimmer/node": "0.92.4",
-    "@glimmer/opcode-compiler": "0.92.4",
-    "@glimmer/owner": "0.92.3",
-    "@glimmer/program": "0.92.4",
-    "@glimmer/reference": "0.92.3",
-    "@glimmer/runtime": "0.92.4",
-    "@glimmer/syntax": "0.92.3",
-    "@glimmer/util": "0.92.3",
-    "@glimmer/validator": "0.92.3",
-    "@glimmer/vm": "0.92.3",
-    "@glimmer/vm-babel-plugins": "0.92.3",
+    "@glimmer/global-context": "0.93.2",
+    "@glimmer/interfaces": "0.94.5",
+    "@glimmer/manager": "0.94.7",
+    "@glimmer/node": "0.94.7",
+    "@glimmer/opcode-compiler": "0.94.7",
+    "@glimmer/owner": "0.93.2",
+    "@glimmer/program": "0.94.7",
+    "@glimmer/reference": "0.94.6",
+    "@glimmer/runtime": "0.94.7",
+    "@glimmer/syntax": "0.94.7",
+    "@glimmer/util": "0.94.6",
+    "@glimmer/validator": "0.94.6",
+    "@glimmer/vm": "0.94.6",
+    "@glimmer/vm-babel-plugins": "0.93.3",
     "@simple-dom/interface": "^1.4.0",
     "backburner.js": "^2.8.0",
     "broccoli-file-creator": "^2.1.1",
@@ -117,7 +117,7 @@
     "@simple-dom/document": "^1.4.0",
     "@swc-node/register": "^1.6.8",
     "@swc/core": "^1.3.100",
-    "@tsconfig/ember": "^2.0.0",
+    "@tsconfig/ember": "3.0.8",
     "@types/qunit": "^2.19.4",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.59.8",
@@ -153,9 +153,10 @@
     "mocha": "^10.2.0",
     "npm-run-all2": "^6.0.6",
     "prettier": "^2.8.0",
-    "puppeteer": "^24.1.0",
+    "puppeteer": "^24.2.0",
     "qunit": "^2.19.4",
     "recast": "^0.22.0",
+    "resolve.exports": "^2.0.3",
     "rollup": "^4.2.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
@@ -331,7 +332,6 @@
       "@ember/utils/lib/is_present.js": "ember-source/@ember/utils/lib/is_present.js",
       "@ember/utils/lib/type-of.js": "ember-source/@ember/utils/lib/type-of.js",
       "@ember/version/index.js": "ember-source/@ember/version/index.js",
-      "@glimmer/debug/index.js": "ember-source/@glimmer/debug/index.js",
       "@glimmer/destroyable/index.js": "ember-source/@glimmer/destroyable/index.js",
       "@glimmer/encoder/index.js": "ember-source/@glimmer/encoder/index.js",
       "@glimmer/env/index.js": "ember-source/@glimmer/env/index.js",
@@ -399,4 +399,4 @@
     "node": "16.20.0",
     "pnpm": "8.10.0"
   }
-}
+}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -28,7 +28,8 @@ import type {
 import type { Reference } from '@glimmer/reference';
 import { childRefFor, createComputeRef, createPrimitiveRef, valueForRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
-import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
+import { EMPTY_ARRAY } from '@glimmer/util';
+import { unwrapTemplate } from './unwrap-template';
 import {
   beginTrackFrame,
   beginUntrackFrame,

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -21,7 +21,7 @@ import type { Nullable } from '@ember/-internals/utility-types';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import type { Reference } from '@glimmer/reference';
 import { createConstRef, valueForRef } from '@glimmer/reference';
-import { unwrapTemplate } from '@glimmer/util';
+import { unwrapTemplate } from './unwrap-template';
 import type RuntimeResolver from '../resolver';
 
 interface EngineState {

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -19,7 +19,7 @@ import { capabilityFlagsFrom } from '@glimmer/manager';
 import type { Reference } from '@glimmer/reference';
 import { UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import { EMPTY_ARGS } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
+import { unwrapTemplate } from './unwrap-template';
 
 import type { DynamicScope } from '../renderer';
 import type { OutletState } from '../utils/outlet';

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/route-template.ts b/packages/@ember/-internals/glimmer/lib/component-managers/route-template.ts
@@ -4,6 +4,7 @@ import type {
   CapturedArguments,
   CompilableProgram,
   ComponentDefinition,
+  CurriedComponent,
   CustomRenderNode,
   Destroyable,
   InternalComponentCapabilities,
@@ -18,8 +19,7 @@ import { capabilityFlagsFrom } from '@glimmer/manager';
 import type { Reference } from '@glimmer/reference';
 import { createDebugAliasRef, valueForRef } from '@glimmer/reference';
 import { curry, type CurriedValue } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
-import { CurriedType } from '@glimmer/vm';
+import { unwrapTemplate } from './unwrap-template';
 
 interface RouteTemplateInstanceState {
   self: Reference;
@@ -158,5 +158,5 @@ export function makeRouteTemplate(
   template: Template
 ): CurriedValue {
   let routeTemplate = new RouteTemplate(name, template);
-  return curry(CurriedType.Component, routeTemplate, owner, null, true);
+  return curry(0 as CurriedComponent, routeTemplate, owner, null, true);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/unwrap-template.ts b/packages/@ember/-internals/glimmer/lib/component-managers/unwrap-template.ts
@@ -0,0 +1,14 @@
+import type { Template, TemplateOk } from '@glimmer/interfaces';
+
+/**
+ * @deprecated
+ */
+export function unwrapTemplate(template: Template): TemplateOk {
+  if (template.result === 'error') {
+    throw new Error(
+      `Compile Error: ${template.problem} @ ${template.span.start}..${template.span.end}`
+    );
+  }
+
+  return template;
+}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -292,7 +292,7 @@ export default internalHelper((args: CapturedArguments): Reference<Function> =>
   let [context, action, ...restArgs] = positional;
   assert('hash position arguments', context && action);
 
-  let debugKey: string = action.debugLabel!;
+  let debugKey = action.debugLabel!;
 
   let target = 'target' in named ? named['target'] : context;
   let processArgs = makeArgsProcessor(('value' in named && named['value']) || false, restArgs);
@@ -362,7 +362,7 @@ function makeDynamicClosureAction(
   targetRef: Reference<unknown>,
   actionRef: Reference<unknown>,
   processArgs: (args: unknown[]) => unknown[],
-  debugKey: string
+  debugKey: false | string
 ) {
   const action = valueForRef(actionRef);
 
@@ -391,7 +391,7 @@ function makeClosureAction(
   target: unknown,
   action: unknown | null | undefined | string | Function,
   processArgs: (args: unknown[]) => unknown[],
-  debugKey: string
+  debugKey: string | false
 ) {
   let self: object;
   let fn: Function;