diff --git a/.eslintrc.js b/.eslintrc.js index 19c5446ec82..79cc806f403 100644 --- 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 index 6ba793adaf3..c34c33bc069 100644 --- 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 index ab7d21334ee..9cccae5357d 100644 --- 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 index 44687d9f46f..2da4f9813e5 100755 --- 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 index 9674971a6a7..79a5532ccd9 100644 --- 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 index 9bea7943632..fdeedf1ef22 100644 --- 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" } -} +} \ No newline at end of file diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts index aac4e077e85..0b0da6ec97d 100644 --- 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 index 068d30c8fbf..1fa7a7c8e3c 100644 --- 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 index 449576f4483..7e81882ed0e 100644 --- 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 index 4277f89323d..e1bcbb080a9 100644 --- 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 new file mode 100644 index 00000000000..98042c14bc6 --- /dev/null +++ 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 index 6344eb92915..a73cffa1e79 100644 --- 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 => 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, actionRef: Reference, 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; diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts index 2e64e171499..01ef5bc3327 100644 --- a/packages/@ember/-internals/glimmer/lib/renderer.ts +++ b/packages/@ember/-internals/glimmer/lib/renderer.ts @@ -10,21 +10,19 @@ import { destroy } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; import type { Bounds, - CompileTimeCompilationContext, Cursor, DebugRenderTree, DynamicScope as GlimmerDynamicScope, - ElementBuilder, Environment, RenderResult, - RuntimeContext, Template, TemplateFactory, + EvaluationContext, + CurriedComponent, + TreeBuilder, } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/vm'; import type { Nullable } from '@ember/-internals/utility-types'; -import { programCompilationContext } from '@glimmer/opcode-compiler'; import { artifacts, RuntimeOpImpl } from '@glimmer/program'; import type { Reference } from '@glimmer/reference'; import { createConstRef, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference'; @@ -33,14 +31,13 @@ import { clientBuilder, createCapturedArgs, curry, - DOMChanges, - DOMTreeConstruction, EMPTY_POSITIONAL, inTransaction, renderMain, - runtimeContext, + runtimeOptions, } from '@glimmer/runtime'; -import { dict, unwrapTemplate } from '@glimmer/util'; +import { dict } from '@glimmer/util'; +import { unwrapTemplate } from './component-managers/unwrap-template'; import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator'; import type { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface'; import RSVP from 'rsvp'; @@ -48,14 +45,14 @@ import type Component from './component'; import { BOUNDS } from './component-managers/curly'; import { createRootOutlet } from './component-managers/outlet'; import { RootComponentDefinition } from './component-managers/root'; -import { NodeDOMTreeConstruction } from './dom'; import { EmberEnvironmentDelegate } from './environment'; import ResolverImpl from './resolver'; import type { OutletState } from './utils/outlet'; import OutletView from './views/outlet'; import { makeRouteTemplate } from './component-managers/route-template'; +import { EvaluationContextImpl } from '@glimmer/opcode-compiler'; -export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder; +export type IBuilder = (env: Environment, cursor: Cursor) => TreeBuilder; export interface View { parentView: Nullable; @@ -128,11 +125,11 @@ class RootState { public result: RenderResult | undefined; public destroyed: boolean; public render: () => void; + readonly env: Environment; constructor( public root: Component | OutletView, - public runtime: RuntimeContext, - context: CompileTimeCompilationContext, + context: EvaluationContext, owner: InternalOwner, template: Template, self: Reference, @@ -148,16 +145,16 @@ class RootState { this.id = root instanceof OutletView ? guidFor(root) : getViewId(root); this.result = undefined; this.destroyed = false; + this.env = context.env; this.render = errorLoopTransaction(() => { let layout = unwrapTemplate(template).asLayout(); let iterator = renderMain( - runtime, context, owner, self, - builder(runtime.env, { element: parentElement, nextSibling: null }), + builder(context.env, { element: parentElement, nextSibling: null }), layout, dynamicScope ); @@ -174,14 +171,10 @@ class RootState { } destroy() { - let { - result, - runtime: { env }, - } = this; + let { result, env } = this; this.destroyed = true; - this.runtime = undefined as any; this.root = null as any; this.result = undefined; this.render = undefined as any; @@ -293,8 +286,7 @@ export class Renderer { private _inRenderTransaction = false; private _owner: InternalOwner; - private _context: CompileTimeCompilationContext; - private _runtime: RuntimeContext; + private _context: EvaluationContext; private _lastRevision = -1; private _destroyed = false; @@ -303,6 +295,7 @@ export class Renderer { _isInteractive: boolean; readonly _runtimeResolver: ResolverImpl; + readonly env: Environment; static create(props: { _viewRegistry: any }): Renderer { let { _viewRegistry } = props; @@ -321,7 +314,7 @@ export class Renderer { constructor( owner: InternalOwner, document: SimpleDocument, - env: { isInteractive: boolean; hasDOM: boolean }, + envOptions: { isInteractive: boolean; hasDOM: boolean }, rootTemplate: TemplateFactory, viewRegistry: ViewRegistry, builder = clientBuilder @@ -332,35 +325,25 @@ export class Renderer { this._roots = []; this._removedRoots = []; this._builder = builder; - this._isInteractive = env.isInteractive; - - // resolver is exposed for tests - let resolver = (this._runtimeResolver = new ResolverImpl()); + this._isInteractive = envOptions.isInteractive; let sharedArtifacts = artifacts(); - this._context = programCompilationContext( - sharedArtifacts, - resolver, - (heap) => new RuntimeOpImpl(heap) - ); + // resolver is exposed for tests + let resolver = (this._runtimeResolver = new ResolverImpl()); + let env = new EmberEnvironmentDelegate(owner, envOptions.isInteractive); + let options = runtimeOptions({ document }, env, sharedArtifacts, resolver); - let runtimeEnvironmentDelegate = new EmberEnvironmentDelegate(owner, env.isInteractive); - this._runtime = runtimeContext( - { - appendOperations: env.hasDOM - ? new DOMTreeConstruction(document) - : new NodeDOMTreeConstruction(document), - updateOperations: new DOMChanges(document), - }, - runtimeEnvironmentDelegate, + this._context = new EvaluationContextImpl( sharedArtifacts, - resolver + (heap) => new RuntimeOpImpl(heap), + options ); + this.env = this._context.env; } get debugRenderTree(): DebugRenderTree { - let { debugRenderTree } = this._runtime.env; + let { debugRenderTree } = this.env; assert( 'Attempted to access the DebugRenderTree, but it did not exist. Is the Ember Inspector open?', @@ -403,7 +386,7 @@ export class Renderer { this._appendDefinition( view, - curry(CurriedType.Component, outlet, view.owner, args, true), + curry(0 as CurriedComponent, outlet, view.owner, args, true), target ); } @@ -412,7 +395,7 @@ export class Renderer { let definition = new RootComponentDefinition(view); this._appendDefinition( view, - curry(CurriedType.Component, definition, this._owner, null, true), + curry(0 as CurriedComponent, definition, this._owner, null, true), target ); } @@ -426,7 +409,6 @@ export class Renderer { let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE); let rootState = new RootState( root, - this._runtime, this._context, this._owner, this._rootTemplate, @@ -521,7 +503,7 @@ export class Renderer { } createElement(tagName: string): SimpleElement { - return this._runtime.env.getAppendOperations().createElement(tagName); + return this.env.getAppendOperations().createElement(tagName); } _renderRoot(root: RootState): void { @@ -537,13 +519,13 @@ export class Renderer { } _renderRoots(): void { - let { _roots: roots, _runtime: runtime, _removedRoots: removedRoots } = this; + let { _roots: roots, _removedRoots: removedRoots } = this; let initialRootsLength: number; do { initialRootsLength = roots.length; - inTransaction(runtime.env, () => { + inTransaction(this.env, () => { // ensure that for the first iteration of the loop // each root is processed for (let i = 0; i < roots.length; i++) { diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts index 3df207331b0..759b10f6bbb 100644 --- a/packages/@ember/-internals/glimmer/lib/resolver.ts +++ b/packages/@ember/-internals/glimmer/lib/resolver.ts @@ -4,11 +4,10 @@ import { assert } from '@ember/debug'; import { _instrumentStart } from '@ember/instrumentation'; import { DEBUG } from '@glimmer/env'; import type { - CompileTimeResolver, + ClassicResolver, HelperDefinitionState, ModifierDefinitionState, ResolvedComponentDefinition, - RuntimeResolver, Template, TemplateFactory, } from '@glimmer/interfaces'; @@ -170,9 +169,7 @@ const BUILTIN_MODIFIERS: Record = { const CLASSIC_HELPER_MANAGER_ASSOCIATED = new WeakSet(); -export default class ResolverImpl - implements RuntimeResolver, CompileTimeResolver -{ +export default class ResolverImpl implements ClassicResolver { private componentDefinitionCache: Map = new Map(); lookupPartial(): null { diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts index d39399e1524..eef12143582 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts @@ -5,8 +5,7 @@ import type { InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import type { Nullable } from '@ember/-internals/utility-types'; -import type { CapturedArguments } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/vm'; +import type { CapturedArguments, CurriedComponent } from '@glimmer/interfaces'; import type { Reference } from '@glimmer/reference'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import type { CurriedValue } from '@glimmer/runtime'; @@ -95,7 +94,7 @@ export const mountHelper = internalHelper( ); lastName = name; - lastDef = curry(CurriedType.Component, new MountDefinition(name), owner, captured, true); + lastDef = curry(0 as CurriedComponent, new MountDefinition(name), owner, captured, true); return lastDef; } else { diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts index bbaedf026c1..c4f6909a579 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts @@ -1,8 +1,12 @@ import type { InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments, DynamicScope, Template } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/vm'; +import type { + CapturedArguments, + CurriedComponent, + DynamicScope, + Template, +} from '@glimmer/interfaces'; import type { Reference } from '@glimmer/reference'; import { childRefFromParts, @@ -167,7 +171,7 @@ export const outletHelper = internalHelper( // Package up everything outlet = curry( - CurriedType.Component, + 0 as CurriedComponent, new OutletComponent(owner, state), outletOwner, args, diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts index fb3a796bb17..b255af4502c 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts +++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts @@ -17,7 +17,6 @@ import type EngineInstance from '@ember/engine/instance'; import type { CapturedRenderNode } from '@glimmer/interfaces'; import { componentCapabilities, setComponentTemplate } from '@glimmer/manager'; import { templateOnlyComponent } from '@glimmer/runtime'; -import { expect } from '@glimmer/util'; import type { SimpleElement, SimpleNode } from '@simple-dom/interface'; import type { EmberPrecompileOptions } from 'ember-template-compiler'; import { compile } from 'ember-template-compiler'; @@ -1660,11 +1659,12 @@ if (ENV._DEBUG_RENDER_TREE) { } nodeBounds(node: Node | null): CapturedBounds { + if (!node?.parentNode) { + throw new Error('BUG: detached node'); + } + return { - parentElement: expect( - node?.parentNode, - 'BUG: detached node' - ) as unknown as SimpleNode as SimpleElement, + parentElement: node.parentNode as unknown as SimpleElement, firstNode: node as unknown as SimpleNode, lastNode: node as unknown as SimpleNode, }; diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js index bedadc7e03e..0e60cb65c45 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js @@ -2,7 +2,14 @@ import { moduleFor, ApplicationTestCase, strip, runTask } from 'internal-test-he import Service, { service } from '@ember/service'; import { Component, Helper } from '@ember/-internals/glimmer'; -import { expect } from '@glimmer/util'; + +function expect(value) { + if (!value) { + throw new Error(`value missing`); + } + + return value; +} // This simuates what the template hot-reloading would do in development mode // to avoid regressions diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js index b26992d1ccd..7cc5ce17f0c 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js @@ -272,7 +272,7 @@ class ModifierManagerTest extends RenderingTestCase { ); let expectedMessage = backtrackingMessageFor('name', Person.name, { - renderTree: ['\\(instance of a `foo-bar` modifier\\)'], + renderTree: [], includeTopLevel: false, }); diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts index 919f386f386..b421631eaf2 100644 --- a/packages/@ember/-internals/owner/index.ts +++ b/packages/@ember/-internals/owner/index.ts @@ -538,7 +538,8 @@ export function isFactory(obj: unknown): obj is InternalFactory { // we document it there for the sake of public API docs and for TS consumption, // while having the richer `InternalOwner` representation for Ember itself. export function getOwner(object: object): InternalOwner | undefined { - return glimmerGetOwner(object); + // SAFETY: this is a convention. From the glimmer perspective, the owner really can be any object. + return glimmerGetOwner(object) as InternalOwner; } /** diff --git a/packages/@ember/-internals/package.json b/packages/@ember/-internals/package.json index a6015038caa..57c45dae414 100644 --- a/packages/@ember/-internals/package.json +++ b/packages/@ember/-internals/package.json @@ -40,23 +40,23 @@ "@ember/service": "workspace:*", "@ember/template-factory": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/compiler": "0.92.4", + "@glimmer/compiler": "0.94.8", "@glimmer/component": "workspace:^", - "@glimmer/destroyable": "0.92.3", + "@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/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", "@simple-dom/interface": "^1.4.0", "backburner.js": "^2.7.0", "dag-map": "^2.0.2", diff --git a/packages/@ember/application/package.json b/packages/@ember/application/package.json index 5936dc7297b..e6c2159c314 100644 --- a/packages/@ember/application/package.json +++ b/packages/@ember/application/package.json @@ -19,11 +19,11 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "dag-map": "^2.0.2", "ember": "workspace:*", diff --git a/packages/@ember/array/package.json b/packages/@ember/array/package.json index 7e2271cd9d8..6e2c402b07f 100644 --- a/packages/@ember/array/package.json +++ b/packages/@ember/array/package.json @@ -17,12 +17,12 @@ "@ember/object": "workspace:*", "@ember/runloop": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" } diff --git a/packages/@ember/component/package.json b/packages/@ember/component/package.json index f8998daa04e..088a0fceeae 100644 --- a/packages/@ember/component/package.json +++ b/packages/@ember/component/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "@ember/-internals": "workspace:*", - "@glimmer/manager": "0.92.4", - "@glimmer/runtime": "0.92.4", + "@glimmer/manager": "0.94.7", + "@glimmer/runtime": "0.94.7", "expect-type": "^0.15.0" } } diff --git a/packages/@ember/controller/package.json b/packages/@ember/controller/package.json index aa504bd5558..9661c55ad50 100644 --- a/packages/@ember/controller/package.json +++ b/packages/@ember/controller/package.json @@ -11,11 +11,11 @@ "@ember/debug": "workspace:*", "@ember/object": "workspace:*", "@ember/service": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" } diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts index af2d3831b72..6f7d28bb532 100644 --- a/packages/@ember/debug/lib/capture-render-tree.ts +++ b/packages/@ember/debug/lib/capture-render-tree.ts @@ -1,7 +1,6 @@ import type { Renderer } from '@ember/-internals/glimmer'; import type Owner from '@ember/owner'; import type { CapturedRenderNode } from '@glimmer/interfaces'; -import { expect } from '@glimmer/util'; /** @module @ember/debug @@ -20,9 +19,14 @@ import { expect } from '@glimmer/util'; @since 3.14.0 */ export default function captureRenderTree(app: Owner): CapturedRenderNode[] { + let domRenderer = app.lookup('renderer:-dom') as Renderer; + + if (!domRenderer) { + throw new Error(`BUG: owner is missing renderer`); + } // SAFETY: Ideally we'd assert here but that causes awkward circular requires since this is also in @ember/debug. // This is only for debug stuff so not very risky. - let renderer = expect(app.lookup('renderer:-dom') as Renderer, `BUG: owner is missing renderer`); + let renderer = domRenderer; return renderer.debugRenderTree.capture(); } diff --git a/packages/@ember/debug/package.json b/packages/@ember/debug/package.json index 989be8e3219..1c000f915e9 100644 --- a/packages/@ember/debug/package.json +++ b/packages/@ember/debug/package.json @@ -18,12 +18,12 @@ "@ember/routing": "workspace:*", "@ember/runloop": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" diff --git a/packages/@ember/destroyable/package.json b/packages/@ember/destroyable/package.json index 75ec06f9079..31dc8dd75ab 100644 --- a/packages/@ember/destroyable/package.json +++ b/packages/@ember/destroyable/package.json @@ -6,7 +6,7 @@ ".": "./index.ts" }, "dependencies": { - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "expect-type": "^0.15.0" } } diff --git a/packages/@ember/engine/package.json b/packages/@ember/engine/package.json index 550c9330356..fa65165335e 100644 --- a/packages/@ember/engine/package.json +++ b/packages/@ember/engine/package.json @@ -19,11 +19,11 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "dag-map": "^2.0.2", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*", diff --git a/packages/@ember/enumerable/package.json b/packages/@ember/enumerable/package.json index 591e0d5571a..a92bac8e7ef 100644 --- a/packages/@ember/enumerable/package.json +++ b/packages/@ember/enumerable/package.json @@ -11,11 +11,11 @@ "@ember/array": "workspace:*", "@ember/debug": "workspace:*", "@ember/object": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "internal-test-helpers": "workspace:*" } } diff --git a/packages/@ember/helper/package.json b/packages/@ember/helper/package.json index 3a7a1b5444c..db255c38c82 100644 --- a/packages/@ember/helper/package.json +++ b/packages/@ember/helper/package.json @@ -8,8 +8,8 @@ "dependencies": { "@ember/-internals": "workspace:*", "@ember/component": "workspace:*", - "@glimmer/manager": "0.92.4", - "@glimmer/runtime": "0.92.4", + "@glimmer/manager": "0.94.7", + "@glimmer/runtime": "0.94.7", "expect-type": "^0.15.0" } } diff --git a/packages/@ember/instrumentation/package.json b/packages/@ember/instrumentation/package.json index 3f5b4129efa..f75eef6a493 100644 --- a/packages/@ember/instrumentation/package.json +++ b/packages/@ember/instrumentation/package.json @@ -14,7 +14,7 @@ "@ember/runloop": "workspace:*", "@ember/utils": "workspace:*", "@glimmer/env": "^0.1.7", - "@glimmer/validator": "0.92.3", + "@glimmer/validator": "0.94.6", "internal-test-helpers": "workspace:*" } } diff --git a/packages/@ember/modifier/package.json b/packages/@ember/modifier/package.json index 34a977aa6ae..e9fd459c2f5 100644 --- a/packages/@ember/modifier/package.json +++ b/packages/@ember/modifier/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@ember/-internals": "workspace:*", - "@glimmer/manager": "0.92.4", - "@glimmer/runtime": "0.92.4" + "@glimmer/manager": "0.94.7", + "@glimmer/runtime": "0.94.7" } } diff --git a/packages/@ember/object/package.json b/packages/@ember/object/package.json index 77553fadfe4..cab34a913aa 100644 --- a/packages/@ember/object/package.json +++ b/packages/@ember/object/package.json @@ -26,12 +26,12 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" } diff --git a/packages/@ember/routing/package.json b/packages/@ember/routing/package.json index b77a4f57bab..cc1e0f9ff96 100644 --- a/packages/@ember/routing/package.json +++ b/packages/@ember/routing/package.json @@ -25,12 +25,12 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "dag-map": "^2.0.2", "expect-type": "^0.15.0", diff --git a/packages/@ember/runloop/package.json b/packages/@ember/runloop/package.json index 9e51973a441..88c19905e0d 100644 --- a/packages/@ember/runloop/package.json +++ b/packages/@ember/runloop/package.json @@ -13,7 +13,7 @@ "@ember/object": "workspace:*", "@ember/utils": "workspace:*", "@glimmer/env": "^0.1.7", - "@glimmer/validator": "0.92.3", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" diff --git a/packages/@ember/service/package.json b/packages/@ember/service/package.json index 85f148cc781..34b375e2e24 100644 --- a/packages/@ember/service/package.json +++ b/packages/@ember/service/package.json @@ -10,11 +10,11 @@ "@ember/array": "workspace:*", "@ember/debug": "workspace:*", "@ember/object": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" } diff --git a/packages/@ember/template-compilation/package.json b/packages/@ember/template-compilation/package.json index ecbe6c27f78..1b961dcd378 100644 --- a/packages/@ember/template-compilation/package.json +++ b/packages/@ember/template-compilation/package.json @@ -8,9 +8,9 @@ "dependencies": { "@ember/-internals": "workspace:*", "@ember/canary-features": "workspace:*", - "@glimmer/compiler": "0.92.4", + "@glimmer/compiler": "0.94.8", "@glimmer/env": "^0.1.7", - "@glimmer/syntax": "0.92.3", + "@glimmer/syntax": "0.94.7", "ember": "workspace:*", "ember-template-compiler": "workspace:*" } diff --git a/packages/@ember/template-compiler/package.json b/packages/@ember/template-compiler/package.json index a19309584be..5cd4d024fc2 100644 --- a/packages/@ember/template-compiler/package.json +++ b/packages/@ember/template-compiler/package.json @@ -9,15 +9,15 @@ "./types": "./lib/types.ts" }, "dependencies": { - "@ember/debug": "workspace:*", - "@glimmer/compiler": "0.92.4", - "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/opcode-compiler": "0.92.4", - "@glimmer/syntax": "0.92.3", - "@glimmer/interfaces": "0.92.3", "@ember/-internals": "workspace:*", "@ember/component": "workspace:*", + "@ember/debug": "workspace:*", + "@glimmer/compiler": "0.94.8", + "@glimmer/env": "^0.1.7", + "@glimmer/interfaces": "0.94.5", + "@glimmer/manager": "0.94.7", + "@glimmer/opcode-compiler": "0.94.7", + "@glimmer/syntax": "0.94.7", "expect-type": "^0.15.0" } } diff --git a/packages/@ember/template-factory/package.json b/packages/@ember/template-factory/package.json index 7a8e3ab4444..c9dd225acda 100644 --- a/packages/@ember/template-factory/package.json +++ b/packages/@ember/template-factory/package.json @@ -6,6 +6,6 @@ ".": "./index.ts" }, "dependencies": { - "@glimmer/opcode-compiler": "0.92.4" + "@glimmer/opcode-compiler": "0.94.7" } } diff --git a/packages/@ember/utils/package.json b/packages/@ember/utils/package.json index 4983a2fe01f..45740fddf84 100644 --- a/packages/@ember/utils/package.json +++ b/packages/@ember/utils/package.json @@ -13,12 +13,12 @@ "@ember/enumerable": "workspace:*", "@ember/object": "workspace:*", "@ember/runloop": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "expect-type": "^0.15.0", "internal-test-helpers": "workspace:*" } diff --git a/packages/@ember/version/package.json b/packages/@ember/version/package.json index f835ca0bd3e..e8c7d5edf60 100644 --- a/packages/@ember/version/package.json +++ b/packages/@ember/version/package.json @@ -22,8 +22,8 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/manager": "0.92.4", - "@glimmer/runtime": "0.92.4", + "@glimmer/manager": "0.94.7", + "@glimmer/runtime": "0.94.7", "backburner.js": "^2.7.0", "ember": "workspace:*", "expect-type": "^0.15.0" diff --git a/packages/ember-template-compiler/package.json b/packages/ember-template-compiler/package.json index af44cab4839..cdaf62816cf 100644 --- a/packages/ember-template-compiler/package.json +++ b/packages/ember-template-compiler/package.json @@ -23,15 +23,15 @@ "@ember/routing": "workspace:*", "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", - "@ember/template-compiler": "workspace:*", "@ember/template-compilation": "workspace:*", + "@ember/template-compiler": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/compiler": "0.92.4", + "@glimmer/compiler": "0.94.8", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/runtime": "0.92.4", - "@glimmer/syntax": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/runtime": "0.94.7", + "@glimmer/syntax": "0.94.7", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "ember": "workspace:*", "internal-test-helpers": "workspace:*" diff --git a/packages/ember-testing/package.json b/packages/ember-testing/package.json index ddab87798d1..5cbfb1461f3 100644 --- a/packages/ember-testing/package.json +++ b/packages/ember-testing/package.json @@ -19,11 +19,11 @@ "@ember/service": "workspace:*", "@ember/test": "workspace:*", "@ember/utils": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/owner": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/owner": "0.93.2", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "ember": "workspace:*", "internal-test-helpers": "workspace:*", diff --git a/packages/ember/package.json b/packages/ember/package.json index d3ce3194870..dfa27e0885a 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -26,20 +26,20 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/template": "workspace:*", - "@ember/template-compiler": "workspace:*", "@ember/template-compilation": "workspace:*", + "@ember/template-compiler": "workspace:*", "@ember/template-factory": "workspace:*", "@ember/test": "workspace:*", "@ember/utils": "workspace:*", "@ember/version": "workspace:*", - "@glimmer/destroyable": "0.92.3", + "@glimmer/destroyable": "0.94.6", "@glimmer/env": "^0.1.7", - "@glimmer/manager": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/runtime": "0.92.4", + "@glimmer/manager": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/runtime": "0.94.7", "@glimmer/tracking": "workspace:*", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "dag-map": "^2.0.2", "ember-template-compiler": "workspace:*", diff --git a/packages/internal-test-helpers/lib/test-cases/abstract.ts b/packages/internal-test-helpers/lib/test-cases/abstract.ts index 82792e49ec8..6f7d17392af 100644 --- a/packages/internal-test-helpers/lib/test-cases/abstract.ts +++ b/packages/internal-test-helpers/lib/test-cases/abstract.ts @@ -7,7 +7,6 @@ import { getElement } from '../element-helpers'; import { equalsElement, regex, classes } from '../matchers'; import { runLoopSettled } from '../run'; import { assert } from '@ember/debug'; -import { isElement } from '@glimmer/util'; const TextNode = window.Text; const HTMLElement = window.HTMLElement; @@ -192,7 +191,7 @@ export default abstract class AbstractTestCase { content?: unknown; } ) { - if (node === null || !isElement(node)) { + if (node === null || !(node?.nodeType === 1 && node instanceof Element)) { this.assert.ok(false, `Expected a ${ElementType.name}, but got ${String(node)}`); return; } diff --git a/packages/internal-test-helpers/package.json b/packages/internal-test-helpers/package.json index b2c59f64ee2..0616a3fd039 100644 --- a/packages/internal-test-helpers/package.json +++ b/packages/internal-test-helpers/package.json @@ -24,16 +24,16 @@ "@ember/runloop": "workspace:*", "@ember/service": "workspace:*", "@ember/utils": "workspace:*", - "@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/manager": "0.92.4", - "@glimmer/opcode-compiler": "0.92.4", - "@glimmer/owner": "0.92.3", - "@glimmer/runtime": "0.92.4", - "@glimmer/syntax": "0.92.3", - "@glimmer/util": "0.92.3", - "@glimmer/validator": "0.92.3", + "@glimmer/manager": "0.94.7", + "@glimmer/opcode-compiler": "0.94.7", + "@glimmer/owner": "0.93.2", + "@glimmer/runtime": "0.94.7", + "@glimmer/syntax": "0.94.7", + "@glimmer/util": "0.94.6", + "@glimmer/validator": "0.94.6", "backburner.js": "^2.7.0", "dag-map": "^2.0.2", "ember": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 089eff1221c..6766e205a61 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,56 +22,56 @@ importers: specifier: ^1.9.0 version: 1.9.0 '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/global-context': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/interfaces': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.5 + version: 0.94.5 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/node': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/opcode-compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/program': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/reference': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/vm': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/vm-babel-plugins': - specifier: 0.92.3 - version: 0.92.3(@babel/core@7.24.4) + specifier: 0.93.3 + version: 0.93.3(@babel/core@7.24.4) '@simple-dom/interface': specifier: ^1.4.0 version: 1.4.0 @@ -170,8 +170,8 @@ importers: specifier: ^1.3.100 version: 1.5.0 '@tsconfig/ember': - specifier: ^2.0.0 - version: 2.0.0 + specifier: 3.0.8 + version: 3.0.8 '@types/qunit': specifier: ^2.19.4 version: 2.19.10 @@ -278,14 +278,17 @@ importers: specifier: ^2.8.0 version: 2.8.8 puppeteer: - specifier: ^24.1.0 - version: 24.1.0(typescript@5.1.6) + specifier: ^24.2.0 + version: 24.2.0(typescript@5.1.6) qunit: specifier: ^2.19.4 version: 2.20.1 recast: specifier: ^0.22.0 version: 0.22.0 + resolve.exports: + specifier: ^2.0.3 + version: 2.0.3 rollup: specifier: ^4.2.0 version: 4.16.4 @@ -371,56 +374,56 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/component': specifier: workspace:^ version: link:../../@glimmer/component '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/global-context': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/interfaces': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.5 + version: 0.94.5 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/node': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/opcode-compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/program': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/reference': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/vm': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@simple-dom/interface': specifier: ^1.4.0 version: 1.4.0 @@ -489,20 +492,20 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -549,23 +552,23 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -588,11 +591,11 @@ importers: specifier: workspace:* version: link:../-internals '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -615,20 +618,20 @@ importers: specifier: workspace:* version: link:../service '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -669,23 +672,23 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -701,8 +704,8 @@ importers: packages/@ember/destroyable: dependencies: '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -743,20 +746,20 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 dag-map: specifier: ^2.0.2 version: 2.0.2 @@ -785,20 +788,20 @@ importers: specifier: workspace:* version: link:../object '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 internal-test-helpers: specifier: workspace:* version: link:../../internal-test-helpers @@ -812,11 +815,11 @@ importers: specifier: workspace:* version: link:../component '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -848,8 +851,8 @@ importers: specifier: ^0.1.7 version: 0.1.7 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 internal-test-helpers: specifier: workspace:* version: link:../../internal-test-helpers @@ -860,11 +863,11 @@ importers: specifier: workspace:* version: link:../-internals '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 packages/@ember/object: dependencies: @@ -893,23 +896,23 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -995,23 +998,23 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1052,8 +1055,8 @@ importers: specifier: ^0.1.7 version: 0.1.7 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1079,20 +1082,20 @@ importers: specifier: workspace:* version: link:../object '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -1118,14 +1121,14 @@ importers: specifier: workspace:* version: link:../canary-features '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 ember: specifier: workspace:* version: link:../../ember @@ -1145,23 +1148,23 @@ importers: specifier: workspace:* version: link:../debug '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/interfaces': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.5 + version: 0.94.5 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/opcode-compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -1169,8 +1172,8 @@ importers: packages/@ember/template-factory: dependencies: '@glimmer/opcode-compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 packages/@ember/test: dependencies: @@ -1202,23 +1205,23 @@ importers: specifier: workspace:* version: link:../runloop '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 expect-type: specifier: ^0.15.0 version: 0.15.0 @@ -1277,11 +1280,11 @@ importers: specifier: workspace:* version: link:../utils '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1389,29 +1392,29 @@ importers: specifier: workspace:* version: link:../@ember/version '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/tracking': specifier: workspace:* version: link:../@glimmer/tracking '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1494,23 +1497,23 @@ importers: specifier: workspace:* version: link:../@ember/utils '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1563,20 +1566,20 @@ importers: specifier: workspace:* version: link:../@ember/utils '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -1650,35 +1653,35 @@ importers: specifier: workspace:* version: link:../@ember/utils '@glimmer/compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.8 + version: 0.94.8 '@glimmer/destroyable': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/env': specifier: ^0.1.7 version: 0.1.7 '@glimmer/manager': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/opcode-compiler': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/owner': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.93.2 + version: 0.93.2 '@glimmer/runtime': - specifier: 0.92.4 - version: 0.92.4 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/syntax': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.7 + version: 0.94.7 '@glimmer/util': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 '@glimmer/validator': - specifier: 0.92.3 - version: 0.92.3 + specifier: 0.94.6 + version: 0.94.6 backburner.js: specifier: ^2.7.0 version: 2.8.0 @@ -4462,7 +4465,7 @@ packages: find-up: 5.0.0 lodash: 4.17.21 resolve: 1.22.8 - semver: 7.6.3 + semver: 7.6.0 transitivePeerDependencies: - supports-color @@ -4497,7 +4500,7 @@ packages: minimatch: 3.1.2 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 - semver: 7.6.3 + semver: 7.6.0 typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color @@ -4802,39 +4805,28 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@glimmer/compiler@0.92.4: - resolution: {integrity: sha512-xoR8F6fsgFqWbPbCfSgJuJ95vaLnXw0SgDCwyl/KMeeaSxpHwJbr8+BfiUl+7ko2A+HzrY5dPXXnGr4ZM+CUXw==} - engines: {node: '>= 16.0.0'} - dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/syntax': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/vm': 0.92.3 - '@glimmer/wire-format': 0.92.3 - dev: false - - /@glimmer/debug@0.92.4: - resolution: {integrity: sha512-waTBOdtp92MC3h/51mYbc4GRumO+Tsa5jbXLoewqALjE1S8bMu9qgkG7Cx635x3/XpjsD9xceMqagBvYhuI6tA==} + /@glimmer/compiler@0.94.8: + resolution: {integrity: sha512-mqakVTK+f1QAHcibfL2I4rh9Y7hszOKqaCcgf60NFOPHJTnYNJHtH7TYR6h9Wcr9dRfOgjqxDUVhgrhxp3ojnQ==} + engines: {node: '>= 18.0.0'} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/vm': 0.92.3 + '@glimmer/interfaces': 0.94.5 + '@glimmer/syntax': 0.94.7 + '@glimmer/util': 0.94.6 + '@glimmer/wire-format': 0.94.6 dev: false - /@glimmer/destroyable@0.92.3: - resolution: {integrity: sha512-vQ+mzT9Vkf+JueY7L5XbZqK0WyEVTKv0HOLrw/zDw9F5Szn3F/8Ea/qbAClo3QK3oZeg+ulFTa/61rdjSFYHGA==} + /@glimmer/destroyable@0.94.6: + resolution: {integrity: sha512-+yihM6wFhtKaSbWlG/DHJELVl/QmMPX8Iuz1SZomlzTaDIDis4+LNZgfdi053OMea0k9QPvzo+nyattxwEHjxA==} dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 + '@glimmer/global-context': 0.93.2 + '@glimmer/interfaces': 0.94.5 dev: false - /@glimmer/encoder@0.92.3: - resolution: {integrity: sha512-DJ8DB33LxODjzCWRrxozHUaRqVyZj4p8jDLG42aCNmWo3smxrsjshcaVUwDmib24DW+dzR7kMc39ObMqT5zK0w==} + /@glimmer/encoder@0.93.6: + resolution: {integrity: sha512-1TH571TwtrDp04HfNzOPxZjoXP5IG2oYzDGymVKcJnvlKlniNXBh2w+tuJoOWmVCpD3Cqdfby/qiKP6u9kmQVA==} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/vm': 0.92.3 + '@glimmer/interfaces': 0.94.5 + '@glimmer/vm': 0.94.6 dev: false /@glimmer/env@0.1.7: @@ -4846,8 +4838,8 @@ packages: '@glimmer/env': 0.1.7 dev: true - /@glimmer/global-context@0.92.3: - resolution: {integrity: sha512-tvlK5pt6oSe3furJ1KsO9vG/KmF9S98HLrcR48XbfwXlkuxvUeS94cdQId4GCN5naeX4OC4xm6eEjZWdc2s+jw==} + /@glimmer/global-context@0.93.2: + resolution: {integrity: sha512-U5Fdf5nPBrfj8fcoM15u1NTT+/xttiRhR7MXcG1klEjliI9mfnQ5B/WgdeeEkkvVrwgKFTRmI16bt8n3n42Plg==} dev: false /@glimmer/interfaces@0.84.3: @@ -4861,67 +4853,57 @@ packages: '@simple-dom/interface': 1.4.0 dev: true - /@glimmer/interfaces@0.92.3: - resolution: {integrity: sha512-QwQeA01N+0h+TAi/J7iUnZtRuJy+093hNyagxDQBA6b1wCBw+q+al9+O6gmbWlkWE7EifzmNE1nnrgcecJBlJQ==} + /@glimmer/interfaces@0.94.5: + resolution: {integrity: sha512-pH+Q5vEz9hO5GafJCNo1J+UNEKIM3rp0bXIA66FxcsUA9/NfhNO20ZTO+qkPxPePsiJ/S9D6aj78wq3I+5uiCw==} dependencies: '@simple-dom/interface': 1.4.0 dev: false - /@glimmer/manager@0.92.4: - resolution: {integrity: sha512-YMoarZT/+Ft2YSd+Wuu5McVsdP9y6jeAdVQGYFpno3NlL3TXYbl7ELtK7OGxFLjzQE01BdiUZZRvcY+a/s9+CQ==} + /@glimmer/manager@0.94.7: + resolution: {integrity: sha512-kwpu4kYm23vX7PdeEseIYgIO/yevaxF7u0jKt+9Xi/+gIAJeyPrY0cB24Y4+HLFL5DxfMcrvo/6E5lJ/9LMgMg==} dependencies: - '@glimmer/debug': 0.92.4 - '@glimmer/destroyable': 0.92.3 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/reference': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/validator': 0.92.3 - '@glimmer/vm': 0.92.3 + '@glimmer/destroyable': 0.94.6 + '@glimmer/global-context': 0.93.2 + '@glimmer/interfaces': 0.94.5 + '@glimmer/reference': 0.94.6 + '@glimmer/util': 0.94.6 + '@glimmer/validator': 0.94.6 + '@glimmer/vm': 0.94.6 dev: false - /@glimmer/node@0.92.4: - resolution: {integrity: sha512-a5GME7HQJZFJPQDdSetQI6jjKXXQi0Vdr3WuUrYwhienVTV5LG0uClbFE2yYWC7TX97YDHpRrNk1CC258rujkQ==} + /@glimmer/node@0.94.7: + resolution: {integrity: sha512-BVKGYCxRPxCUaZpQpIGIjBZbdlw+ZupgFupf88xs04e+zMBCA4qTccu/bWJ0Y6XQw7uLsh8FgzMKo+xaMzXDjA==} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/runtime': 0.92.4 - '@glimmer/util': 0.92.3 + '@glimmer/interfaces': 0.94.5 + '@glimmer/runtime': 0.94.7 + '@glimmer/util': 0.94.6 '@simple-dom/document': 1.4.0 dev: false - /@glimmer/opcode-compiler@0.92.4: - resolution: {integrity: sha512-WnZSBwxNqW/PPD/zfxEg6BVR5tHwTm8fp76piix8BNCQ6CuzVn6HUJ5SlvBsOwyoRCmzt/pkKmBJn+I675KG4w==} + /@glimmer/opcode-compiler@0.94.7: + resolution: {integrity: sha512-0f+mB/XecL0/3r7bnepX/PGCNdrGcFyRofgWRikKxuf38Nu7RX/WjN44f1BgYjUO7FXY0e+ghDcCLhFW+uI8ew==} dependencies: - '@glimmer/debug': 0.92.4 - '@glimmer/encoder': 0.92.3 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/manager': 0.92.4 - '@glimmer/reference': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/vm': 0.92.3 - '@glimmer/wire-format': 0.92.3 + '@glimmer/encoder': 0.93.6 + '@glimmer/interfaces': 0.94.5 + '@glimmer/manager': 0.94.7 + '@glimmer/util': 0.94.6 + '@glimmer/vm': 0.94.6 + '@glimmer/wire-format': 0.94.6 dev: false - /@glimmer/owner@0.92.3: - resolution: {integrity: sha512-ZxmXIUCy6DOobhGDhA6kMpaXZS7HAucEgIl/qcjV9crlzGOO8H4j+n2x6nA/8zpuqvO0gYaBzqdNdu+7EgOEmw==} - dependencies: - '@glimmer/util': 0.92.3 + /@glimmer/owner@0.93.2: + resolution: {integrity: sha512-3ySi8qBE8byq3XdsuXAz1HfrgdD2xz4/sfxmpX7kpls8+IGgMMwJ1sgPSTy50MmjsI6zG4vrvfTjhqOy/UqnBg==} dev: false - /@glimmer/program@0.92.4: - resolution: {integrity: sha512-fkquujQ11lsGCWl/+XpZW2E7bjHj/g6/Ht292A7pSoANBD8Bz/gPYiPM+XuMwes9MApEsTEMjV4EXlyk2/Cirg==} + /@glimmer/program@0.94.7: + resolution: {integrity: sha512-cd2Am8llRNaKaGms2TiHPG9D5lFJA8daGX3V4vPfy+lq8+cPYyLA1gLOORD7q9rK8HXsJZneBP6ELpSdpY3iWw==} dependencies: - '@glimmer/encoder': 0.92.3 - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.92.3 - '@glimmer/manager': 0.92.4 - '@glimmer/opcode-compiler': 0.92.4 - '@glimmer/util': 0.92.3 - '@glimmer/vm': 0.92.3 - '@glimmer/wire-format': 0.92.3 + '@glimmer/interfaces': 0.94.5 + '@glimmer/manager': 0.94.7 + '@glimmer/opcode-compiler': 0.94.7 + '@glimmer/util': 0.94.6 + '@glimmer/vm': 0.94.6 + '@glimmer/wire-format': 0.94.6 dev: false /@glimmer/reference@0.84.3: @@ -4934,31 +4916,28 @@ packages: '@glimmer/validator': 0.84.3 dev: true - /@glimmer/reference@0.92.3: - resolution: {integrity: sha512-Ud4LE689mEXL6BJnJx0ZPt2dt/A540C+TAnBFXHpcAjROz5gT337RN+tgajwudEUqpufExhcPSMGzs1pvWYCJg==} + /@glimmer/reference@0.94.6: + resolution: {integrity: sha512-iNGbiIgVdTyeaUzRiDbCfBDjmq9TMWbZPNmdujKVOC4Zy9dB57OUQYc21mYXxU3SNb8sT8C9oM5lFDy8h5zImQ==} dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/validator': 0.92.3 + '@glimmer/global-context': 0.93.2 + '@glimmer/interfaces': 0.94.5 + '@glimmer/util': 0.94.6 + '@glimmer/validator': 0.94.6 dev: false - /@glimmer/runtime@0.92.4: - resolution: {integrity: sha512-ISqM/8hVh+fY/gnLAAPKfts4CvnJBOyCYAXgGccIlzzQrSVLaz0NoRiWTLGj5B/3xyPbqLwYPDvlTsOjYtvPoA==} - dependencies: - '@glimmer/destroyable': 0.92.3 - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/manager': 0.92.4 - '@glimmer/owner': 0.92.3 - '@glimmer/program': 0.92.4 - '@glimmer/reference': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/validator': 0.92.3 - '@glimmer/vm': 0.92.3 - '@glimmer/wire-format': 0.92.3 + /@glimmer/runtime@0.94.7: + resolution: {integrity: sha512-Q3xZLwVwEg+NHc/pKMdgqeln8D8q7/8HF1CIAcv7fyaTbv3Iz/PUsWG+jq/kJguMtVhwWNiygYxB9vvyzK7RPQ==} + dependencies: + '@glimmer/destroyable': 0.94.6 + '@glimmer/global-context': 0.93.2 + '@glimmer/interfaces': 0.94.5 + '@glimmer/manager': 0.94.7 + '@glimmer/owner': 0.93.2 + '@glimmer/program': 0.94.7 + '@glimmer/reference': 0.94.6 + '@glimmer/util': 0.94.6 + '@glimmer/validator': 0.94.6 + '@glimmer/vm': 0.94.6 dev: false /@glimmer/syntax@0.84.3: @@ -4979,12 +4958,12 @@ packages: simple-html-tokenizer: 0.5.11 dev: true - /@glimmer/syntax@0.92.3: - resolution: {integrity: sha512-7wPKQmULyXCYf0KvbPmfrs/skPISH2QGR9atCnmDWnHyLv5SSZVLm1P0Ctrpta6+Ci3uGQb7hGk0IjsLEavcYQ==} + /@glimmer/syntax@0.94.7: + resolution: {integrity: sha512-6L/1Yl6JLbLrY7ywTL5QFNGKAzxtCbC+kXsTExOcukBqsak+nN75vXvBkv+F+NsAZxhoRt72fNBuy9IrP9sghA==} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 - '@glimmer/wire-format': 0.92.3 + '@glimmer/interfaces': 0.94.5 + '@glimmer/util': 0.94.6 + '@glimmer/wire-format': 0.94.6 '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 dev: false @@ -5010,11 +4989,10 @@ packages: '@glimmer/interfaces': 0.88.1 dev: true - /@glimmer/util@0.92.3: - resolution: {integrity: sha512-K1oH93gGU36slycxJ9CcFpUTsdOc4XQ6RuZFu5oRsxFYtEF5PSu7ik11h58fyeoaWOr1ebfkyAMawbeI2AJ5GA==} + /@glimmer/util@0.94.6: + resolution: {integrity: sha512-UDUP4/nHz4/qORWxl9ebc5ZhysKJFhJrY14GAMLBxbXomYtj7liMiht4v5TVW4Law5ziPmpTFQ70RJOOG7ksBg==} dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/interfaces': 0.92.3 + '@glimmer/interfaces': 0.94.5 dev: false /@glimmer/validator@0.44.0: @@ -5028,29 +5006,26 @@ packages: '@glimmer/global-context': 0.84.3 dev: true - /@glimmer/validator@0.92.3: - resolution: {integrity: sha512-HKrMYeW0YhiksSeKYqX2chUR/rz82j12DcY7p2dORQlTV3qlAfiE5zRTJH1KRA1X3ZMf7DI2/GOzkXwYp0o+3Q==} + /@glimmer/validator@0.94.6: + resolution: {integrity: sha512-s0pzTB+lHXa6eQCSJe57YNNgPsjaY+EmOLH6OsJrWetszltV5fSy2PVjk+2NavsZ6wjaxLKwTd0q3PGPXz/rlQ==} dependencies: - '@glimmer/env': 0.1.7 - '@glimmer/global-context': 0.92.3 - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 + '@glimmer/global-context': 0.93.2 + '@glimmer/interfaces': 0.94.5 dev: false - /@glimmer/vm-babel-plugins@0.92.3(@babel/core@7.24.4): - resolution: {integrity: sha512-VpkKsHc3oiq9ruiwT7sN4RuOIc5n10PCeWX7tYSNZ85S1bETcAFn0XbyNjI+G3uFshQGEK0T8Fn3+/8VTNIQIg==} - engines: {node: '>=16'} + /@glimmer/vm-babel-plugins@0.93.3(@babel/core@7.24.4): + resolution: {integrity: sha512-pBoSPkhOeQrvnV75dWk04aqf4MdTcYIHiXKjijQD2/jEsf3xOml7w2yVIFJy90i09Dhijn2A9VxLvfv1le4YTw==} + engines: {node: '>=18.18.0'} dependencies: babel-plugin-debug-macros: 0.3.4(@babel/core@7.24.4) transitivePeerDependencies: - '@babel/core' dev: false - /@glimmer/vm@0.92.3: - resolution: {integrity: sha512-DNMQz7nn2zRwKO1irVZ4alg1lH+VInwR3vkWVgobUs0yh7OoHVGXKMd5uxzIksqJEUw1XOX9Qgu/GYZB1PiH3w==} + /@glimmer/vm@0.94.6: + resolution: {integrity: sha512-RRQtQ1D7K+r0TJCE6+Rn1CgUKQsu0hry+WyQXUW/SETGz3RsL1t9L7Omi8b2HYOS1JA7hkJJ8gHfEY7HCE8hXA==} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 + '@glimmer/interfaces': 0.94.5 dev: false /@glimmer/wire-format@0.88.1: @@ -5060,11 +5035,10 @@ packages: '@glimmer/util': 0.88.1 dev: true - /@glimmer/wire-format@0.92.3: - resolution: {integrity: sha512-gFz81Q9+V7Xs0X8mSq6y8qacHm0dPaGJo2/Bfcsdow1hLOKNgTCLr4XeDBhRML8f6I6Gk9ugH4QDxyIOXOpC4w==} + /@glimmer/wire-format@0.94.6: + resolution: {integrity: sha512-M0ggBTBdeF9AWaq2ZH75fVZ7Y5r/0wqaQ+4tqvEqQJ0kYFwkahnWnFxPYEg2HSRsaNLZjd02sCmh9rwkSANCwg==} dependencies: - '@glimmer/interfaces': 0.92.3 - '@glimmer/util': 0.92.3 + '@glimmer/interfaces': 0.94.5 dev: false /@gwhitney/detect-indent@7.0.1: @@ -5972,8 +5946,8 @@ packages: write-yaml-file: 5.0.0 dev: true - /@puppeteer/browsers@2.7.0: - resolution: {integrity: sha512-bO61XnTuopsz9kvtfqhVbH6LTM1koxK0IlBR+yuVrM2LB7mk8+5o1w18l5zqd5cs8xlf+ntgambqRqGifMDjog==} + /@puppeteer/browsers@2.7.1: + resolution: {integrity: sha512-MK7rtm8JjaxPN7Mf1JdZIZKPD2Z+W7osvrC1vjpvfOX1K0awDIHYbNi89f7eotp7eMUn2shWnt03HwVbriXtKQ==} engines: {node: '>=18'} hasBin: true dependencies: @@ -5981,9 +5955,8 @@ packages: extract-zip: 2.0.1 progress: 2.0.3 proxy-agent: 6.5.0 - semver: 7.6.3 + semver: 7.7.1 tar-fs: 3.0.8 - unbzip2-stream: 1.4.3 yargs: 17.7.2 transitivePeerDependencies: - bare-buffer @@ -6846,8 +6819,8 @@ packages: resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==} dev: true - /@tsconfig/ember@2.0.0: - resolution: {integrity: sha512-RzbDYYcjxVdG8Ki0xe99HN3+nHTZe6EBgw6N7B3yup7QogVFQQxA9nY7X80j1XzF15xqetwWiYfAjv5lkkp0/A==} + /@tsconfig/ember@3.0.8: + resolution: {integrity: sha512-OVnIsZIt/8q0VEtcdz3rRryNrm6gdJTxXlxefkGIrkZnME0wqslmwHlUEZ7mvh377df9FqBhNKrYNarhCW8zJA==} dev: true /@types/babel__code-frame@7.0.6: @@ -6993,10 +6966,19 @@ packages: /@types/node@22.10.7: resolution: {integrity: sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==} + requiresBuild: true dependencies: undici-types: 6.20.0 dev: true + /@types/node@22.13.1: + resolution: {integrity: sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==} + requiresBuild: true + dependencies: + undici-types: 6.20.0 + dev: true + optional: true + /@types/normalize-package-data@2.4.4: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true @@ -7082,7 +7064,7 @@ packages: resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} requiresBuild: true dependencies: - '@types/node': 22.10.7 + '@types/node': 22.13.1 dev: true optional: true @@ -8157,7 +8139,7 @@ packages: dependencies: bare-events: 2.5.4 bare-path: 3.0.0 - bare-stream: 2.6.4(bare-events@2.5.4) + bare-stream: 2.6.5(bare-events@2.5.4) transitivePeerDependencies: - bare-buffer dev: true @@ -8178,8 +8160,8 @@ packages: dev: true optional: true - /bare-stream@2.6.4(bare-events@2.5.4): - resolution: {integrity: sha512-G6i3A74FjNq4nVrrSTUz5h3vgXzBJnjmWAVlBWaZETkgu+LgKd7AiyOml3EDJY1AHlIbBHKDXE+TUT53Ff8OaA==} + /bare-stream@2.6.5(bare-events@2.5.4): + resolution: {integrity: sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==} requiresBuild: true peerDependencies: bare-buffer: '*' @@ -8191,7 +8173,7 @@ packages: optional: true dependencies: bare-events: 2.5.4 - streamx: 2.21.1 + streamx: 2.22.0 dev: true optional: true @@ -8983,7 +8965,7 @@ packages: /builtins@5.1.0: resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} dependencies: - semver: 7.6.3 + semver: 7.6.0 dev: true /bytes@1.0.0: @@ -9232,22 +9214,12 @@ packages: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} - /chromium-bidi@0.11.0(devtools-protocol@0.0.1380148): - resolution: {integrity: sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==} - peerDependencies: - devtools-protocol: '*' - dependencies: - devtools-protocol: 0.0.1380148 - mitt: 3.0.1 - zod: 3.23.8 - dev: true - - /chromium-bidi@0.12.0(devtools-protocol@0.0.1380148): - resolution: {integrity: sha512-xzXveJmX826GGq1MeE5okD8XxaDT8172CXByhFJ687eY65rbjOIebdbUuQh+jXKaNyGKI14Veb3KjLLmSueaxA==} + /chromium-bidi@1.2.0(devtools-protocol@0.0.1402036): + resolution: {integrity: sha512-XtdJ1GSN6S3l7tO7F77GhNsw0K367p0IsLYf2yZawCVAKKC3lUvDhPdMVrB2FNhmhfW43QGYbEX3Wg6q0maGwQ==} peerDependencies: devtools-protocol: '*' dependencies: - devtools-protocol: 0.0.1380148 + devtools-protocol: 0.0.1402036 mitt: 3.0.1 zod: 3.24.1 dev: true @@ -9837,7 +9809,7 @@ packages: optional: true dependencies: env-paths: 2.2.1 - import-fresh: 3.3.0 + import-fresh: 3.3.1 js-yaml: 4.1.0 parse-json: 5.2.0 typescript: 5.1.6 @@ -9893,7 +9865,7 @@ packages: postcss-modules-values: 4.0.0(postcss@8.5.1) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 - semver: 7.6.3 + semver: 7.6.0 webpack: 5.91.0(@swc/core@1.5.0) /css-tree@1.1.3: @@ -10267,8 +10239,8 @@ packages: resolution: {integrity: sha512-pIVcNUx2/R7P45l3wEUsyrZcfbVUCKBmctUN41syh2asCXmrRndJEiNng9+8socNOAEBiBRqsQCh3HhCkOFwwg==} dev: true - /devtools-protocol@0.0.1380148: - resolution: {integrity: sha512-1CJABgqLxbYxVI+uJY/UDUHJtJ0KZTSjNYJYKqd9FRoXT33WDakDHNxRapMEgzeJ/C3rcs01+avshMnPmKQbvA==} + /devtools-protocol@0.0.1402036: + resolution: {integrity: sha512-JwAYQgEvm3yD45CHB+RmF5kMbWtXBaOGwuxa87sZogHcLCv8c/IqnThaoQ1y60d7pXWjSKWQphPEc+1rAScVdg==} dev: true /diff@1.0.8: @@ -11648,7 +11620,7 @@ packages: eslint: '>=6.0.0' dependencies: eslint: 8.57.0 - semver: 7.6.3 + semver: 7.6.0 dev: true /eslint-config-prettier@9.1.0(eslint@8.57.0): @@ -13448,8 +13420,8 @@ packages: resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} engines: {node: '>= 14'} dependencies: - agent-base: 7.1.1 - debug: 4.3.7(supports-color@8.1.1) + agent-base: 7.1.3 + debug: 4.4.0 transitivePeerDependencies: - supports-color dev: true @@ -13576,6 +13548,14 @@ packages: resolve-from: 4.0.0 dev: true + /import-fresh@3.3.1: + resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} + engines: {node: '>=6'} + dependencies: + parent-module: 1.0.1 + resolve-from: 4.0.0 + dev: true + /imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -15245,7 +15225,7 @@ packages: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.6.3 + semver: 7.6.0 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -15287,7 +15267,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.13.1 - semver: 7.6.3 + semver: 7.6.0 validate-npm-package-license: 3.0.4 dev: true @@ -16227,14 +16207,14 @@ packages: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} - /puppeteer-core@24.1.0: - resolution: {integrity: sha512-ReefWoQgqdyl67uWEBy/TMZ4mAB7hP0JB5HIxSE8B1ot/4ningX1gmzHCOSNfMbTiS/VJHCvaZAe3oJTXph7yw==} + /puppeteer-core@24.2.0: + resolution: {integrity: sha512-e4A4/xqWdd4kcE6QVHYhJ+Qlx/+XpgjP4d8OwBx0DJoY/nkIRhSgYmKQnv7+XSs1ofBstalt+XPGrkaz4FoXOQ==} engines: {node: '>=18'} dependencies: - '@puppeteer/browsers': 2.7.0 - chromium-bidi: 0.11.0(devtools-protocol@0.0.1380148) + '@puppeteer/browsers': 2.7.1 + chromium-bidi: 1.2.0(devtools-protocol@0.0.1402036) debug: 4.4.0 - devtools-protocol: 0.0.1380148 + devtools-protocol: 0.0.1402036 typed-query-selector: 2.12.0 ws: 8.18.0 transitivePeerDependencies: @@ -16244,17 +16224,17 @@ packages: - utf-8-validate dev: true - /puppeteer@24.1.0(typescript@5.1.6): - resolution: {integrity: sha512-F+3yKILaosLToT7amR7LIkTKkKMR0EGQPjFBch+MtgS8vRPS+4cPnLJuXDVTfCj2NqfrCnShtOr7yD+9dEgHRQ==} + /puppeteer@24.2.0(typescript@5.1.6): + resolution: {integrity: sha512-z8vv7zPEgrilIbOo3WNvM+2mXMnyM9f4z6zdrB88Fzeuo43Oupmjrzk3EpuvuCtyK0A7Lsllfx7Z+4BvEEGJcQ==} engines: {node: '>=18'} hasBin: true requiresBuild: true dependencies: - '@puppeteer/browsers': 2.7.0 - chromium-bidi: 0.12.0(devtools-protocol@0.0.1380148) + '@puppeteer/browsers': 2.7.1 + chromium-bidi: 1.2.0(devtools-protocol@0.0.1402036) cosmiconfig: 9.0.0(typescript@5.1.6) - devtools-protocol: 0.0.1380148 - puppeteer-core: 24.1.0 + devtools-protocol: 0.0.1402036 + puppeteer-core: 24.2.0 typed-query-selector: 2.12.0 transitivePeerDependencies: - bare-buffer @@ -16296,10 +16276,6 @@ packages: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true - /queue-tick@1.0.1: - resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==} - dev: true - /quibble@0.9.2: resolution: {integrity: sha512-BrL7hrZcbyyt5ZDfePkGFDc3m82uUtxCPOnpRUrkOdtBnmV9ldQKxXORkKL8eIzToRNaCpIPyKyfdfq/tBlFAA==} engines: {node: '>= 0.14.0'} @@ -16617,7 +16593,7 @@ packages: http-signature: 0.10.1 oauth-sign: 0.3.0 stringstream: 0.0.6 - tough-cookie: 5.1.0 + tough-cookie: 5.1.1 tunnel-agent: 0.4.3 dev: true @@ -16706,6 +16682,11 @@ packages: deprecated: https://github.com/lydell/resolve-url#deprecated dev: true + /resolve.exports@2.0.3: + resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==} + engines: {node: '>=10'} + dev: true + /resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true @@ -17035,6 +17016,13 @@ packages: resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} engines: {node: '>=10'} hasBin: true + dev: true + + /semver@7.7.1: + resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} + engines: {node: '>=10'} + hasBin: true + dev: true /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -17309,13 +17297,13 @@ packages: dependencies: agent-base: 7.1.3 debug: 4.4.0 - socks: 2.8.3 + socks: 2.8.4 transitivePeerDependencies: - supports-color dev: true - /socks@2.8.3: - resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==} + /socks@2.8.4: + resolution: {integrity: sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==} engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} dependencies: ip-address: 9.0.5 @@ -17510,11 +17498,10 @@ packages: duplexer: 0.1.2 dev: true - /streamx@2.21.1: - resolution: {integrity: sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==} + /streamx@2.22.0: + resolution: {integrity: sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==} dependencies: fast-fifo: 1.3.2 - queue-tick: 1.0.1 text-decoder: 1.2.3 optionalDependencies: bare-events: 2.5.4 @@ -17835,7 +17822,7 @@ packages: dependencies: b4a: 1.6.7 fast-fifo: 1.3.2 - streamx: 2.21.1 + streamx: 2.22.0 dev: true /temp-fs@0.9.9: @@ -18160,6 +18147,7 @@ packages: /tldts@6.1.58: resolution: {integrity: sha512-MQJrJhjHOYGYb8DobR6Y4AdDbd4TYkyQ+KBDVc5ODzs1cbrvPpfN1IemYi9jfipJ/vR1YWvrDli0hg1y19VRoA==} hasBin: true + requiresBuild: true dependencies: tldts-core: 6.1.58 dev: true @@ -18265,8 +18253,8 @@ packages: tldts: 6.1.58 dev: true - /tough-cookie@5.1.0: - resolution: {integrity: sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==} + /tough-cookie@5.1.1: + resolution: {integrity: sha512-Ek7HndSVkp10hmHP9V4qZO1u+pn1RU5sI0Fw+jCU3lyvuMZcgqsNgc6CmJJZyByK4Vm/qotGRJlfgAX8q+4JiA==} engines: {node: '>=16'} requiresBuild: true dependencies: @@ -18501,13 +18489,6 @@ packages: has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - /unbzip2-stream@1.4.3: - resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} - dependencies: - buffer: 5.7.1 - through: 2.3.8 - dev: true - /underscore.string@3.3.6: resolution: {integrity: sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==} dependencies: @@ -19337,10 +19318,6 @@ packages: - supports-color dev: true - /zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - dev: true - /zod@3.24.1: resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==} dev: true diff --git a/rollup.config.mjs b/rollup.config.mjs index e62651f977e..cebcfd49e72 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -3,6 +3,7 @@ import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs'; import { createRequire } from 'node:module'; import { fileURLToPath } from 'node:url'; import glob from 'glob'; +import * as resolveExports from 'resolve.exports'; import { babel } from '@rollup/plugin-babel'; import sharedBabelConfig from './babel.config.mjs'; @@ -220,6 +221,7 @@ export function exposedDependencies() { router_js: require.resolve('router_js/dist/modules/index.js'), 'route-recognizer': require.resolve('route-recognizer/dist/route-recognizer.es.js'), ...walkGlimmerDeps([ + '@glimmer/env', '@glimmer/node', '@simple-dom/document', '@glimmer/manager', @@ -293,6 +295,12 @@ function findFromProject(...names) { function entrypoint(pkg, which) { let module = pkg.packageJSON[which]; + if (!module) { + let resolved = resolveExports.exports(pkg.packageJSON, '.', { + conditions: ['default', 'module', 'import', 'browser', 'development'], + }); + module = resolved?.[0]; + } if (!module) { return; } diff --git a/tsconfig/compiler-options.json b/tsconfig/compiler-options.json index 1ed6364f555..91afd83639d 100644 --- a/tsconfig/compiler-options.json +++ b/tsconfig/compiler-options.json @@ -10,7 +10,7 @@ // Environment Configuration "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", // Enhance Strictness "strict": true, diff --git a/type-tests/@ember/application-test/index.ts b/type-tests/@ember/application-test/index.ts index 78ea2bf2c8d..74ccba0e4bc 100644 --- a/type-tests/@ember/application-test/index.ts +++ b/type-tests/@ember/application-test/index.ts @@ -1,6 +1,6 @@ import { getOwner, setOwner } from '@ember/application'; import EngineInstance from '@ember/engine/instance'; -import Owner from '@ember/owner'; +import type Owner from '@ember/owner'; import ApplicationInstance from '@ember/application/instance'; import Service from '@ember/service'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/@ember/component-test/helper.ts b/type-tests/@ember/component-test/helper.ts index 4155a70eb91..b073eab90a8 100644 --- a/type-tests/@ember/component-test/helper.ts +++ b/type-tests/@ember/component-test/helper.ts @@ -1,6 +1,6 @@ import Helper, { - FunctionBasedHelper, - FunctionBasedHelperInstance, + type FunctionBasedHelper, + type FunctionBasedHelperInstance, helper, } from '@ember/component/helper'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/@ember/component-test/template-only.ts b/type-tests/@ember/component-test/template-only.ts index 1e06e9bf369..ef8b18b9fc1 100644 --- a/type-tests/@ember/component-test/template-only.ts +++ b/type-tests/@ember/component-test/template-only.ts @@ -1,4 +1,4 @@ -import templateOnly, { TemplateOnlyComponent, TOC } from '@ember/component/template-only'; +import templateOnly, { type TemplateOnlyComponent, type TOC } from '@ember/component/template-only'; import { expectTypeOf } from 'expect-type'; const to = templateOnly(); diff --git a/type-tests/@ember/controller-test/octane.ts b/type-tests/@ember/controller-test/octane.ts index 826dd56e0d3..872b9328475 100644 --- a/type-tests/@ember/controller-test/octane.ts +++ b/type-tests/@ember/controller-test/octane.ts @@ -1,4 +1,4 @@ -import Controller, { ControllerQueryParam, inject } from '@ember/controller'; +import Controller, { type ControllerQueryParam, inject } from '@ember/controller'; import { expectTypeOf } from 'expect-type'; import type Owner from '@ember/owner'; @@ -42,5 +42,7 @@ declare module '@ember/controller' { const owner = {} as Owner; expectTypeOf(owner.lookup('controller:first')).toEqualTypeOf(); -expectTypeOf(owner.lookup('controller:second')).toEqualTypeOf>(); +expectTypeOf(owner.lookup('controller:second')).toEqualTypeOf< + InstanceType +>(); expectTypeOf(owner.lookup('controller:non-registered')).toEqualTypeOf(); diff --git a/type-tests/@ember/helper-tests.ts b/type-tests/@ember/helper-tests.ts index 444f778b36b..5a75c993384 100644 --- a/type-tests/@ember/helper-tests.ts +++ b/type-tests/@ember/helper-tests.ts @@ -1,16 +1,16 @@ import { array, - ArrayHelper, + type ArrayHelper, concat, - ConcatHelper, + type ConcatHelper, fn, - FnHelper, + type FnHelper, get, - GetHelper, + type GetHelper, hash, - HashHelper, + type HashHelper, uniqueId, - UniqueIdHelper, + type UniqueIdHelper, } from '@ember/helper'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/@ember/modifier-tests.ts b/type-tests/@ember/modifier-tests.ts index 298ab61f7c4..f1d808d5e33 100644 --- a/type-tests/@ember/modifier-tests.ts +++ b/type-tests/@ember/modifier-tests.ts @@ -5,7 +5,7 @@ import { type OnModifier, type ModifierCapabilities, } from '@ember/modifier'; -import { ModifierManager } from '@glimmer/interfaces'; +import { type ModifierManager } from '@glimmer/interfaces'; import { expectTypeOf } from 'expect-type'; expectTypeOf(on).toEqualTypeOf(); diff --git a/type-tests/@ember/object-test/object.ts b/type-tests/@ember/object-test/object.ts index 17f0cec86d0..202508c0e0b 100644 --- a/type-tests/@ember/object-test/object.ts +++ b/type-tests/@ember/object-test/object.ts @@ -1,5 +1,5 @@ import Object, { computed, get, notifyPropertyChange, set, setProperties } from '@ember/object'; -import Owner from '@ember/owner'; +import type Owner from '@ember/owner'; import { expectTypeOf } from 'expect-type'; class LifetimeHooks extends Object { diff --git a/type-tests/@ember/owner-tests.ts b/type-tests/@ember/owner-tests.ts index e210bfde9ce..2adf86c498d 100644 --- a/type-tests/@ember/owner-tests.ts +++ b/type-tests/@ember/owner-tests.ts @@ -1,12 +1,12 @@ -import Owner, { +import { getOwner, setOwner } from '@ember/owner'; +import type Owner from '@ember/owner'; +import type { Factory, FactoryManager, FullName, RegisterOptions, Resolver, KnownForTypeResult, - getOwner, - setOwner, } from '@ember/owner'; import Component from '@glimmer/component'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/@ember/routing-test/router-service.ts b/type-tests/@ember/routing-test/router-service.ts index dbd109eda9d..2b6083b8a34 100644 --- a/type-tests/@ember/routing-test/router-service.ts +++ b/type-tests/@ember/routing-test/router-service.ts @@ -1,6 +1,7 @@ -import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info'; +import type { RouteInfoWithAttributes } from '@ember/routing/route-info'; +import type RouteInfo from '@ember/routing/route-info'; import RouterService from '@ember/routing/router-service'; -import Transition from '@ember/routing/transition'; +import type Transition from '@ember/routing/transition'; import { expectTypeOf } from 'expect-type'; import type { Promise as RSVPPromise } from 'rsvp'; diff --git a/type-tests/@ember/routing-test/router.ts b/type-tests/@ember/routing-test/router.ts index 2a5818782aa..380b4269c67 100755 --- a/type-tests/@ember/routing-test/router.ts +++ b/type-tests/@ember/routing-test/router.ts @@ -2,7 +2,8 @@ import Router from '@ember/routing/router'; import Service, { service } from '@ember/service'; import EmberObject, { get } from '@ember/object'; import RouterService from '@ember/routing/router-service'; -import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info'; +import type RouteInfo from '@ember/routing/route-info'; +import type { RouteInfoWithAttributes } from '@ember/routing/route-info'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/@ember/runloop-tests.ts b/type-tests/@ember/runloop-tests.ts index 4e4c3c9ef8f..a080ccf00de 100644 --- a/type-tests/@ember/runloop-tests.ts +++ b/type-tests/@ember/runloop-tests.ts @@ -16,7 +16,7 @@ import { _backburner, } from '@ember/runloop'; import EmberObject, { action } from '@ember/object'; -import { AnyFn, MethodsOf } from '@ember/-internals/utility-types'; +import type { AnyFn, MethodsOf } from '@ember/-internals/utility-types'; import { expectTypeOf } from 'expect-type'; function testRun() { diff --git a/type-tests/@ember/template-tests.ts b/type-tests/@ember/template-tests.ts index 01f1b419cc4..774895d46f0 100644 --- a/type-tests/@ember/template-tests.ts +++ b/type-tests/@ember/template-tests.ts @@ -1,4 +1,4 @@ -import { htmlSafe, isHTMLSafe, SafeString } from '@ember/template'; +import { htmlSafe, isHTMLSafe, type SafeString } from '@ember/template'; import { expectTypeOf } from 'expect-type'; let trusted = htmlSafe('lorem ipsum...'); diff --git a/type-tests/ember/ember-tests.ts b/type-tests/ember/ember-tests.ts index 41fe1360213..6419033ea88 100755 --- a/type-tests/ember/ember-tests.ts +++ b/type-tests/ember/ember-tests.ts @@ -1,4 +1,4 @@ -import { AnyFn } from '@ember/-internals/utility-types'; +import type { AnyFn } from '@ember/-internals/utility-types'; import { A } from '@ember/array'; import Ember from 'ember'; import { expectTypeOf } from 'expect-type'; diff --git a/type-tests/ember/route.ts b/type-tests/ember/route.ts index ab811bf7656..67b5fa54ef8 100755 --- a/type-tests/ember/route.ts +++ b/type-tests/ember/route.ts @@ -1,7 +1,7 @@ import Route from '@ember/routing/route'; import Array from '@ember/array'; import Ember from 'ember'; // currently needed for Transition -import Transition from '@ember/routing/transition'; +import type Transition from '@ember/routing/transition'; import { expectTypeOf } from 'expect-type'; import { service } from '@ember/service'; import RouterService from '@ember/routing/router-service'; diff --git a/type-tests/ember/transition.ts b/type-tests/ember/transition.ts index 303fe28ecdb..74aad7a0863 100755 --- a/type-tests/ember/transition.ts +++ b/type-tests/ember/transition.ts @@ -1,5 +1,5 @@ import Ember from 'ember'; -import Transition from '@ember/routing/transition'; +import type Transition from '@ember/routing/transition'; import { expectTypeOf } from 'expect-type'; expectTypeOf[0]>().toEqualTypeOf(); diff --git a/type-tests/tsconfig.json b/type-tests/tsconfig.json index a205f6579ab..d54d2bc4d35 100644 --- a/type-tests/tsconfig.json +++ b/type-tests/tsconfig.json @@ -1,3 +1,7 @@ { "extends": "@tsconfig/ember/tsconfig.json", + "compilerOptions": { + // downgrade from @tsconfig/ember@>=3.0.9 (which sets es2023) + "target": "es2022", + } }