Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@ember/-internals/deprecations/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { DeprecationOptions } from '@ember/debug';
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { VERSION } from '@ember/version';
import { deprecate, assert } from '@ember/debug';
import { dasherize } from '../string/index';
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/-internals/environment/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './lib/context';
export * from './lib/env';
export { context, getLookup, setLookup, type GlobalContext } from './lib/context';
export { ENV, getENV } from './lib/env';
2 changes: 1 addition & 1 deletion packages/@ember/-internals/glimmer/lib/component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { View } from '@ember/-internals/glimmer';
import type { View } from './renderer';
import {
descriptorForProperty,
get,
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/glimmer/lib/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
import type { InternalOwner } from '@ember/-internals/owner';
import { getDebugName } from '@ember/-internals/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/glimmer/lib/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { privatize as P } from '@ember/-internals/container';
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import type { InternalOwner } from '@ember/-internals/owner';
import { getOwner } from '@ember/-internals/owner';
import { guidFor } from '@ember/-internals/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/metal/lib/namespace_search.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { context } from '@ember/-internals/environment';
import { context } from '@ember/-internals/environment/lib/context';
import { getName, setName } from '@ember/-internals/utils';

const hasOwnProperty = Object.prototype.hasOwnProperty;
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/metal/lib/observer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { peekMeta } from '@ember/-internals/meta';
import type { schedule } from '@ember/runloop';
import { registerDestructor } from '@glimmer/destroyable';
Expand Down
18 changes: 18 additions & 0 deletions packages/@ember/-internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,25 @@
"./environment": "./environment/index.ts",
"./error-handling": "./error-handling/index.ts",
"./glimmer": "./glimmer/index.ts",
"./glimmer/lib/component": "./glimmer/lib/component.ts",
"./glimmer/lib/components/input": "./glimmer/lib/components/input.ts",
"./glimmer/lib/components/internal": "./glimmer/lib/components/internal.ts",
"./glimmer/lib/components/link-to": "./glimmer/lib/components/link-to.ts",
"./glimmer/lib/components/textarea": "./glimmer/lib/components/textarea.ts",
"./glimmer/lib/dom": "./glimmer/lib/dom.ts",
"./glimmer/lib/helper": "./glimmer/lib/helper.ts",
"./glimmer/lib/helpers/unique-id": "./glimmer/lib/helpers/unique-id.ts",
"./glimmer/lib/renderer": "./glimmer/lib/renderer.ts",
"./glimmer/lib/setup-registry": "./glimmer/lib/setup-registry.ts",
"./glimmer/lib/template": "./glimmer/lib/template.ts",
"./glimmer/lib/template_registry": "./glimmer/lib/template_registry.ts",
"./glimmer/lib/utils/managers": "./glimmer/lib/utils/managers.ts",
"./glimmer/lib/utils/outlet": "./glimmer/lib/utils/outlet.ts",
"./glimmer/lib/utils/serialization-first-node-helpers": "./glimmer/lib/utils/serialization-first-node-helpers.ts",
"./glimmer/lib/utils/string": "./glimmer/lib/utils/string.ts",
"./glimmer/lib/views/outlet": "./glimmer/lib/views/outlet.ts",
"./environment/lib/context": "./environment/lib/context.ts",
"./environment/lib/env": "./environment/lib/env.ts",
"./meta": "./meta/index.ts",
"./metal": "./metal/index.ts",
"./owner": "./owner/index.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@module ember
*/

import { context } from '@ember/-internals/environment';
import { context } from '@ember/-internals/environment/lib/context';
import { get, computed } from '@ember/-internals/metal';
import Mixin from '@ember/object/mixin';
import { assert } from '@ember/debug';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { assert } from '@ember/debug';
import { get, set } from '@ember/-internals/metal';
import EmberObject from '@ember/object';
import { getElementView } from './utils';
import type { BootEnvironment } from '@ember/-internals/glimmer';
import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
import type Component from '@ember/component';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/views/lib/system/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { View } from '@ember/-internals/glimmer';
import type { View } from '@ember/-internals/glimmer/lib/renderer';
import type { InternalOwner } from '@ember/-internals/owner';
import { getOwner } from '@ember/-internals/owner';
import { guidFor } from '@ember/-internals/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/-internals/views/lib/views/core_view.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Renderer, View } from '@ember/-internals/glimmer';
import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
import { inject } from '@ember/-internals/metal';
import { ActionHandler } from '@ember/-internals/runtime';
import Evented from '@ember/object/evented';
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/application/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { getOwner as actualGetOwner, setOwner as actualSetOwner } from '@ember/owner';
import { dictionary } from '@ember/-internals/utils';
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { hasDOM } from '@ember/-internals/browser-environment';
import { assert } from '@ember/debug';
import { DEBUG } from '@glimmer/env';
Expand All @@ -23,7 +23,7 @@ import Engine, { buildInitializerMethod } from '@ember/engine';
import type { BootOptions } from '@ember/engine/instance';
import type { Container, Registry } from '@ember/-internals/container';
import { privatize as P } from '@ember/-internals/container';
import { setupApplicationRegistry } from '@ember/-internals/glimmer';
import { setupApplicationRegistry } from '@ember/-internals/glimmer/lib/setup-registry';
import RouterService from '@ember/routing/router-service';
import type { EngineInstanceOptions } from '@ember/engine/instance';
import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
Expand Down
14 changes: 6 additions & 8 deletions packages/@ember/application/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
*/

import { get, set } from '@ember/object';
import * as environment from '@ember/-internals/browser-environment';
import { hasDOM } from '@ember/-internals/browser-environment';
import EngineInstance from '@ember/engine/instance';
import type { BootOptions } from '@ember/engine/instance';
import type Application from '@ember/application';
import { renderSettled } from '@ember/-internals/glimmer';
import type { BootEnvironment, Component } from '@ember/-internals/glimmer';
import { renderSettled } from '@ember/-internals/glimmer/lib/renderer';
import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
import type Component from '@ember/-internals/glimmer/lib/component';
import { assert } from '@ember/debug';
import Router from '@ember/routing/router';
import { EventDispatcher } from '@ember/-internals/views';
Expand Down Expand Up @@ -445,13 +446,13 @@ class _BootOptions {
readonly rootElement?: string | SimpleElement;

constructor(options: BootOptions = {}) {
this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
this.isInteractive = Boolean(hasDOM); // This default is overridable below
this._renderMode = options._renderMode;

if (options.isBrowser !== undefined) {
this.isBrowser = Boolean(options.isBrowser);
} else {
this.isBrowser = Boolean(environment.hasDOM);
this.isBrowser = Boolean(hasDOM);
}

if (!this.isBrowser) {
Expand Down Expand Up @@ -493,10 +494,7 @@ class _BootOptions {
}

toEnvironment(): BootEnvironment {
// Do we really want to assign all of this!?
return {
...environment,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this totally redundant?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes — ...environment was spreading { hasDOM, window, location, history, userAgent, isChrome, isFirefox } from @ember/-internals/browser-environment, but the BootEnvironment type only uses hasDOM, isInteractive, _renderMode, and options. The explicit hasDOM: this.isBrowser was already overriding it. The other properties (window, location, etc.) were not in the type and not used by any consumer.

// For compatibility with existing code
hasDOM: this.isBrowser,
isInteractive: this.isInteractive,
_renderMode: this._renderMode,
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/canary-features/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';

/**
Set `EmberENV.FEATURES` in your application's `config/environment.js` file
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/component/helper.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export {
Helper as default,
default as default,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can just be default, ya

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed — export { default } in the latest push on #21286.

helper,
type FunctionBasedHelper,
type FunctionBasedHelperInstance,
} from '@ember/-internals/glimmer';
} from '@ember/-internals/glimmer/lib/helper';
6 changes: 4 additions & 2 deletions packages/@ember/component/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@

export { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';

export { Component as default, Input, Textarea } from '@ember/-internals/glimmer';
export { default as default } from '@ember/-internals/glimmer/lib/component';
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can just be export { default }, yea?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed — export { default } in the latest push on #21286.

export { default as Input } from '@ember/-internals/glimmer/lib/components/input';
export { default as Textarea } from '@ember/-internals/glimmer/lib/components/textarea';
export {
componentCapabilities as capabilities,
setComponentManager,
} from '@ember/-internals/glimmer';
} from '@ember/-internals/glimmer/lib/utils/managers';

/**
* Assigns a TemplateFactory to a component class.
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/debug/lib/capture-render-tree.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Renderer } from '@ember/-internals/glimmer';
import type { Renderer } from '@ember/-internals/glimmer/lib/renderer';
import type Owner from '@ember/owner';
import type { CapturedRenderNode } from '@glimmer/interfaces';

Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/debug/lib/deprecate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { DEBUG } from '@glimmer/env';

import { assert } from './assert';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { EngineInstanceOptions } from '@ember/engine/instance';
import EngineInstance from '@ember/engine/instance';
import { RoutingService } from '@ember/routing/-internals';
import { ComponentLookup } from '@ember/-internals/views';
import { setupEngineRegistry } from '@ember/-internals/glimmer';
import { setupEngineRegistry } from '@ember/-internals/glimmer/lib/setup-registry';
import { RegistryProxyMixin } from '@ember/-internals/runtime';

function props(obj: object) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type Owner from '@ember/-internals/owner';
import { type FullName, isFactory } from '@ember/-internals/owner';
import type Engine from '@ember/engine';
import type Application from '@ember/application';
import type { BootEnvironment } from '@ember/-internals/glimmer';
import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
import type { SimpleElement } from '@simple-dom/interface';

export interface BootOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/parent.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './lib/engine-parent';
export { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
2 changes: 1 addition & 1 deletion packages/@ember/helper/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
get as glimmerGet,
fn as glimmerFn,
} from '@glimmer/runtime';
import { uniqueId as glimmerUniqueId } from '@ember/-internals/glimmer';
import { uniqueId as glimmerUniqueId } from '@ember/-internals/glimmer/lib/helpers/unique-id';
import { type Opaque } from '@ember/-internals/utility-types';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/instrumentation/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint no-console:off */
/* global console */

import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import { assert } from '@ember/debug';

export interface Listener<T> {
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/modifier/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export const setModifierManager: <T extends object>(
export type { ModifierManager };

export type { ModifierCapabilities } from '@glimmer/interfaces';
export { modifierCapabilities as capabilities } from '@ember/-internals/glimmer';
export { modifierCapabilities as capabilities } from '@ember/-internals/glimmer/lib/utils/managers';
2 changes: 1 addition & 1 deletion packages/@ember/object/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { assert } from '@ember/debug';
import { ENV } from '@ember/-internals/environment';
import { ENV } from '@ember/-internals/environment/lib/env';
import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal';
import {
isElementDescriptor,
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/renderer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
@public
*/

export { renderSettled } from '@ember/-internals/glimmer';
export { renderSettled } from '@ember/-internals/glimmer/lib/renderer';

/**
* Render a component into a DOM element.
Expand All @@ -79,4 +79,4 @@ export { renderSettled } from '@ember/-internals/glimmer';
* @param {Object} [options.args] Optionally pass args in to the component. These may be reactive as long as it is an object or object-like
* @public
*/
export { renderComponent } from '@ember/-internals/glimmer';
export { renderComponent } from '@ember/-internals/glimmer/lib/renderer';
2 changes: 1 addition & 1 deletion packages/@ember/routing/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { LinkTo } from '@ember/-internals/glimmer';
export { default as LinkTo } from '@ember/-internals/glimmer/lib/components/link-to';
2 changes: 1 addition & 1 deletion packages/@ember/routing/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { dependentKeyCompat } from '@ember/object/compat';
import { once } from '@ember/runloop';
import { DEBUG } from '@glimmer/env';
import { hasInternalComponentManager } from '@glimmer/manager';
import type { RenderState } from '@ember/-internals/glimmer';
import type { RenderState } from '@ember/-internals/glimmer/lib/utils/outlet';
import type { TemplateFactory } from '@glimmer/interfaces';
import type { InternalRouteInfo, Route as IRoute, Transition, TransitionState } from 'router_js';
import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
Expand Down
6 changes: 5 additions & 1 deletion packages/@ember/routing/router.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { privatize as P } from '@ember/-internals/container';
import type { BootEnvironment, OutletState, OutletView } from '@ember/-internals/glimmer';
import type {
BootEnvironment,
default as OutletView,
} from '@ember/-internals/glimmer/lib/views/outlet';
import type { OutletState } from '@ember/-internals/glimmer/lib/utils/outlet';
import { computed, get, set } from '@ember/object';
import type { default as Owner, FactoryManager } from '@ember/owner';
import { getOwner } from '@ember/owner';
Expand Down
7 changes: 6 additions & 1 deletion packages/@ember/template-compiler/-internal-primitives.ts
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
export * from './lib/-internal/primitives';
export {
RESOLUTION_MODE_TRANSFORMS,
STRICT_MODE_TRANSFORMS,
STRICT_MODE_KEYWORDS,
INTERNAL_PLUGINS,
} from './lib/-internal/primitives';
8 changes: 7 additions & 1 deletion packages/@ember/template-compiler/-internal-utils.ts
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
export * from './lib/plugins/utils';
export {
isPath,
isSubExpression,
isStringLiteral,
inScope,
trackLocals,
} from './lib/plugins/utils';
3 changes: 2 additions & 1 deletion packages/@ember/template-compiler/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './lib/public-api';
export { template } from './lib/public-api';
export type { EmberPrecompileOptions } from './lib/public-api';

export { ALLOWED_GLOBALS } from './lib/plugins/allowed-globals';
3 changes: 2 additions & 1 deletion packages/@ember/template-compiler/lib/runtime.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './public-api';
export { template } from './public-api';
export type { EmberPrecompileOptions } from './public-api';
2 changes: 1 addition & 1 deletion packages/@ember/template-compiler/runtime.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './lib/runtime';
export { template, type EmberPrecompileOptions } from './lib/runtime';
2 changes: 1 addition & 1 deletion packages/@ember/template/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ export {
isHTMLSafe,
type SafeString,
type TrustedHTML,
} from '@ember/-internals/glimmer';
} from '@ember/-internals/glimmer/lib/utils/string';
17 changes: 16 additions & 1 deletion packages/ember-template-compiler/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
export * from './lib/public-api';
export {
precompile,
compile,
compileOptions,
_buildCompileOptions,
_transformsFor,
RESOLUTION_MODE_TRANSFORMS,
STRICT_MODE_TRANSFORMS,
_preprocess,
_print,
_precompile,
_GlimmerSyntax,
VERSION,
} from './lib/public-api';
export type { EmberPrecompileOptions } from './lib/public-api';
// NOTE: import * is intentional here -- the namespace object is passed to __registerTemplateCompiler
import * as ETC from './lib/public-api';
import { __registerTemplateCompiler } from '@ember/template-compilation';

Expand Down
8 changes: 7 additions & 1 deletion packages/ember-template-compiler/lib/plugins/utils.ts
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
export * from '@ember/template-compiler/-internal-utils';
export {
isPath,
isSubExpression,
isStringLiteral,
inScope,
trackLocals,
} from '@ember/template-compiler/-internal-utils';
2 changes: 1 addition & 1 deletion packages/ember-template-compiler/lib/system/compile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import type { EmberPrecompileOptions } from '../types';
import precompile from './precompile';
import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
import { template } from '@ember/-internals/glimmer';
import { templateFactory as template } from '@glimmer/opcode-compiler';

/**
Uses HTMLBars `compile` function to process a string into a compiled template.
Expand Down
1 change: 1 addition & 0 deletions packages/ember-template-compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@ember/template-compiler": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/compiler": "workspace:*",
"@glimmer/opcode-compiler": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/interfaces": "workspace:*",
"@glimmer/manager": "workspace:*",
Expand Down
3 changes: 2 additions & 1 deletion packages/ember-testing/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './lib/public-api';
export { Test, Adapter } from './lib/public-api';
// NOTE: import * is intentional here -- the namespace object is passed to registerTestImplementation
import * as EmberTesting from './lib/public-api';
import { registerTestImplementation } from '@ember/test';

Expand Down
Loading
Loading