From bbef9a6c46a7d7cafca42b2187be738dec9689cb Mon Sep 17 00:00:00 2001 From: Scott Newcomer Date: Sun, 19 Feb 2023 20:06:56 -0600 Subject: [PATCH] typescript: inline types --- .eslintrc.js | 8 ++- .../-internals/container/lib/container.ts | 19 +++--- .../-internals/container/lib/registry.ts | 20 +++--- .../glimmer/lib/component-managers/curly.ts | 44 +++++++------ .../glimmer/lib/component-managers/mount.ts | 34 +++++------ .../glimmer/lib/component-managers/outlet.ts | 42 ++++++------- .../glimmer/lib/component-managers/root.ts | 16 ++--- .../-internals/glimmer/lib/component.ts | 8 +-- .../glimmer/lib/components/abstract-input.ts | 13 ++-- .../glimmer/lib/components/internal.ts | 28 ++++----- .../glimmer/lib/components/link-to.ts | 6 +- .../-internals/glimmer/lib/environment.ts | 8 +-- .../@ember/-internals/glimmer/lib/helper.ts | 11 ++-- .../helpers/-disallow-dynamic-resolution.ts | 2 +- .../lib/helpers/-in-element-null-check.ts | 2 +- .../glimmer/lib/helpers/-normalize-class.ts | 2 +- .../glimmer/lib/helpers/-resolve.ts | 4 +- .../glimmer/lib/helpers/-track-array.ts | 2 +- .../-internals/glimmer/lib/helpers/action.ts | 14 +++-- .../-internals/glimmer/lib/helpers/each-in.ts | 2 +- .../glimmer/lib/helpers/internal-helper.ts | 4 +- .../-internals/glimmer/lib/helpers/mut.ts | 2 +- .../glimmer/lib/helpers/readonly.ts | 2 +- .../-internals/glimmer/lib/helpers/unbound.ts | 2 +- .../glimmer/lib/helpers/unique-id.ts | 4 +- .../glimmer/lib/modifiers/action.ts | 18 +++--- .../glimmer/lib/modifiers/internal.ts | 14 ++--- .../@ember/-internals/glimmer/lib/renderer.ts | 49 ++++++++------- .../@ember/-internals/glimmer/lib/resolver.ts | 27 ++++---- .../-internals/glimmer/lib/setup-registry.ts | 4 +- .../-internals/glimmer/lib/syntax/mount.ts | 14 ++--- .../-internals/glimmer/lib/syntax/outlet.ts | 22 ++++--- .../-internals/glimmer/lib/syntax/utils.ts | 2 +- .../@ember/-internals/glimmer/lib/template.ts | 8 +-- .../glimmer/lib/template_registry.ts | 2 +- .../glimmer/lib/templates/empty.d.ts | 2 +- .../glimmer/lib/templates/input.d.ts | 2 +- .../glimmer/lib/templates/link-to.d.ts | 2 +- .../glimmer/lib/templates/outlet.d.ts | 2 +- .../glimmer/lib/templates/root.d.ts | 2 +- .../glimmer/lib/templates/textarea.d.ts | 2 +- .../-internals/glimmer/lib/utils/bindings.ts | 5 +- .../lib/utils/curly-component-state-bucket.ts | 16 +++-- .../-internals/glimmer/lib/utils/iterator.ts | 6 +- .../-internals/glimmer/lib/utils/managers.ts | 4 +- .../-internals/glimmer/lib/utils/outlet.ts | 4 +- .../glimmer/lib/utils/process-args.ts | 6 +- .../-internals/glimmer/lib/utils/string.ts | 2 +- .../-internals/glimmer/lib/views/outlet.ts | 16 ++--- .../application/debug-render-tree-test.ts | 12 ++-- .../angle-bracket-invocation-test.js | 4 +- .../components/target-action-test.js | 3 +- .../integration/components/tracked-test.js | 3 +- .../glimmer/tests/integration/content-test.js | 3 +- .../custom-component-manager-test.js | 3 +- .../helpers/default-helper-manager-test.js | 3 +- .../tests/integration/syntax/each-in-test.js | 3 +- .../tests/utils/shared-conditional-tests.js | 3 +- packages/@ember/-internals/meta/lib/meta.ts | 4 +- packages/@ember/-internals/metal/lib/alias.ts | 10 +-- .../@ember/-internals/metal/lib/chain-tags.ts | 8 ++- .../@ember/-internals/metal/lib/computed.ts | 18 +++--- .../@ember/-internals/metal/lib/decorator.ts | 4 +- .../metal/lib/deprecate_property.ts | 3 +- .../@ember/-internals/metal/lib/events.ts | 6 +- .../-internals/metal/lib/injected_property.ts | 8 ++- .../@ember/-internals/metal/lib/observer.ts | 4 +- .../@ember/-internals/metal/lib/properties.ts | 12 ++-- .../-internals/metal/lib/property_events.ts | 4 +- packages/@ember/-internals/metal/lib/tags.ts | 3 +- .../@ember/-internals/metal/lib/tracked.ts | 12 +++- .../-internals/runtime/lib/mixins/-proxy.ts | 10 ++- .../runtime/lib/mixins/container_proxy.ts | 2 +- .../runtime/lib/mixins/registry_proxy.ts | 6 +- .../-internals/runtime/tests/inject_test.js | 3 +- .../tests/mixins/promise_proxy_test.js | 3 +- .../tests/system/array_proxy/length_test.js | 3 +- .../tests/system/native_array/a_test.js | 3 +- .../-internals/utils/lib/mandatory-setter.ts | 2 +- .../-internals/views/lib/component_lookup.ts | 2 +- .../views/lib/mixins/child_views_support.ts | 2 +- .../views/lib/mixins/view_support.ts | 4 +- .../views/lib/system/action_manager.ts | 2 +- .../views/lib/system/event_dispatcher.ts | 6 +- .../-internals/views/lib/system/utils.ts | 10 +-- .../-internals/views/lib/views/core_view.ts | 6 +- packages/@ember/application/index.ts | 9 ++- packages/@ember/application/instance.ts | 16 ++--- .../tests/application_instance_test.js | 4 +- .../application/tests/application_test.js | 3 +- packages/@ember/array/-internals.ts | 2 +- packages/@ember/array/index.ts | 27 ++++---- packages/@ember/array/proxy.ts | 5 +- packages/@ember/controller/index.ts | 18 ++++-- .../controller/tests/controller_test.js | 13 ++-- .../@ember/debug/container-debug-adapter.ts | 2 +- packages/@ember/debug/data-adapter.ts | 11 ++-- packages/@ember/debug/index.ts | 10 +-- .../@ember/debug/lib/capture-render-tree.ts | 4 +- packages/@ember/debug/lib/deprecate.ts | 3 +- packages/@ember/debug/lib/warn.ts | 3 +- packages/@ember/engine/index.ts | 8 +-- packages/@ember/engine/instance.ts | 11 ++-- .../engine/tests/engine_instance_test.js | 2 +- packages/@ember/object/compat.ts | 11 ++-- packages/@ember/object/core.ts | 4 +- packages/@ember/object/index.ts | 6 +- .../object/lib/computed/computed_macros.ts | 4 +- .../lib/computed/reduce_computed_macros.ts | 3 +- packages/@ember/object/mixin.ts | 17 +++--- packages/@ember/object/promise-proxy-mixin.ts | 2 +- packages/@ember/object/tests/extend_test.js | 3 +- .../@ember/object/tests/observable_test.js | 3 +- .../@ember/object/tests/reopenClass_test.js | 3 +- packages/@ember/routing/auto-location.ts | 4 +- packages/@ember/routing/hash-location.ts | 2 +- packages/@ember/routing/history-location.ts | 2 +- packages/@ember/routing/lib/controller_for.ts | 4 +- packages/@ember/routing/lib/dsl.ts | 8 +-- .../@ember/routing/lib/generate_controller.ts | 2 +- packages/@ember/routing/lib/router_state.ts | 2 +- .../@ember/routing/lib/routing-service.ts | 4 +- packages/@ember/routing/lib/utils.ts | 8 +-- packages/@ember/routing/none-location.ts | 2 +- packages/@ember/routing/route.ts | 34 ++++++----- packages/@ember/routing/router-service.ts | 11 +++- packages/@ember/routing/router.ts | 61 +++++++++++-------- .../routing/tests/location/util_test.js | 10 ++- packages/@ember/runloop/index.ts | 6 +- packages/@ember/service/index.ts | 7 ++- packages/@ember/service/tests/service_test.js | 3 +- .../@ember/service/tests/service_ts_test.ts | 3 +- packages/@ember/string/index.ts | 6 +- packages/@ember/utils/lib/compare.ts | 3 +- .../lib/plugins/assert-against-attrs.ts | 4 +- .../plugins/assert-against-named-outlets.ts | 4 +- .../assert-input-helper-without-block.ts | 4 +- .../assert-reserved-named-arguments.ts | 4 +- .../plugins/assert-splattribute-expression.ts | 4 +- .../lib/plugins/transform-action-syntax.ts | 4 +- .../plugins/transform-each-in-into-each.ts | 4 +- .../lib/plugins/transform-each-track-array.ts | 4 +- .../lib/plugins/transform-in-element.ts | 4 +- ...form-quoted-bindings-into-just-bindings.ts | 2 +- .../lib/plugins/transform-resolutions.ts | 6 +- .../transform-wrap-mount-and-outlet.ts | 4 +- .../lib/plugins/utils.ts | 2 +- .../lib/system/bootstrap.ts | 2 +- .../lib/system/calculate-location-display.ts | 2 +- .../lib/system/compile-options.ts | 2 +- .../lib/system/compile.ts | 6 +- .../lib/system/precompile.ts | 2 +- .../ember-template-compiler/lib/types.d.ts | 10 +-- .../tests/utils/transform-test-case.ts | 4 +- packages/ember-testing/lib/ext/application.ts | 2 +- .../ember-testing/lib/helpers/and_then.ts | 2 +- packages/ember-testing/lib/helpers/visit.ts | 2 +- packages/ember-testing/lib/initializers.ts | 2 +- packages/ember-testing/lib/test/helpers.ts | 2 +- .../ember-testing/tests/reexports_test.js | 3 +- packages/ember/index.ts | 3 +- .../ember/tests/routing/model_loading_test.js | 3 +- .../internal-test-helpers/lib/build-owner.ts | 2 +- packages/internal-test-helpers/lib/compile.ts | 5 +- .../lib/define-template-values.ts | 10 +-- .../lib/ember-dev/assertion.ts | 3 +- .../lib/ember-dev/debug.ts | 2 +- .../lib/ember-dev/deprecation.ts | 3 +- .../lib/ember-dev/method-call-tracker.ts | 3 +- .../lib/ember-dev/setup-qunit.ts | 2 +- .../lib/ember-dev/warning.ts | 3 +- .../internal-test-helpers/lib/module-for.ts | 4 +- .../internal-test-helpers/lib/node-query.ts | 10 ++- .../lib/registry-check.ts | 2 +- .../lib/test-cases/abstract-application.ts | 6 +- .../lib/test-cases/query-param.ts | 2 +- .../lib/test-cases/rendering.ts | 14 ++--- .../lib/test-cases/router-non-application.ts | 12 ++-- .../test-cases/test-resolver-application.ts | 2 +- .../lib/test-resolver.ts | 2 +- 180 files changed, 691 insertions(+), 609 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a30b8021976..46273446d94 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,6 +14,8 @@ module.exports = { plugins: ['ember-internal', 'import', 'qunit', 'disable-features'], rules: { 'no-console': 'error', + 'import/no-duplicates': ['error', { 'prefer-inline': true }], + 'import/consistent-type-specifier-style': ['error', 'prefer-inline'], 'no-implicit-coercion': 'error', 'no-new-wrappers': 'error', 'no-unused-vars': 'error', @@ -56,7 +58,11 @@ module.exports = { '@typescript-eslint/no-empty-function': 'off', '@typescript-eslint/no-this-alias': 'off', '@typescript-eslint/no-var-requires': 'warn', - '@typescript-eslint/consistent-type-imports': 'error', + // '@typescript-eslint/consistent-type-imports': 'error', + '@typescript-eslint/consistent-type-imports': [ + 'error', + { fixStyle: 'inline-type-imports' }, + ], // TODO: Enable and fix these rules // Typescript provides better types with these rules enabled diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts index 9e3323dd1ac..9ff5280f0c0 100644 --- a/packages/@ember/-internals/container/lib/container.ts +++ b/packages/@ember/-internals/container/lib/container.ts @@ -1,16 +1,17 @@ -import type { - InternalFactory, - FactoryClass, - InternalOwner, - RegisterOptions, - FactoryManager, - FullName, +import { + type InternalFactory, + type FactoryClass, + type InternalOwner, + type RegisterOptions, + type FactoryManager, + type FullName, + setOwner, } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; + import { dictionary } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { DebugRegistry } from './registry'; +import { type DebugRegistry } from './registry'; import type Registry from './registry'; interface LeakTracking { diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts index 30888240abf..53ee7ab246a 100644 --- a/packages/@ember/-internals/container/lib/registry.ts +++ b/packages/@ember/-internals/container/lib/registry.ts @@ -1,17 +1,17 @@ -import type { - FactoryClass, - FullName, - InternalFactory, - KnownForTypeResult, - RegisterOptions, - Resolver, +import { + type FactoryClass, + type FullName, + type InternalFactory, + type KnownForTypeResult, + type RegisterOptions, + type Resolver, } from '@ember/-internals/owner'; import { dictionary, intern } from '@ember/-internals/utils'; import { assert, deprecate } from '@ember/debug'; -import type { set } from '@ember/object'; +import { type set } from '@ember/object'; import { DEBUG } from '@glimmer/env'; -import type { ContainerOptions, LazyInjection } from './container'; -import Container from './container'; + +import Container, { type ContainerOptions, type LazyInjection } from './container'; export interface Injection { property: string; diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts index 3845e5f526a..7a1fadc2d52 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts @@ -9,24 +9,30 @@ import { addChildView, setElementView, setViewElement } from '@ember/-internals/ import { assert, debugFreeze } from '@ember/debug'; import { _instrumentStart } from '@ember/instrumentation'; import { DEBUG } from '@glimmer/env'; -import type { - Bounds, - CapturedArguments, - CompilableProgram, - Destroyable, - ElementOperations, - Environment, - InternalComponentCapabilities, - Option, - PreparedArguments, - TemplateFactory, - VMArguments, - WithCreateInstance, - WithDynamicLayout, - WithDynamicTagName, +import { + type Bounds, + type CapturedArguments, + type CompilableProgram, + type Destroyable, + type ElementOperations, + type Environment, + type InternalComponentCapabilities, + type Option, + type PreparedArguments, + type TemplateFactory, + type VMArguments, + type WithCreateInstance, + type WithDynamicLayout, + type WithDynamicTagName, } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { childRefFor, createComputeRef, createPrimitiveRef, valueForRef } from '@glimmer/reference'; +import { + type Reference, + childRefFor, + createComputeRef, + createPrimitiveRef, + valueForRef, +} from '@glimmer/reference'; + import { reifyPositional } from '@glimmer/runtime'; import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util'; import { @@ -38,9 +44,9 @@ import { validateTag, valueForTag, } from '@glimmer/validator'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type SimpleElement } from '@simple-dom/interface'; import type Component from '../component'; -import type { DynamicScope } from '../renderer'; +import { type DynamicScope } from '../renderer'; import type RuntimeResolver from '../resolver'; import { isTemplateFactory } from '../template'; import { diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts index 8fad1b2f9d7..24424826187 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts @@ -1,26 +1,26 @@ -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { generateControllerFactory } from '@ember/routing/-internals'; import { assert } from '@ember/debug'; import EngineInstance from '@ember/engine/instance'; import { associateDestroyableChild } from '@glimmer/destroyable'; -import type { - CapturedArguments, - ComponentDefinition, - CustomRenderNode, - Destroyable, - Environment, - InternalComponentCapabilities, - Option, - TemplateFactory, - VMArguments, - WithCreateInstance, - WithCustomDebugRenderTree, - WithDynamicLayout, - WithSubOwner, +import { + type CapturedArguments, + type ComponentDefinition, + type CustomRenderNode, + type Destroyable, + type Environment, + type InternalComponentCapabilities, + type Option, + type TemplateFactory, + type VMArguments, + type WithCreateInstance, + type WithCustomDebugRenderTree, + type WithDynamicLayout, + type WithSubOwner, } from '@glimmer/interfaces'; import { capabilityFlagsFrom } from '@glimmer/manager'; -import type { Reference } from '@glimmer/reference'; -import { createConstRef, valueForRef } from '@glimmer/reference'; +import { type Reference, createConstRef, valueForRef } from '@glimmer/reference'; + import { unwrapTemplate } from '@glimmer/util'; import type RuntimeResolver from '../resolver'; diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts index 4cc01253c4a..9428950a68c 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts @@ -1,34 +1,34 @@ import { ENV } from '@ember/-internals/environment'; -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { guidFor } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import EngineInstance from '@ember/engine/instance'; import { _instrumentStart } from '@ember/instrumentation'; -import type { - CapturedArguments, - CompilableProgram, - ComponentDefinition, - CustomRenderNode, - Destroyable, - Environment, - InternalComponentCapabilities, - InternalComponentCapability, - Option, - Template, - VMArguments, - WithCreateInstance, - WithCustomDebugRenderTree, - WithDynamicTagName, +import { + type CapturedArguments, + type CompilableProgram, + type ComponentDefinition, + type CustomRenderNode, + type Destroyable, + type Environment, + type InternalComponentCapabilities, + type InternalComponentCapability, + type Option, + type Template, + type VMArguments, + type WithCreateInstance, + type WithCustomDebugRenderTree, + type WithDynamicTagName, } from '@glimmer/interfaces'; import { capabilityFlagsFrom } from '@glimmer/manager'; -import type { Reference } from '@glimmer/reference'; -import { createConstRef, valueForRef } from '@glimmer/reference'; +import { type Reference, createConstRef, valueForRef } from '@glimmer/reference'; + import { EMPTY_ARGS } from '@glimmer/runtime'; import { unwrapTemplate } from '@glimmer/util'; -import type { SimpleElement } from '@simple-dom/interface'; -import type { DynamicScope } from '../renderer'; -import type { OutletState } from '../utils/outlet'; +import { type SimpleElement } from '@simple-dom/interface'; +import { type DynamicScope } from '../renderer'; +import { type OutletState } from '../utils/outlet'; import type OutletView from '../views/outlet'; function instrumentationPayload(def: OutletDefinitionState) { diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts index 96039c6ef3f..5a9188e7ed4 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts @@ -2,18 +2,18 @@ import { getFactoryFor } from '@ember/-internals/container'; import { assert } from '@ember/debug'; import { _instrumentStart } from '@ember/instrumentation'; import { DEBUG } from '@glimmer/env'; -import type { - ComponentDefinition, - Environment, - InternalComponentCapabilities, - Option, - Owner, - VMArguments, +import { + type ComponentDefinition, + type Environment, + type InternalComponentCapabilities, + type Option, + type Owner, + type VMArguments, } from '@glimmer/interfaces'; import { capabilityFlagsFrom } from '@glimmer/manager'; import { CONSTANT_TAG, consumeTag } from '@glimmer/validator'; import type Component from '../component'; -import type { DynamicScope } from '../renderer'; +import { type DynamicScope } from '../renderer'; import ComponentStateBucket from '../utils/curly-component-state-bucket'; import CurlyComponentManager, { DIRTY_TAG, diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts index 12c2ca543e6..b4eeb858330 100644 --- a/packages/@ember/-internals/glimmer/lib/component.ts +++ b/packages/@ember/-internals/glimmer/lib/component.ts @@ -1,5 +1,5 @@ import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal'; -import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events'; +import { type PropertyDidChange } from '@ember/-internals/metal/lib/property_events'; import { getOwner } from '@ember/-internals/owner'; import { TargetActionSupport } from '@ember/-internals/runtime'; import { @@ -14,12 +14,12 @@ import { } from '@ember/-internals/views'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { Environment, Template, TemplateFactory } from '@glimmer/interfaces'; +import { type Environment, type Template, type TemplateFactory } from '@glimmer/interfaces'; import { setInternalComponentManager } from '@glimmer/manager'; import { isUpdatableRef, updateRef } from '@glimmer/reference'; import { normalizeProperty } from '@glimmer/runtime'; -import type { DirtyableTag } from '@glimmer/validator'; -import { createTag, dirtyTag } from '@glimmer/validator'; +import { type DirtyableTag, createTag, dirtyTag } from '@glimmer/validator'; + import { Namespace } from '@simple-dom/interface'; import { ARGS, diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts index 01bae28b626..07fb929b22d 100644 --- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts +++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts @@ -1,10 +1,15 @@ import { tracked } from '@ember/-internals/metal'; import { assert } from '@ember/debug'; import { action } from '@ember/object'; -import type { Reference } from '@glimmer/reference'; -import { isConstRef, isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference'; -import type { EventListener } from './internal'; -import InternalComponent from './internal'; +import { + type Reference, + isConstRef, + isUpdatableRef, + updateRef, + valueForRef, +} from '@glimmer/reference'; + +import InternalComponent, { type EventListener } from './internal'; const UNINITIALIZED: unknown = Object.freeze({}); diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts index 06ba968177d..57e882544d5 100644 --- a/packages/@ember/-internals/glimmer/lib/components/internal.ts +++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts @@ -1,21 +1,21 @@ -import type { InternalOwner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { type InternalOwner, setOwner } from '@ember/-internals/owner'; + import { guidFor } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; -import type { - CapturedArguments, - Destroyable, - DynamicScope, - Environment, - InternalComponentCapabilities, - InternalComponentManager, - TemplateFactory, - VMArguments, - WithCreateInstance, +import { + type CapturedArguments, + type Destroyable, + type DynamicScope, + type Environment, + type InternalComponentCapabilities, + type InternalComponentManager, + type TemplateFactory, + type VMArguments, + type WithCreateInstance, } from '@glimmer/interfaces'; import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager'; -import type { Reference } from '@glimmer/reference'; -import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference'; +import { type Reference, createConstRef, isConstRef, valueForRef } from '@glimmer/reference'; + import { untrack } from '@glimmer/validator'; function NOOP(): void {} diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts index f90bcfc951c..a19826be744 100644 --- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts +++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts @@ -1,5 +1,5 @@ import type Route from '@ember/routing/route'; -import type { RouterState, RoutingService } from '@ember/routing/-internals'; +import { type RouterState, type RoutingService } from '@ember/routing/-internals'; import { isSimpleClick } from '@ember/-internals/views'; import { assert, debugFreeze, inspect, warn } from '@ember/debug'; import { getEngineParent } from '@ember/engine'; @@ -8,9 +8,9 @@ import { flaggedInstrument } from '@ember/instrumentation'; import { action } from '@ember/object'; import { service } from '@ember/service'; import { DEBUG } from '@glimmer/env'; -import type { Maybe, Option } from '@glimmer/interfaces'; +import { type Maybe, type Option } from '@glimmer/interfaces'; import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; import LinkToTemplate from '../templates/link-to'; import InternalComponent, { opaquify } from './internal'; diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts index 90c2f27ca88..a8bde7cde2e 100644 --- a/packages/@ember/-internals/glimmer/lib/environment.ts +++ b/packages/@ember/-internals/glimmer/lib/environment.ts @@ -1,14 +1,14 @@ import { ENV } from '@ember/-internals/environment'; import { get, set, _getProp, _setProp } from '@ember/-internals/metal'; -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { getDebugName } from '@ember/-internals/utils'; import { constructStyleDeprecationMessage } from '@ember/-internals/views'; -import { assert, deprecate, warn } from '@ember/debug'; -import type { DeprecationOptions } from '@ember/debug'; + +import { type DeprecationOptions, assert, deprecate, warn } from '@ember/debug'; import { schedule, _backburner } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; import setGlobalContext from '@glimmer/global-context'; -import type { EnvironmentDelegate } from '@glimmer/runtime'; +import { type EnvironmentDelegate } from '@glimmer/runtime'; import { setTrackingTransactionEnv } from '@glimmer/validator'; import toIterator from './utils/iterator'; import { isHTMLSafe } from './utils/string'; diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts index 148d81c49c8..8c20ec9294b 100644 --- a/packages/@ember/-internals/glimmer/lib/helper.ts +++ b/packages/@ember/-internals/glimmer/lib/helper.ts @@ -2,17 +2,16 @@ @module @ember/component */ -import type { InternalFactoryManager } from '@ember/-internals/container/lib/container'; -import type { InternalFactory, InternalOwner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { type InternalFactoryManager } from '@ember/-internals/container/lib/container'; +import { type InternalFactory, type InternalOwner, setOwner } from '@ember/-internals/owner'; + import { FrameworkObject } from '@ember/object/-internals'; import { getDebugName } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { join } from '@ember/runloop'; -import type { Arguments, Dict, HelperManager } from '@glimmer/interfaces'; +import { type Arguments, type Dict, type HelperManager } from '@glimmer/interfaces'; import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager'; -import type { DirtyableTag } from '@glimmer/validator'; -import { consumeTag, createTag, dirtyTag } from '@glimmer/validator'; +import { type DirtyableTag, consumeTag, createTag, dirtyTag } from '@glimmer/validator'; export const RECOMPUTE_TAG = Symbol('RECOMPUTE_TAG'); diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts index 6f821c8c171..26096da40fc 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts @@ -2,7 +2,7 @@ @module ember */ import { assert } from '@ember/debug'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts index 10fc222f5fe..2fd71e24b13 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts @@ -1,6 +1,6 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments, Helper } from '@glimmer/interfaces'; +import { type CapturedArguments, type Helper } from '@glimmer/interfaces'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts index 5603e12c135..141897b764e 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts @@ -1,6 +1,6 @@ import { assert } from '@ember/debug'; import { dasherize } from '@ember/-internals/string'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts index 71bd9f3ff43..8e0135d63b3 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts @@ -1,10 +1,10 @@ /** @module ember */ -import type { FullName, InternalOwner } from '@ember/-internals/owner'; +import { type FullName, type InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts index c380be4737d..61af800b3ce 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts @@ -4,7 +4,7 @@ import { tagForProperty } from '@ember/-internals/metal'; import { isObject } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import { consumeTag } from '@glimmer/validator'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts index d803e5c98f2..068e8948633 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts @@ -2,14 +2,20 @@ @module ember */ import { get } from '@ember/-internals/metal'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import { assert } from '@ember/debug'; import { flaggedInstrument } from '@ember/instrumentation'; import { join } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { createUnboundRef, isInvokableRef, updateRef, valueForRef } from '@glimmer/reference'; +import { type CapturedArguments } from '@glimmer/interfaces'; +import { + type Reference, + createUnboundRef, + isInvokableRef, + updateRef, + valueForRef, +} from '@glimmer/reference'; + import { _WeakSet } from '@glimmer/util'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts index 682d71b7c8a..b353835a7b5 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts @@ -5,7 +5,7 @@ import { tagForObject } from '@ember/-internals/metal'; import { _contentFor } from '@ember/-internals/runtime'; import { isProxy } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createComputeRef, valueForRef } from '@glimmer/reference'; import { consumeTag } from '@glimmer/validator'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts index f474a052e6e..ab6488e234d 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts @@ -1,5 +1,5 @@ -import type { InternalOwner } from '@ember/-internals/owner'; -import type { Helper, HelperDefinitionState } from '@glimmer/interfaces'; +import { type InternalOwner } from '@ember/-internals/owner'; +import { type Helper, type HelperDefinitionState } from '@glimmer/interfaces'; import { setInternalHelperManager } from '@glimmer/manager'; export function internalHelper(helper: Helper): HelperDefinitionState { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts index 618dd4d2e3d..435824fdd66 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts @@ -2,7 +2,7 @@ @module ember */ import { assert } from '@ember/debug'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createInvokableRef, isUpdatableRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts index 12b9a5b7c54..ad852185fcc 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts @@ -1,7 +1,7 @@ /** @module ember */ -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createReadOnlyRef } from '@glimmer/reference'; import { assert } from '@ember/debug'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts index 402604cfbd1..5d6571d258a 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts @@ -3,7 +3,7 @@ */ import { assert } from '@ember/debug'; -import type { CapturedArguments } from '@glimmer/interfaces'; +import { type CapturedArguments } from '@glimmer/interfaces'; import { createUnboundRef, valueForRef } from '@glimmer/reference'; import { internalHelper } from './internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts index 6320c24a3db..2a56086fe90 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts @@ -25,8 +25,8 @@ @public */ -import type { Reference } from '@glimmer/reference'; -import { createConstRef } from '@glimmer/reference'; +import { type Reference, createConstRef } from '@glimmer/reference'; + import { internalHelper } from './internal-helper'; export default internalHelper((): Reference => { diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts index 249eaeb9436..1de24a4eff1 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts @@ -1,4 +1,4 @@ -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { uuid } from '@ember/-internals/utils'; import { ActionManager, EventDispatcher, isSimpleClick } from '@ember/-internals/views'; import { assert } from '@ember/debug'; @@ -6,17 +6,17 @@ import { flaggedInstrument } from '@ember/instrumentation'; import { join } from '@ember/runloop'; import { registerDestructor } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; -import type { - CapturedArguments, - CapturedNamedArguments, - CapturedPositionalArguments, - InternalModifierManager, +import { + type CapturedArguments, + type CapturedNamedArguments, + type CapturedPositionalArguments, + type InternalModifierManager, } from '@glimmer/interfaces'; import { setInternalModifierManager } from '@glimmer/manager'; import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference'; -import type { UpdatableTag } from '@glimmer/validator'; -import { createUpdatableTag } from '@glimmer/validator'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type UpdatableTag, createUpdatableTag } from '@glimmer/validator'; + +import { type SimpleElement } from '@simple-dom/interface'; const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl']; const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/; diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts index 838a955f387..9b5b49ed0c4 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts @@ -1,15 +1,15 @@ -import type { InternalOwner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { type InternalOwner, setOwner } from '@ember/-internals/owner'; + import { guidFor } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { registerDestructor } from '@glimmer/destroyable'; -import type { - CapturedArguments, - Destroyable, - InternalModifierManager as ModifierManager, +import { + type CapturedArguments, + type Destroyable, + type InternalModifierManager as ModifierManager, } from '@glimmer/interfaces'; import { valueForRef } from '@glimmer/reference'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type SimpleElement } from '@simple-dom/interface'; export default class InternalModifier { // Override this diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts index b51175b242c..48632ee6bae 100644 --- a/packages/@ember/-internals/glimmer/lib/renderer.ts +++ b/packages/@ember/-internals/glimmer/lib/renderer.ts @@ -1,34 +1,40 @@ import { privatize as P } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; -import type { InternalOwner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { type InternalOwner, getOwner } from '@ember/-internals/owner'; + import { guidFor } from '@ember/-internals/utils'; import { getViewElement, getViewId } from '@ember/-internals/views'; import { assert } from '@ember/debug'; import { _backburner, _getCurrentRunLoop } from '@ember/runloop'; import { destroy } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; -import type { - Bounds, - CompileTimeCompilationContext, - Cursor, - DebugRenderTree, - DynamicScope as GlimmerDynamicScope, - ElementBuilder, - Environment, - Option, - RenderResult, - RuntimeContext, - Template, - TemplateFactory, +import { + type Bounds, + type CompileTimeCompilationContext, + type Cursor, + type DebugRenderTree, + type DynamicScope as GlimmerDynamicScope, + type ElementBuilder, + type Environment, + type Option, + type RenderResult, + type RuntimeContext, + type Template, + type TemplateFactory, + CurriedType, } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/interfaces'; + import { programCompilationContext } from '@glimmer/opcode-compiler'; import { artifacts } from '@glimmer/program'; -import type { Reference } from '@glimmer/reference'; -import { createConstRef, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference'; -import type { CurriedValue } from '@glimmer/runtime'; import { + type Reference, + createConstRef, + UNDEFINED_REFERENCE, + valueForRef, +} from '@glimmer/reference'; + +import { + type CurriedValue, clientBuilder, curry, DOMChanges, @@ -37,9 +43,10 @@ import { renderMain, runtimeContext, } from '@glimmer/runtime'; + import { unwrapTemplate } from '@glimmer/util'; import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator'; -import type { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface'; +import { type SimpleDocument, type SimpleElement, type SimpleNode } from '@simple-dom/interface'; import RSVP from 'rsvp'; import type Component from './component'; import { BOUNDS } from './component-managers/curly'; @@ -48,7 +55,7 @@ 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 { type OutletState } from './utils/outlet'; import OutletView from './views/outlet'; export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder; diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts index 4f0cb7c8b7f..e6d34aab128 100644 --- a/packages/@ember/-internals/glimmer/lib/resolver.ts +++ b/packages/@ember/-internals/glimmer/lib/resolver.ts @@ -1,19 +1,24 @@ import { privatize as P } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; -import type { InternalFactory, InternalOwner, RegisterOptions } from '@ember/-internals/owner'; -import { isFactory } from '@ember/-internals/owner'; +import { + type InternalFactory, + type InternalOwner, + type RegisterOptions, + isFactory, +} from '@ember/-internals/owner'; + import { assert } from '@ember/debug'; import { _instrumentStart } from '@ember/instrumentation'; import { DEBUG } from '@glimmer/env'; -import type { - CompileTimeResolver, - HelperDefinitionState, - ModifierDefinitionState, - Option, - ResolvedComponentDefinition, - RuntimeResolver, - Template, - TemplateFactory, +import { + type CompileTimeResolver, + type HelperDefinitionState, + type ModifierDefinitionState, + type Option, + type ResolvedComponentDefinition, + type RuntimeResolver, + type Template, + type TemplateFactory, } from '@glimmer/interfaces'; import { getComponentTemplate, diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts index 19d6053ac96..e6e5bed0f0e 100644 --- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts +++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts @@ -1,5 +1,5 @@ -import type { Registry } from '@ember/-internals/container'; -import { privatize as P } from '@ember/-internals/container'; +import { type Registry, P } from '@ember/-internals/container'; + import { ENV } from '@ember/-internals/environment'; import { getOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts index 5a1c9f3c19a..85fe0bace2d 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts @@ -1,15 +1,15 @@ /** @module ember */ -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments, Option } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { createComputeRef, valueForRef } from '@glimmer/reference'; -import type { CurriedValue } from '@glimmer/runtime'; -import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime'; +import { type CapturedArguments, type Option, CurriedType } from '@glimmer/interfaces'; + +import { type Reference, createComputeRef, valueForRef } from '@glimmer/reference'; + +import { type CurriedValue, createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime'; + import { MountDefinition } from '../component-managers/mount'; import { internalHelper } from '../helpers/internal-helper'; diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts index 682fac47a01..392bc207155 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts @@ -1,23 +1,27 @@ -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments, DynamicScope } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; +import { type CapturedArguments, type DynamicScope, CurriedType } from '@glimmer/interfaces'; + import { + type Reference, childRefFromParts, createComputeRef, createDebugAliasRef, valueForRef, } from '@glimmer/reference'; -import type { CurriedValue } from '@glimmer/runtime'; -import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime'; + +import { type CurriedValue, createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime'; + import { dict } from '@glimmer/util'; -import type { OutletDefinitionState } from '../component-managers/outlet'; -import { OutletComponentDefinition } from '../component-managers/outlet'; +import { + type OutletDefinitionState, + OutletComponentDefinition, +} from '../component-managers/outlet'; + import { internalHelper } from '../helpers/internal-helper'; import { isTemplateFactory } from '../template'; -import type { OutletState } from '../utils/outlet'; +import { type OutletState } from '../utils/outlet'; /** The `{{outlet}}` helper lets you specify where a child route will render in diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts index 64b1a2dd301..84f8423e8d4 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts @@ -1,4 +1,4 @@ -import type { Core, Option, PresentArray } from '@glimmer/interfaces'; +import { type Core, type Option, type PresentArray } from '@glimmer/interfaces'; export function hashToArgs(hash: Option): Option { if (hash === null) return null; diff --git a/packages/@ember/-internals/glimmer/lib/template.ts b/packages/@ember/-internals/glimmer/lib/template.ts index 1e2b0fabd8c..04f6a66b16a 100644 --- a/packages/@ember/-internals/glimmer/lib/template.ts +++ b/packages/@ember/-internals/glimmer/lib/template.ts @@ -1,7 +1,7 @@ -import type { - SerializedTemplateWithLazyBlock, - Template, - TemplateFactory, +import { + type SerializedTemplateWithLazyBlock, + type Template, + type TemplateFactory, } from '@glimmer/interfaces'; export type StaticTemplate = SerializedTemplateWithLazyBlock; diff --git a/packages/@ember/-internals/glimmer/lib/template_registry.ts b/packages/@ember/-internals/glimmer/lib/template_registry.ts index 2ccb77d1117..9948147fdc6 100644 --- a/packages/@ember/-internals/glimmer/lib/template_registry.ts +++ b/packages/@ember/-internals/glimmer/lib/template_registry.ts @@ -1,4 +1,4 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; // STATE within a module is frowned upon, this exists // to support Ember.TEMPLATES but shield ember internals from this legacy diff --git a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts index 8c0dc88a802..f737de1d406 100644 --- a/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts +++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts @@ -1,3 +1,3 @@ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; declare const TEMPLATE: TemplateFactory; export default TEMPLATE; diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts index aa04023b570..8ae20c3c279 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts @@ -1,15 +1,16 @@ import { get } from '@ember/-internals/metal'; import { assert } from '@ember/debug'; import { dasherize } from '@ember/-internals/string'; -import type { ElementOperations } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; +import { type ElementOperations } from '@glimmer/interfaces'; import { + type Reference, childRefFor, childRefFromParts, createComputeRef, createPrimitiveRef, valueForRef, } from '@glimmer/reference'; + import type Component from '../component'; function referenceForParts(rootRef: Reference, parts: string[]): Reference { diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts index 5a4fb529a6f..9b81339cb8a 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts @@ -1,10 +1,16 @@ import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views'; import { registerDestructor } from '@glimmer/destroyable'; -import type { CapturedNamedArguments } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { createConstRef } from '@glimmer/reference'; -import type { Revision, Tag } from '@glimmer/validator'; -import { beginUntrackFrame, endUntrackFrame, valueForTag } from '@glimmer/validator'; +import { type CapturedNamedArguments } from '@glimmer/interfaces'; +import { type Reference, createConstRef } from '@glimmer/reference'; + +import { + type Revision, + type Tag, + beginUntrackFrame, + endUntrackFrame, + valueForTag, +} from '@glimmer/validator'; + import type Component from '../component'; type Finalizer = () => void; diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts index 7b5c4657f8b..ff766328d2b 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts @@ -2,11 +2,11 @@ import { objectAt } from '@ember/-internals/metal'; import type EmberArray from '@ember/array'; import { isEmberArray } from '@ember/array/-internals'; import { isObject } from '@ember/-internals/utils'; -import type { Option } from '@glimmer/interfaces'; -import type { IteratorDelegate } from '@glimmer/reference'; +import { type Option } from '@glimmer/interfaces'; +import { type IteratorDelegate } from '@glimmer/reference'; import { consumeTag, isTracking, tagFor } from '@glimmer/validator'; import { EachInWrapper } from '../helpers/each-in'; -import type { NativeArray } from '@ember/array'; +import { type NativeArray } from '@ember/array'; export default function toIterator(iterable: unknown): Option { if (iterable instanceof EachInWrapper) { diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts index 2f2f47e5286..255a4850b36 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts @@ -1,5 +1,5 @@ -import type { InternalOwner } from '@ember/-internals/owner'; -import type { ComponentManager } from '@glimmer/interfaces'; +import { type InternalOwner } from '@ember/-internals/owner'; +import { type ComponentManager } from '@glimmer/interfaces'; import { componentCapabilities as glimmerComponentCapabilities, modifierCapabilities as glimmerModifierCapabilities, diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts index f6f331e3eea..d23ef61134d 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts @@ -1,5 +1,5 @@ -import type { InternalOwner } from '@ember/-internals/owner'; -import type { Template, TemplateFactory } from '@glimmer/interfaces'; +import { type InternalOwner } from '@ember/-internals/owner'; +import { type Template, type TemplateFactory } from '@glimmer/interfaces'; export interface RenderState { /** diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts index 51e79131dc5..beac49a62c3 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts @@ -1,7 +1,7 @@ import { MUTABLE_CELL } from '@ember/-internals/views'; -import type { CapturedNamedArguments } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference'; +import { type CapturedNamedArguments } from '@glimmer/interfaces'; +import { type Reference, isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference'; + import { assert } from '@ember/debug'; import { ARGS } from '../component-managers/curly'; import { ACTIONS } from '../helpers/action'; diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts index 63c35cffb28..19d52079160 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/string.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts @@ -2,7 +2,7 @@ @module @ember/template */ -import type { SafeString as GlimmerSafeString } from '@glimmer/runtime'; +import { type SafeString as GlimmerSafeString } from '@glimmer/runtime'; /** A wrapper around a string that has been marked as safe ("trusted"). **When diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts index c3bfd7be757..be56e4d17b8 100644 --- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts @@ -3,17 +3,17 @@ // We use `getOwner` from our internal home for it rather than the narrower // public API for the same reason. import { type InternalOwner, getOwner } from '@ember/-internals/owner'; -import type { BootOptions } from '@ember/engine/instance'; +import { type BootOptions } from '@ember/engine/instance'; import { assert } from '@ember/debug'; import { schedule } from '@ember/runloop'; -import type { Template, TemplateFactory } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { createComputeRef, updateRef } from '@glimmer/reference'; +import { type Template, type TemplateFactory } from '@glimmer/interfaces'; +import { type Reference, createComputeRef, updateRef } from '@glimmer/reference'; + import { consumeTag, createTag, dirtyTag } from '@glimmer/validator'; -import type { SimpleElement } from '@simple-dom/interface'; -import type { OutletDefinitionState } from '../component-managers/outlet'; -import type { Renderer } from '../renderer'; -import type { OutletState } from '../utils/outlet'; +import { type SimpleElement } from '@simple-dom/interface'; +import { type OutletDefinitionState } from '../component-managers/outlet'; +import { type Renderer } from '../renderer'; +import { type OutletState } from '../utils/outlet'; export interface BootEnvironment { hasDOM: boolean; 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 260a61c4574..0eb1ca4362e 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 @@ -7,20 +7,20 @@ import { import { ENV } from '@ember/-internals/environment'; import { Component, setComponentManager } from '@ember/-internals/glimmer'; -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner } from '@ember/-internals/owner'; import Route from '@ember/routing/route'; import Controller from '@ember/controller'; import { assert, captureRenderTree } from '@ember/debug'; import Engine from '@ember/engine'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; +import { type EngineInstanceOptions } from '@ember/engine/instance'; import type EngineInstance from '@ember/engine/instance'; -import type { CapturedRenderNode } from '@glimmer/interfaces'; +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'; +import { type SimpleElement, type SimpleNode } from '@simple-dom/interface'; +import { type EmberPrecompileOptions, compile } from 'ember-template-compiler'; + import { runTask } from 'internal-test-helpers/lib/run'; interface CapturedBounds { diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js index 5003545500f..a03d2445c40 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js @@ -1,9 +1,7 @@ import { moduleFor, RenderingTestCase, strip, classes, runTask } from 'internal-test-helpers'; import { setModifierManager, modifierCapabilities } from '@glimmer/manager'; import { ENV } from '@ember/-internals/environment'; -import EmberObject from '@ember/object'; - -import { set, setProperties } from '@ember/object'; +import EmberObject, { set, setProperties } from '@ember/object'; import { Component } from '../../utils/helpers'; diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js index 9500a1c2acc..2757e559a84 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js @@ -1,9 +1,8 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers'; -import { set } from '@ember/object'; +import EmberObject, { set } from '@ember/object'; import Mixin from '@ember/object/mixin'; import Controller from '@ember/controller'; -import EmberObject from '@ember/object'; import { Component } from '../../utils/helpers'; diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js index 8a17d5d007b..32657b3a699 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js @@ -1,9 +1,8 @@ -import EmberObject from '@ember/object'; +import EmberObject, { computed, get, set } from '@ember/object'; import { A } from '@ember/array'; import ArrayProxy from '@ember/array/proxy'; import PromiseProxyMixin from '@ember/object/promise-proxy-mixin'; import { tracked, nativeDescDecorator as descriptor } from '@ember/-internals/metal'; -import { computed, get, set } from '@ember/object'; import { Promise } from 'rsvp'; import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers'; import GlimmerishComponent from '../../utils/glimmerish-component'; diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js index de6d3127c14..dc681f8a88c 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js @@ -2,9 +2,8 @@ import { DEBUG } from '@glimmer/env'; import { RenderingTestCase, moduleFor, applyMixins, classes, runTask } from 'internal-test-helpers'; -import { set, computed } from '@ember/object'; +import EmberObject, { set, computed } from '@ember/object'; import { getDebugFunction, setDebugFunction } from '@ember/debug'; -import EmberObject from '@ember/object'; import { readOnly } from '@ember/object/computed'; import ObjectProxy from '@ember/object/proxy'; import { constructStyleDeprecationMessage } from '@ember/-internals/views'; diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js index 4c42d0f6616..9727bd673c4 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js @@ -2,8 +2,7 @@ import { DEBUG } from '@glimmer/env'; import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers'; import { componentCapabilities } from '@glimmer/manager'; -import EmberObject from '@ember/object'; -import { set, setProperties, computed } from '@ember/object'; +import EmberObject, { set, setProperties, computed } from '@ember/object'; import { setComponentManager } from '@ember/-internals/glimmer'; const BasicComponentManager = EmberObject.extend({ diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js index 4a0023f65e7..7a7b4c516b7 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js @@ -1,7 +1,6 @@ import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers'; import { Component } from '@ember/-internals/glimmer'; -import { set } from '@ember/object'; -import { action } from '@ember/object'; +import { set, action } from '@ember/object'; moduleFor( 'Helpers test: default helper manager', diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js index 25d6dd32c20..392a577c329 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js +++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js @@ -1,7 +1,6 @@ import { applyMixins, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers'; -import { get, set } from '@ember/object'; -import EmberObject from '@ember/object'; +import EmberObject, { get, set } from '@ember/object'; import ObjectProxy from '@ember/object/proxy'; import { diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js index 6fe3dfabf37..020545279d9 100644 --- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js +++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js @@ -3,8 +3,7 @@ import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers'; import { htmlSafe } from '@ember/-internals/glimmer'; -import { get, set } from '@ember/object'; -import EmberObject from '@ember/object'; +import EmberObject, { get, set } from '@ember/object'; import ObjectProxy from '@ember/object/proxy'; import { A as emberA, removeAt } from '@ember/array'; import ArrayProxy from '@ember/array/proxy'; diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts index 7d429b5f13e..110746ed5eb 100644 --- a/packages/@ember/-internals/meta/lib/meta.ts +++ b/packages/@ember/-internals/meta/lib/meta.ts @@ -1,9 +1,9 @@ -import type { ComputedProperty } from '@ember/-internals/metal'; +import { type ComputedProperty } from '@ember/-internals/metal'; import { symbol, toString } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { isDestroyed } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; -import type { Revision, UpdatableTag } from '@glimmer/validator'; +import { type Revision, type UpdatableTag } from '@glimmer/validator'; type ObjMap = { [key: string]: T }; diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts index af955f3cb12..a2e96f609f1 100644 --- a/packages/@ember/-internals/metal/lib/alias.ts +++ b/packages/@ember/-internals/metal/lib/alias.ts @@ -1,8 +1,8 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { type Meta, metaFor } from '@ember/-internals/meta'; + import { assert, inspect } from '@ember/debug'; -import type { UpdatableTag } from '@glimmer/validator'; import { + type UpdatableTag, consumeTag, tagFor, tagMetaFor, @@ -11,14 +11,16 @@ import { validateTag, valueForTag, } from '@glimmer/validator'; + import { CHAIN_PASS_THROUGH, finishLazyChains, getChainTagsForKey } from './chain-tags'; -import type { ExtendedMethodDecorator } from './decorator'; import { + type ExtendedMethodDecorator, ComputedDescriptor, descriptorForDecorator, isElementDescriptor, makeComputedDecorator, } from './decorator'; + import { defineProperty } from './properties'; import { get } from './property_get'; import { set } from './property_set'; diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts index 14ae5742766..80487e01d2e 100644 --- a/packages/@ember/-internals/metal/lib/chain-tags.ts +++ b/packages/@ember/-internals/metal/lib/chain-tags.ts @@ -1,16 +1,18 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { type Meta, metaFor, peekMeta } from '@ember/-internals/meta'; + import { isObject } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { _WeakSet } from '@glimmer/util'; -import type { Tag, TagMeta } from '@glimmer/validator'; import { + type Tag, + type TagMeta, combine, createUpdatableTag, tagMetaFor, updateTag, validateTag, } from '@glimmer/validator'; + import { objectAt } from './array'; import { tagForProperty } from './tags'; diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts index 2aa2ee2fcd9..dc22a7f05d0 100644 --- a/packages/@ember/-internals/metal/lib/computed.ts +++ b/packages/@ember/-internals/metal/lib/computed.ts @@ -1,11 +1,11 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { type Meta, metaFor } from '@ember/-internals/meta'; + import { toString } from '@ember/-internals/utils'; import { assert, inspect } from '@ember/debug'; import { isDestroyed } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; -import type { UpdatableTag } from '@glimmer/validator'; import { + type UpdatableTag, ALLOW_CYCLES, consumeTag, tagFor, @@ -16,13 +16,12 @@ import { validateTag, valueForTag, } from '@glimmer/validator'; + import { finishLazyChains, getChainTagsForKeys } from './chain-tags'; -import type { - ExtendedMethodDecorator, - DecoratorPropertyDescriptor, - ElementDescriptor, -} from './decorator'; import { + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, + type ElementDescriptor, ComputedDescriptor, descriptorForDecorator, descriptorForProperty, @@ -30,10 +29,11 @@ import { isElementDescriptor, makeComputedDecorator, } from './decorator'; + import expandProperties from './expand_properties'; import { addObserver, setObserverSuspended } from './observer'; -import type { PropertyDidChange } from './property_events'; import { + type PropertyDidChange, beginPropertyChanges, endPropertyChanges, hasPropertyDidChange, diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts index 71bc8ad6494..4a18ee5cb8a 100644 --- a/packages/@ember/-internals/metal/lib/decorator.ts +++ b/packages/@ember/-internals/metal/lib/decorator.ts @@ -1,5 +1,5 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { type Meta, metaFor, peekMeta } from '@ember/-internals/meta'; + import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { _WeakSet as WeakSet } from '@glimmer/util'; diff --git a/packages/@ember/-internals/metal/lib/deprecate_property.ts b/packages/@ember/-internals/metal/lib/deprecate_property.ts index 04f8313dd7d..d899ea3ed98 100644 --- a/packages/@ember/-internals/metal/lib/deprecate_property.ts +++ b/packages/@ember/-internals/metal/lib/deprecate_property.ts @@ -2,8 +2,7 @@ @module ember */ -import { deprecate } from '@ember/debug'; -import type { DeprecationOptions } from '@ember/debug'; +import { type DeprecationOptions, deprecate } from '@ember/debug'; import { get } from './property_get'; import { set } from './property_set'; diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts index ab77fb52c86..0a7f37d2c5f 100644 --- a/packages/@ember/-internals/metal/lib/events.ts +++ b/packages/@ember/-internals/metal/lib/events.ts @@ -1,10 +1,10 @@ /** @module @ember/object */ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { type Meta, metaFor, peekMeta } from '@ember/-internals/meta'; + import { setListeners } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import { assert } from '@ember/debug'; /* diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts index 1228bf97454..463b143a085 100644 --- a/packages/@ember/-internals/metal/lib/injected_property.ts +++ b/packages/@ember/-internals/metal/lib/injected_property.ts @@ -2,8 +2,12 @@ import { getOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { computed } from './computed'; -import type { DecoratorPropertyDescriptor, ElementDescriptor } from './decorator'; -import { isElementDescriptor } from './decorator'; +import { + type DecoratorPropertyDescriptor, + type ElementDescriptor, + isElementDescriptor, +} from './decorator'; + import { defineProperty } from './properties'; export let DEBUG_INJECTION_FUNCTIONS: WeakMap; diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts index 4cae45d4b62..9105736a1d5 100644 --- a/packages/@ember/-internals/metal/lib/observer.ts +++ b/packages/@ember/-internals/metal/lib/observer.ts @@ -2,8 +2,8 @@ import { ENV } from '@ember/-internals/environment'; import { peekMeta } from '@ember/-internals/meta'; import { schedule } from '@ember/runloop'; import { registerDestructor } from '@glimmer/destroyable'; -import type { Tag } from '@glimmer/validator'; -import { CURRENT_TAG, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator'; +import { type Tag, CURRENT_TAG, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator'; + import { getChainTagsForKey } from './chain-tags'; import changeEvent from './change_event'; import { addListener, removeListener, sendEvent } from './events'; diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts index 68ec802b1ef..0612340f1cd 100644 --- a/packages/@ember/-internals/metal/lib/properties.ts +++ b/packages/@ember/-internals/metal/lib/properties.ts @@ -2,12 +2,16 @@ @module @ember/object */ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { type Meta, metaFor } from '@ember/-internals/meta'; + import { setWithMandatorySetter } from '@ember/-internals/utils'; import { DEBUG } from '@glimmer/env'; -import type { ExtendedMethodDecorator } from './decorator'; -import { descriptorForProperty, isClassicDecorator } from './decorator'; +import { + type ExtendedMethodDecorator, + descriptorForProperty, + isClassicDecorator, +} from './decorator'; + import { revalidateObservers } from './observer'; /** diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts index 12758ed9858..7ee61b0854d 100644 --- a/packages/@ember/-internals/metal/lib/property_events.ts +++ b/packages/@ember/-internals/metal/lib/property_events.ts @@ -1,5 +1,5 @@ -import type { Meta } from '@ember/-internals/meta'; -import { peekMeta } from '@ember/-internals/meta'; +import { type Meta, peekMeta } from '@ember/-internals/meta'; + import { assert } from '@ember/debug'; import { flushSyncObservers, diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts index 47f028c63ce..32d032dca58 100644 --- a/packages/@ember/-internals/metal/lib/tags.ts +++ b/packages/@ember/-internals/metal/lib/tags.ts @@ -3,8 +3,7 @@ import { assert } from '@ember/debug'; import { isDestroyed } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; import { getCustomTagFor } from '@glimmer/manager'; -import type { Tag, TagMeta } from '@glimmer/validator'; -import { CONSTANT_TAG, dirtyTagFor, tagFor } from '@glimmer/validator'; +import { type Tag, type TagMeta, CONSTANT_TAG, dirtyTagFor, tagFor } from '@glimmer/validator'; ///////// diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts index f5f696997f5..3adf624e2f8 100644 --- a/packages/@ember/-internals/metal/lib/tracked.ts +++ b/packages/@ember/-internals/metal/lib/tracked.ts @@ -3,10 +3,16 @@ import { isEmberArray } from '@ember/array/-internals'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator'; -import type { ElementDescriptor } from '..'; +import { type ElementDescriptor } from '..'; import { CHAIN_PASS_THROUGH } from './chain-tags'; -import type { ExtendedMethodDecorator, DecoratorPropertyDescriptor } from './decorator'; -import { COMPUTED_SETTERS, isElementDescriptor, setClassicDecorator } from './decorator'; +import { + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, + COMPUTED_SETTERS, + isElementDescriptor, + setClassicDecorator, +} from './decorator'; + import { SELF_TAG } from './tags'; /** diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts index be3e6a31267..21f480bb3ca 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts @@ -16,8 +16,14 @@ import { setProxy, setupMandatorySetter, isObject, isProxy } from '@ember/-inter import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { setCustomTagFor } from '@glimmer/manager'; -import type { UpdatableTag, Tag } from '@glimmer/validator'; -import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator'; +import { + type UpdatableTag, + type Tag, + combine, + updateTag, + tagFor, + tagMetaFor, +} from '@glimmer/validator'; export function contentFor(proxy: ProxyMixin): T | null { let content = get(proxy, 'content'); diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts index 9b9a870a7c9..256452c6abd 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts @@ -4,7 +4,7 @@ import { schedule, join } from '@ember/runloop'; */ import type Container from '@ember/-internals/container/lib/container'; import Mixin from '@ember/object/mixin'; -import type { ContainerProxy } from '@ember/-internals/owner'; +import { type ContainerProxy } from '@ember/-internals/owner'; // This is defined as a separate interface so that it can be used in the definition of // `Owner` without also including the `__container__` property. diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts index 4df5bf06ddd..55867800683 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts @@ -2,9 +2,9 @@ @module ember */ -import type { Registry } from '@ember/-internals/container'; -import type { RegistryProxy } from '@ember/-internals/owner'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type Registry } from '@ember/-internals/container'; +import { type RegistryProxy } from '@ember/-internals/owner'; +import { type AnyFn } from '@ember/-internals/utility-types'; import { assert } from '@ember/debug'; import Mixin from '@ember/object/mixin'; diff --git a/packages/@ember/-internals/runtime/tests/inject_test.js b/packages/@ember/-internals/runtime/tests/inject_test.js index db53ca6e2ca..837bc577da1 100644 --- a/packages/@ember/-internals/runtime/tests/inject_test.js +++ b/packages/@ember/-internals/runtime/tests/inject_test.js @@ -1,8 +1,7 @@ import { inject } from '@ember/-internals/metal'; import { DEBUG } from '@glimmer/env'; import EmberObject from '@ember/object'; -import { buildOwner } from 'internal-test-helpers'; -import { runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers'; +import { buildOwner, runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers'; moduleFor( 'inject', diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js index 99822d559fd..6a30e1c921d 100644 --- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js +++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js @@ -2,8 +2,7 @@ import { run } from '@ember/runloop'; import { get } from '@ember/object'; import ObjectProxy from '@ember/object/proxy'; import PromiseProxyMixin from '@ember/object/promise-proxy-mixin'; -import EmberRSVP from '../../lib/ext/rsvp'; -import { onerrorDefault } from '../../lib/ext/rsvp'; +import EmberRSVP, { onerrorDefault } from '../../lib/ext/rsvp'; import * as RSVP from 'rsvp'; import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js index 103dc16cc2e..c159222f5e2 100644 --- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js +++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js @@ -1,9 +1,8 @@ import ArrayProxy from '@ember/array/proxy'; -import EmberObject, { observer } from '@ember/object'; +import EmberObject, { observer, set, get } from '@ember/object'; import { oneWay as reads, not } from '@ember/object/computed'; import { A as a } from '@ember/array'; import { moduleFor, AbstractTestCase, runTask, runLoopSettled } from 'internal-test-helpers'; -import { set, get } from '@ember/object'; import { createCache, getValue } from '@glimmer/validator'; moduleFor( diff --git a/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js b/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js index e9b72d65d1a..075fd25fc40 100644 --- a/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js +++ b/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js @@ -1,5 +1,4 @@ -import EmberArray from '@ember/array'; -import { A } from '@ember/array'; +import EmberArray, { A } from '@ember/array'; import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; moduleFor( diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts index e30fe4c9c21..930ba6e1560 100644 --- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts +++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { _WeakSet as WeakSet } from '@glimmer/util'; -import type { Tag } from '@glimmer/validator'; +import { type Tag } from '@glimmer/validator'; import lookupDescriptor from './lookup-descriptor'; export let setupMandatorySetter: diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts index 09fd65cda70..29f2145e4dc 100644 --- a/packages/@ember/-internals/views/lib/component_lookup.ts +++ b/packages/@ember/-internals/views/lib/component_lookup.ts @@ -1,4 +1,4 @@ -import type { InternalOwner, RegisterOptions } from '@ember/-internals/owner'; +import { type InternalOwner, type RegisterOptions } from '@ember/-internals/owner'; import EmberObject from '@ember/object'; export default EmberObject.extend({ diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts index 0cde2a25738..53202898b35 100644 --- a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts +++ b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts @@ -1,7 +1,7 @@ /** @module ember */ -import type { View } from '@ember/-internals/glimmer/lib/renderer'; +import { type View } from '@ember/-internals/glimmer/lib/renderer'; import { nativeDescDecorator } from '@ember/-internals/metal'; import Mixin from '@ember/object/mixin'; import { getChildViews, addChildView } from '../system/utils'; diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.ts b/packages/@ember/-internals/views/lib/mixins/view_support.ts index 1e84ef34066..5ada6663bf9 100644 --- a/packages/@ember/-internals/views/lib/mixins/view_support.ts +++ b/packages/@ember/-internals/views/lib/mixins/view_support.ts @@ -5,8 +5,8 @@ import { assert } from '@ember/debug'; import { hasDOM } from '@ember/-internals/browser-environment'; import { matches } from '../system/utils'; import type Component from '@ember/component'; -import type { View } from '@ember/-internals/glimmer/lib/renderer'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type View } from '@ember/-internals/glimmer/lib/renderer'; +import { type SimpleElement } from '@simple-dom/interface'; function K(this: unknown) { return this; diff --git a/packages/@ember/-internals/views/lib/system/action_manager.ts b/packages/@ember/-internals/views/lib/system/action_manager.ts index 430701cbcb0..3eb3e030516 100644 --- a/packages/@ember/-internals/views/lib/system/action_manager.ts +++ b/packages/@ember/-internals/views/lib/system/action_manager.ts @@ -1,4 +1,4 @@ -import type { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action'; +import { type ActionState } from '@ember/-internals/glimmer/lib/modifiers/action'; /** @module ember diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts index c42446b2068..03aae743f41 100644 --- a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts +++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts @@ -4,10 +4,10 @@ import { get, set } from '@ember/-internals/metal'; import EmberObject from '@ember/object'; import { getElementView } from '@ember/-internals/views'; import ActionManager from './action_manager'; -import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; +import { type BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; import type Component from '@ember/component'; -import type { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type ActionState } from '@ember/-internals/glimmer/lib/modifiers/action'; +import { type SimpleElement } from '@simple-dom/interface'; /** @module ember diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts index e6c3378b9ef..f0fed792917 100644 --- a/packages/@ember/-internals/views/lib/system/utils.ts +++ b/packages/@ember/-internals/views/lib/system/utils.ts @@ -1,10 +1,10 @@ -import type { View } from '@ember/-internals/glimmer/lib/renderer'; -import type { InternalOwner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { type View } from '@ember/-internals/glimmer/lib/renderer'; +import { type InternalOwner, getOwner } from '@ember/-internals/owner'; + import { guidFor } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; -import type { Dict, Option } from '@glimmer/interfaces'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type Dict, type Option } from '@glimmer/interfaces'; +import { type SimpleElement } from '@simple-dom/interface'; /** @module ember diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts index 1eefce9682d..7367951a87f 100644 --- a/packages/@ember/-internals/views/lib/views/core_view.ts +++ b/packages/@ember/-internals/views/lib/views/core_view.ts @@ -1,10 +1,10 @@ -import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer'; +import { type Renderer, type 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'; import { FrameworkObject } from '@ember/object/-internals'; -import type { ViewState } from './states'; -import states from './states'; + +import states, { type ViewState } from './states'; /** `Ember.CoreView` is an abstract class that exists to give view-like behavior diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts index 3594bc551e9..a49bcf020aa 100644 --- a/packages/@ember/application/index.ts +++ b/packages/@ember/application/index.ts @@ -22,13 +22,12 @@ import NoneLocation from '@ember/routing/none-location'; import { BucketCache } from '@ember/routing/-internals'; import ApplicationInstance from '@ember/application/instance'; 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 { type BootOptions, type EngineInstanceOptions } from '@ember/engine/instance'; +import { type Container, type Registry, P } from '@ember/-internals/container'; + import { setupApplicationRegistry } from '@ember/-internals/glimmer'; import RouterService from '@ember/routing/router-service'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; -import type { SimpleDocument, SimpleElement } from '@simple-dom/interface'; +import { type SimpleDocument, type SimpleElement } from '@simple-dom/interface'; /** * @deprecated Use `import { getOwner } from '@ember/owner';` instead. diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts index ecf6924be3c..db79a9c3eff 100644 --- a/packages/@ember/application/instance.ts +++ b/packages/@ember/application/instance.ts @@ -4,17 +4,17 @@ import { get, set } from '@ember/object'; import * as environment from '@ember/-internals/browser-environment'; -import EngineInstance from '@ember/engine/instance'; -import type { BootOptions } from '@ember/engine/instance'; +import EngineInstance, { type BootOptions } from '@ember/engine/instance'; + import type Application from '@ember/application'; -import { renderSettled } from '@ember/-internals/glimmer'; -import type { BootEnvironment } from '@ember/-internals/glimmer'; + +import { type BootEnvironment, renderSettled } from '@ember/-internals/glimmer'; import { assert } from '@ember/debug'; import Router from '@ember/routing/router'; -import type { ViewMixin } from '@ember/-internals/views'; -import { EventDispatcher } from '@ember/-internals/views'; -import type { Registry } from '@ember/-internals/container'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type ViewMixin, EventDispatcher } from '@ember/-internals/views'; + +import { type Registry } from '@ember/-internals/container'; +import { type SimpleElement } from '@simple-dom/interface'; /** The `ApplicationInstance` encapsulates all of the stateful aspects of a diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js index d32de48a385..a2e2797bdf7 100644 --- a/packages/@ember/application/tests/application_instance_test.js +++ b/packages/@ember/application/tests/application_instance_test.js @@ -3,13 +3,13 @@ import Application from '@ember/application'; import ApplicationInstance from '@ember/application/instance'; import { run } from '@ember/runloop'; import { privatize as P } from '@ember/-internals/container'; -import { factory } from 'internal-test-helpers'; -import EmberObject from '@ember/object'; import { + factory, moduleFor, ModuleBasedTestResolver, AbstractTestCase as TestCase, } from 'internal-test-helpers'; +import EmberObject from '@ember/object'; import { getDebugFunction, setDebugFunction } from '@ember/debug'; const originalDebug = getDebugFunction('debug'); diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js index f3281cbaefd..b47b82a9178 100644 --- a/packages/@ember/application/tests/application_test.js +++ b/packages/@ember/application/tests/application_test.js @@ -6,7 +6,7 @@ import { getDebugFunction, setDebugFunction } from '@ember/debug'; import EmberRoute from '@ember/routing/route'; import Router from '@ember/routing/router'; import NoneLocation from '@ember/routing/none-location'; -import { _loaded } from '@ember/application'; +import Application, { _loaded } from '@ember/application'; import Controller from '@ember/controller'; import EmberObject from '@ember/object'; import { @@ -18,7 +18,6 @@ import { runTask, } from 'internal-test-helpers'; import { run } from '@ember/runloop'; -import Application from '..'; moduleFor( 'Application, autobooting multiple apps', diff --git a/packages/@ember/array/-internals.ts b/packages/@ember/array/-internals.ts index 3c3d2bc2deb..842540d7491 100644 --- a/packages/@ember/array/-internals.ts +++ b/packages/@ember/array/-internals.ts @@ -1,4 +1,4 @@ -import type { EmberArrayLike } from '@ember/array'; +import { type EmberArrayLike } from '@ember/array'; import { _WeakSet } from '@glimmer/util'; const EMBER_ARRAYS = new _WeakSet(); diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts index 53495e9d11a..a11fde9fb72 100644 --- a/packages/@ember/array/index.ts +++ b/packages/@ember/array/index.ts @@ -2,15 +2,7 @@ @module @ember/array */ import { DEBUG } from '@glimmer/env'; -import { PROXY_CONTENT } from '@ember/-internals/metal'; -import { - objectAt, - replaceInNativeArray, - replace, - computed, - beginPropertyChanges, - endPropertyChanges, -} from '@ember/-internals/metal'; + import { get, set } from '@ember/object'; import Mixin from '@ember/object/mixin'; import { assert } from '@ember/debug'; @@ -19,8 +11,21 @@ import MutableEnumerable from '@ember/enumerable/mutable'; import { compare, typeOf } from '@ember/utils'; import { ENV } from '@ember/-internals/environment'; import Observable from '@ember/object/observable'; -import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-internals/utility-types'; -import type { ComputedPropertyCallback } from '@ember/-internals/metal'; +import { + type MethodNamesOf, + type MethodParams, + type MethodReturns, +} from '@ember/-internals/utility-types'; +import { + type ComputedPropertyCallback, + PROXY_CONTENT, + objectAt, + replaceInNativeArray, + replace, + computed, + beginPropertyChanges, + endPropertyChanges, +} from '@ember/-internals/metal'; import { isEmberArray, setEmberArray } from '@ember/array/-internals'; export { default as makeArray } from './lib/make-array'; diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts index 599cb6bab69..c94c9e80ac7 100644 --- a/packages/@ember/array/proxy.ts +++ b/packages/@ember/array/proxy.ts @@ -2,7 +2,9 @@ @module @ember/array/proxy */ +import EmberObject, { get } from '@ember/object'; import { + type PropertyDidChange, objectAt, alias, PROPERTY_DID_CHANGE, @@ -13,10 +15,7 @@ import { arrayContentWillChange, tagForProperty, } from '@ember/-internals/metal'; -import { get } from '@ember/object'; -import type { PropertyDidChange } from '@ember/-internals/metal'; import { isObject } from '@ember/-internals/utils'; -import EmberObject from '@ember/object'; import EmberArray from '@ember/array'; import MutableArray from '@ember/array/mutable'; import { assert } from '@ember/debug'; diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts index b20a1134733..fce418d5c9f 100644 --- a/packages/@ember/controller/index.ts +++ b/packages/@ember/controller/index.ts @@ -1,16 +1,24 @@ import { getOwner } from '@ember/-internals/owner'; // This is imported from -internals to avoid circularity import { computed, get } from '@ember/object'; import { FrameworkObject } from '@ember/object/-internals'; -import { inject as metalInject } from '@ember/-internals/metal'; -import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal'; + +import { + type DecoratorPropertyDescriptor, + type ElementDescriptor, + metalInject, +} from '@ember/-internals/metal'; import Mixin from '@ember/object/mixin'; -import type { RouteArgs } from '@ember/routing/-internals'; -import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/routing/-internals'; +import { + type RouteArgs, + deprecateTransitionMethods, + prefixRouteNameArg, +} from '@ember/routing/-internals'; + import { ActionHandler } from '@ember/-internals/runtime'; import { symbol } from '@ember/-internals/utils'; import type Route from '@ember/routing/route'; import type Router from '@ember/routing/router'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string'; export type ControllerQueryParam = string | Record; diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js index 4ad4dffb0ce..2ee6939f229 100644 --- a/packages/@ember/controller/tests/controller_test.js +++ b/packages/@ember/controller/tests/controller_test.js @@ -1,11 +1,16 @@ import Controller, { inject as injectController } from '@ember/controller'; import Service, { service } from '@ember/service'; -import EmberObject, { get } from '@ember/object'; +import EmberObject, { get, action } from '@ember/object'; import Mixin from '@ember/object/mixin'; import { setOwner } from '@ember/-internals/owner'; -import { runDestroy, buildOwner } from 'internal-test-helpers'; -import { moduleFor, ApplicationTestCase, AbstractTestCase, runTask } from 'internal-test-helpers'; -import { action } from '@ember/object'; +import { + runDestroy, + buildOwner, + moduleFor, + ApplicationTestCase, + AbstractTestCase, + runTask, +} from 'internal-test-helpers'; moduleFor( 'Controller model', diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts index e62fcb0ed7b..e514e9b3b81 100644 --- a/packages/@ember/debug/container-debug-adapter.ts +++ b/packages/@ember/debug/container-debug-adapter.ts @@ -3,7 +3,7 @@ import EmberObject from '@ember/object'; import { typeOf } from '@ember/utils'; import type Owner from '@ember/owner'; import { getOwner } from '@ember/-internals/owner'; -import type { Resolver } from '@ember/owner'; +import { type Resolver } from '@ember/owner'; import Namespace from '@ember/application/namespace'; /** diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts index c8d4af0a1f9..a3343003b5d 100644 --- a/packages/@ember/debug/data-adapter.ts +++ b/packages/@ember/debug/data-adapter.ts @@ -1,14 +1,13 @@ import type Owner from '@ember/owner'; import { getOwner } from '@ember/-internals/owner'; import { _backburner, next } from '@ember/runloop'; -import { get } from '@ember/object'; +import EmberObject, { get } from '@ember/object'; import { dasherize } from '@ember/-internals/string'; import Namespace from '@ember/application/namespace'; -import type { NativeArray } from '@ember/array'; -import EmberObject from '@ember/object'; -import { A as emberA } from '@ember/array'; -import type { Cache } from '@glimmer/validator'; -import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator'; +import { type NativeArray, emberA } from '@ember/array'; + +import { type Cache, consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator'; + import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter'; import { assert } from '.'; diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts index 81e23ab2276..ee6bcaa569d 100644 --- a/packages/@ember/debug/index.ts +++ b/packages/@ember/debug/index.ts @@ -1,11 +1,11 @@ import { isChrome, isFirefox } from '@ember/-internals/browser-environment'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import { DEBUG } from '@glimmer/env'; -import type { DeprecateFunc, DeprecationOptions } from './lib/deprecate'; -import _deprecate from './lib/deprecate'; + +import _deprecate, { type DeprecateFunc, type DeprecationOptions } from './lib/deprecate'; import { isTesting } from './lib/testing'; -import type { WarnFunc } from './lib/warn'; -import _warn from './lib/warn'; + +import _warn, { type WarnFunc } from './lib/warn'; export { registerHandler as registerWarnHandler } from './lib/warn'; export { registerHandler as registerDeprecationHandler, DeprecationOptions } from './lib/deprecate'; diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts index af2d3831b72..b963aab7ea8 100644 --- a/packages/@ember/debug/lib/capture-render-tree.ts +++ b/packages/@ember/debug/lib/capture-render-tree.ts @@ -1,6 +1,6 @@ -import type { Renderer } from '@ember/-internals/glimmer'; +import { type Renderer } from '@ember/-internals/glimmer'; import type Owner from '@ember/owner'; -import type { CapturedRenderNode } from '@glimmer/interfaces'; +import { type CapturedRenderNode } from '@glimmer/interfaces'; import { expect } from '@glimmer/util'; /** diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts index a1715c71bb5..5e7dd5dab1d 100644 --- a/packages/@ember/debug/lib/deprecate.ts +++ b/packages/@ember/debug/lib/deprecate.ts @@ -2,8 +2,7 @@ import { ENV } from '@ember/-internals/environment'; import { DEBUG } from '@glimmer/env'; import { assert } from '../index'; -import type { HandlerCallback } from './handlers'; -import { invoke, registerHandler as genericRegisterHandler } from './handlers'; +import { type HandlerCallback, invoke, genericRegisterHandler } from './handlers'; // This is a "global", but instead of declaring it as `declare global`, which // will expose it to all other modules, declare it *locally* (and don't export diff --git a/packages/@ember/debug/lib/warn.ts b/packages/@ember/debug/lib/warn.ts index 6c1711ea765..266a5991240 100644 --- a/packages/@ember/debug/lib/warn.ts +++ b/packages/@ember/debug/lib/warn.ts @@ -1,8 +1,7 @@ import { DEBUG } from '@glimmer/env'; import { assert } from '../index'; -import type { HandlerCallback } from './handlers'; -import { invoke, registerHandler as genericRegisterHandler } from './handlers'; +import { type HandlerCallback, invoke, genericRegisterHandler } from './handlers'; export interface WarnOptions { id: string; diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts index 27bfd5ba94b..ab4bc11e405 100644 --- a/packages/@ember/engine/index.ts +++ b/packages/@ember/engine/index.ts @@ -3,14 +3,14 @@ export { getEngineParent, setEngineParent } from './lib/engine-parent'; import { canInvoke } from '@ember/-internals/utils'; import Controller from '@ember/controller'; import Namespace from '@ember/application/namespace'; -import { Registry } from '@ember/-internals/container'; -import type { ResolverClass } from '@ember/-internals/container'; + +import { type ResolverClass, Registry } from '@ember/-internals/container'; import DAG from 'dag-map'; import { assert } from '@ember/debug'; import ContainerDebugAdapter from '@ember/debug/container-debug-adapter'; import { get, set } from '@ember/object'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; -import EngineInstance from '@ember/engine/instance'; + +import EngineInstance, { type EngineInstanceOptions } from '@ember/engine/instance'; import { RoutingService } from '@ember/routing/-internals'; import { ComponentLookup } from '@ember/-internals/views'; import { setupEngineRegistry } from '@ember/-internals/glimmer'; diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts index 533308d3534..b3768b20188 100644 --- a/packages/@ember/engine/instance.ts +++ b/packages/@ember/engine/instance.ts @@ -3,19 +3,18 @@ */ import EmberObject from '@ember/object'; -import { RSVP } from '@ember/-internals/runtime'; +import { RSVP, ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime'; import { assert } from '@ember/debug'; import { Registry, privatize as P } from '@ember/-internals/container'; import { guidFor } from '@ember/-internals/utils'; import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent'; -import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime'; -import type { InternalOwner } from '@ember/-internals/owner'; +import { type InternalOwner, type FullName, isFactory } from '@ember/-internals/owner'; import type Owner from '@ember/-internals/owner'; -import { type FullName, isFactory } from '@ember/-internals/owner'; + import Engine from '@ember/engine'; import type Application from '@ember/application'; -import type { BootEnvironment } from '@ember/-internals/glimmer'; -import type { SimpleElement } from '@simple-dom/interface'; +import { type BootEnvironment } from '@ember/-internals/glimmer'; +import { type SimpleElement } from '@simple-dom/interface'; const CEngine = Engine; diff --git a/packages/@ember/engine/tests/engine_instance_test.js b/packages/@ember/engine/tests/engine_instance_test.js index 91e52ba4082..902a94f3a8b 100644 --- a/packages/@ember/engine/tests/engine_instance_test.js +++ b/packages/@ember/engine/tests/engine_instance_test.js @@ -1,8 +1,8 @@ import Engine, { getEngineParent, setEngineParent } from '@ember/engine'; import EngineInstance from '@ember/engine/instance'; import { run } from '@ember/runloop'; -import { factory } from 'internal-test-helpers'; import { + factory, moduleFor, ModuleBasedTestResolver, AbstractTestCase as TestCase, diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts index 39265d27b66..86a5fa288f3 100644 --- a/packages/@ember/object/compat.ts +++ b/packages/@ember/object/compat.ts @@ -1,14 +1,15 @@ -import type { Meta } from '@ember/-internals/meta'; -import type { ExtendedMethodDecorator, DecoratorPropertyDescriptor } from '@ember/-internals/metal'; +import { type Meta } from '@ember/-internals/meta'; import { + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, + type ElementDescriptor, descriptorForProperty, isElementDescriptor, setClassicDecorator, } from '@ember/-internals/metal'; -import type { ElementDescriptor } from '@ember/-internals/metal'; + import { assert } from '@ember/debug'; -import type { UpdatableTag } from '@glimmer/validator'; -import { consumeTag, tagFor, track, updateTag } from '@glimmer/validator'; +import { type UpdatableTag, consumeTag, tagFor, track, updateTag } from '@glimmer/validator'; let wrapGetterSetter = function (target: object, key: string, desc: PropertyDescriptor) { let { get: originalGet } = desc; diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts index 797b1b8dad2..6a848fe1d63 100644 --- a/packages/@ember/object/core.ts +++ b/packages/@ember/object/core.ts @@ -6,8 +6,9 @@ import { getFactoryFor, setFactoryFor } from '@ember/-internals/container'; import { type default as Owner, getOwner } from '@ember/-internals/owner'; import { guidFor, isInternalSymbol } from '@ember/-internals/utils'; import { meta } from '@ember/-internals/meta'; -import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal'; import { + type ComputedProperty, + type HasUnknownProperty, PROXY_CONTENT, sendEvent, activateObserver, @@ -17,6 +18,7 @@ import { DEBUG_INJECTION_FUNCTIONS, hasUnknownProperty, } from '@ember/-internals/metal'; + import Mixin, { applyMixin } from '@ember/object/mixin'; import { ActionHandler } from '@ember/-internals/runtime'; import { makeArray } from '@ember/array'; diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts index 230471a71e0..34c78ef61f4 100644 --- a/packages/@ember/object/index.ts +++ b/packages/@ember/object/index.ts @@ -1,14 +1,16 @@ import { assert } from '@ember/debug'; import { ENV } from '@ember/-internals/environment'; -import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal'; import { + type ElementDescriptor, + type ExtendedMethodDecorator, isElementDescriptor, expandProperties, setClassicDecorator, } from '@ember/-internals/metal'; + import { getFactoryFor } from '@ember/-internals/container'; import { setObservers } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import CoreObject from '@ember/object/core'; import Observable from '@ember/object/observable'; diff --git a/packages/@ember/object/lib/computed/computed_macros.ts b/packages/@ember/object/lib/computed/computed_macros.ts index 0c71a2967e0..13396991618 100644 --- a/packages/@ember/object/lib/computed/computed_macros.ts +++ b/packages/@ember/object/lib/computed/computed_macros.ts @@ -1,7 +1,7 @@ import { computed, isElementDescriptor, alias, expandProperties } from '@ember/-internals/metal'; import { get, set } from '@ember/object'; -import type { DeprecationOptions } from '@ember/debug'; -import { assert, deprecate } from '@ember/debug'; +import { type DeprecationOptions, assert, deprecate } from '@ember/debug'; + import { isEmpty, isNone } from '@ember/utils'; /** diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts index 6bb7037e904..1cda2280b54 100644 --- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts +++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts @@ -6,8 +6,7 @@ import { assert } from '@ember/debug'; import { autoComputed, isElementDescriptor } from '@ember/-internals/metal'; import { computed, get } from '@ember/object'; import { compare } from '@ember/utils'; -import EmberArray, { A as emberA, uniqBy as uniqByArray } from '@ember/array'; -import type { NativeArray } from '@ember/array'; +import EmberArray, { A as emberA, uniqBy as uniqByArray, type NativeArray } from '@ember/array'; function isNativeOrEmberArray(obj: unknown): obj is unknown[] | EmberArray { return Array.isArray(obj) || EmberArray.detect(obj); diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts index 180707e29bb..c6a6566fcbd 100644 --- a/packages/@ember/object/mixin.ts +++ b/packages/@ember/object/mixin.ts @@ -2,20 +2,18 @@ @module @ember/object/mixin */ import { INIT_FACTORY } from '@ember/-internals/container'; -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { type Meta, metaFor, peekMeta } from '@ember/-internals/meta'; + import { guidFor, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { _WeakSet } from '@glimmer/util'; -import type { - ComputedDecorator, - ComputedPropertyGetter, - ComputedPropertyObj, - ComputedPropertySetter, - ComputedDescriptor, -} from '@ember/-internals/metal'; import { + type ComputedDecorator, + type ComputedPropertyGetter, + type ComputedPropertyObj, + type ComputedPropertySetter, + type ComputedDescriptor, ComputedProperty, descriptorForDecorator, makeComputedDecorator, @@ -27,6 +25,7 @@ import { defineDecorator, defineValue, } from '@ember/-internals/metal'; + import { addListener, removeListener } from '@ember/object/events'; const a_concat = Array.prototype.concat; diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts index eafe2a9522d..f2b1509a725 100644 --- a/packages/@ember/object/promise-proxy-mixin.ts +++ b/packages/@ember/object/promise-proxy-mixin.ts @@ -1,6 +1,6 @@ import { get, setProperties, computed } from '@ember/object'; import Mixin from '@ember/object/mixin'; -import type { AnyFn, MethodNamesOf } from '@ember/-internals/utility-types'; +import { type AnyFn, type MethodNamesOf } from '@ember/-internals/utility-types'; import type RSVP from 'rsvp'; import type CoreObject from '@ember/object/core'; diff --git a/packages/@ember/object/tests/extend_test.js b/packages/@ember/object/tests/extend_test.js index a99259276a7..16a02c13ea2 100644 --- a/packages/@ember/object/tests/extend_test.js +++ b/packages/@ember/object/tests/extend_test.js @@ -1,5 +1,4 @@ -import { computed, get } from '@ember/object'; -import EmberObject, { observer } from '@ember/object'; +import EmberObject, { computed, get, observer } from '@ember/object'; import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers'; moduleFor( diff --git a/packages/@ember/object/tests/observable_test.js b/packages/@ember/object/tests/observable_test.js index c23f55dd650..fbc35f6abe5 100644 --- a/packages/@ember/object/tests/observable_test.js +++ b/packages/@ember/object/tests/observable_test.js @@ -1,7 +1,6 @@ import { context } from '@ember/-internals/environment'; import { run } from '@ember/runloop'; -import { get, computed } from '@ember/object'; -import EmberObject, { observer } from '@ember/object'; +import EmberObject, { get, computed, observer } from '@ember/object'; import Observable from '@ember/object/observable'; import { A as emberA } from '@ember/array'; import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers'; diff --git a/packages/@ember/object/tests/reopenClass_test.js b/packages/@ember/object/tests/reopenClass_test.js index af8a1e51da2..158c6eed867 100644 --- a/packages/@ember/object/tests/reopenClass_test.js +++ b/packages/@ember/object/tests/reopenClass_test.js @@ -1,5 +1,4 @@ -import { get } from '@ember/object'; -import EmberObject from '@ember/object'; +import EmberObject, { get } from '@ember/object'; import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; moduleFor( diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts index 0deb19bacf9..8630871298a 100644 --- a/packages/@ember/routing/auto-location.ts +++ b/packages/@ember/routing/auto-location.ts @@ -1,9 +1,9 @@ import { history, location, userAgent, window } from '@ember/-internals/browser-environment'; import { getOwner } from '@ember/-internals/owner'; import EmberObject, { set } from '@ember/object'; -import type { AnyFn, MethodNamesOf } from '@ember/-internals/utility-types'; +import { type AnyFn, type MethodNamesOf } from '@ember/-internals/utility-types'; import { assert } from '@ember/debug'; -import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location'; +import { type ILocation as EmberLocation, type UpdateCallback } from '@ember/routing/location'; import { getFullPath, getHash, diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts index b545e203d9d..48b9665c6c0 100644 --- a/packages/@ember/routing/hash-location.ts +++ b/packages/@ember/routing/hash-location.ts @@ -1,6 +1,6 @@ import EmberObject, { set } from '@ember/object'; import { bind } from '@ember/runloop'; -import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location'; +import { type ILocation as EmberLocation, type UpdateCallback } from '@ember/routing/location'; import { getHash } from './lib/location-utils'; /** diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts index 8d459888511..d076f6f711e 100644 --- a/packages/@ember/routing/history-location.ts +++ b/packages/@ember/routing/history-location.ts @@ -1,5 +1,5 @@ import EmberObject, { set } from '@ember/object'; -import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location'; +import { type ILocation as EmberLocation, type UpdateCallback } from '@ember/routing/location'; import { getHash } from './lib/location-utils'; /** diff --git a/packages/@ember/routing/lib/controller_for.ts b/packages/@ember/routing/lib/controller_for.ts index a4c7ada89da..1650b5b268b 100644 --- a/packages/@ember/routing/lib/controller_for.ts +++ b/packages/@ember/routing/lib/controller_for.ts @@ -1,5 +1,5 @@ -import type { Container } from '@ember/-internals/container'; -import type { RegisterOptions } from '@ember/owner'; +import { type Container } from '@ember/-internals/container'; +import { type RegisterOptions } from '@ember/owner'; /** @module ember/routing diff --git a/packages/@ember/routing/lib/dsl.ts b/packages/@ember/routing/lib/dsl.ts index f401e6cf811..4f1c5b12353 100644 --- a/packages/@ember/routing/lib/dsl.ts +++ b/packages/@ember/routing/lib/dsl.ts @@ -1,8 +1,8 @@ -import type { InternalFactory } from '@ember/-internals/owner'; +import { type InternalFactory } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; -import type { Option } from '@glimmer/interfaces'; -import type { MatchCallback } from 'route-recognizer'; -import type { EngineInfo, EngineRouteInfo } from './engines'; +import { type Option } from '@glimmer/interfaces'; +import { type MatchCallback } from 'route-recognizer'; +import { type EngineInfo, type EngineRouteInfo } from './engines'; let uuid = 0; diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts index c42e810d4cf..a5bf573d452 100644 --- a/packages/@ember/routing/lib/generate_controller.ts +++ b/packages/@ember/routing/lib/generate_controller.ts @@ -1,5 +1,5 @@ import { get } from '@ember/-internals/metal'; -import type { InternalFactory, default as Owner } from '@ember/-internals/owner'; +import { type InternalFactory, type default as Owner } from '@ember/-internals/owner'; import Controller from '@ember/controller'; import { assert, info } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; diff --git a/packages/@ember/routing/lib/router_state.ts b/packages/@ember/routing/lib/router_state.ts index 7a5be9eb204..92b0594fe70 100644 --- a/packages/@ember/routing/lib/router_state.ts +++ b/packages/@ember/routing/lib/router_state.ts @@ -1,4 +1,4 @@ -import type { ModelFor, TransitionState } from 'router_js'; +import { type ModelFor, type TransitionState } from 'router_js'; import type Router from 'router_js'; import { shallowEqual } from './utils'; import type Route from '@ember/routing/route'; diff --git a/packages/@ember/routing/lib/routing-service.ts b/packages/@ember/routing/lib/routing-service.ts index 92bb0392cfb..358b1be6b74 100644 --- a/packages/@ember/routing/lib/routing-service.ts +++ b/packages/@ember/routing/lib/routing-service.ts @@ -6,10 +6,10 @@ import { getOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { readOnly } from '@ember/object/computed'; import Service from '@ember/service'; -import type { ModelFor } from 'router_js'; +import { type ModelFor } from 'router_js'; import type Route from '@ember/routing/route'; import EmberRouter from '@ember/routing/router'; -import type { RouterState } from '@ember/routing/-internals'; +import { type RouterState } from '@ember/routing/-internals'; import { ROUTER } from '@ember/routing/router-service'; /** diff --git a/packages/@ember/routing/lib/utils.ts b/packages/@ember/routing/lib/utils.ts index 159d398ba41..f514b46dc70 100644 --- a/packages/@ember/routing/lib/utils.ts +++ b/packages/@ember/routing/lib/utils.ts @@ -1,12 +1,12 @@ import { get } from '@ember/-internals/metal'; import { getOwner } from '@ember/-internals/owner'; -import type { ControllerQueryParam, ControllerQueryParamType } from '@ember/controller'; +import { type ControllerQueryParam, type ControllerQueryParamType } from '@ember/controller'; import { assert, deprecate } from '@ember/debug'; import EngineInstance from '@ember/engine/instance'; -import type { InternalRouteInfo, ModelFor } from 'router_js'; +import { type InternalRouteInfo, type ModelFor, STATE_SYMBOL } from 'router_js'; import type Router from 'router_js'; -import { STATE_SYMBOL } from 'router_js'; -import type { ExtendedInternalRouteInfo } from '@ember/routing/route'; + +import { type ExtendedInternalRouteInfo } from '@ember/routing/route'; import type Route from '@ember/routing/route'; import type EmberRouter from '@ember/routing/router'; diff --git a/packages/@ember/routing/none-location.ts b/packages/@ember/routing/none-location.ts index 23202fd56c1..f3b404c05b6 100644 --- a/packages/@ember/routing/none-location.ts +++ b/packages/@ember/routing/none-location.ts @@ -1,6 +1,6 @@ import EmberObject, { set } from '@ember/object'; import { assert } from '@ember/debug'; -import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location'; +import { type ILocation as EmberLocation, type UpdateCallback } from '@ember/routing/location'; /** @module @ember/routing/none-location diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts index 02c140d2786..1b51be286a9 100644 --- a/packages/@ember/routing/route.ts +++ b/packages/@ember/routing/route.ts @@ -7,35 +7,37 @@ import { } from '@ember/-internals/metal'; import type Owner from '@ember/owner'; import { getOwner } from '@ember/-internals/owner'; -import { BucketCache } from '@ember/routing/-internals'; +import { BucketCache, generateController } from '@ember/routing/-internals'; import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object'; import Evented from '@ember/object/evented'; import { A as emberA } from '@ember/array'; import { ActionHandler } from '@ember/-internals/runtime'; import { isEmpty, typeOf } from '@ember/utils'; import { isProxy, lookupDescriptor } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utility-types'; -import Controller from '@ember/controller'; -import type { ControllerQueryParamType } from '@ember/controller'; +import { type AnyFn } from '@ember/-internals/utility-types'; +import Controller, { type ControllerQueryParamType } from '@ember/controller'; + import { assert, info, isTesting } from '@ember/debug'; import EngineInstance from '@ember/engine/instance'; import { dependentKeyCompat } from '@ember/object/compat'; import { once } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import type { Template, TemplateFactory } from '@glimmer/interfaces'; -import type { - InternalRouteInfo, - ModelFor, - Route as IRoute, - Transition, - TransitionState, +import { type Template, type TemplateFactory } from '@glimmer/interfaces'; +import { + type InternalRouteInfo, + type ModelFor, + type Route as IRoute, + type Transition, + type TransitionState, + PARAMS_SYMBOL, + STATE_SYMBOL, } from 'router_js'; -import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js'; -import type { QueryParam } from '@ember/routing/router'; -import EmberRouter from '@ember/routing/router'; -import { generateController } from '@ember/routing/-internals'; -import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from './lib/utils'; + +import EmberRouter, { type QueryParam } from '@ember/routing/router'; import { + type ExpandedControllerQueryParam, + type NamedRouteArgs, + type RouteArgs, calculateCacheKey, deprecateTransitionMethods, normalizeControllerQueryParams, diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts index 139331df1d0..545d3838d8d 100644 --- a/packages/@ember/routing/router-service.ts +++ b/packages/@ember/routing/router-service.ts @@ -7,12 +7,17 @@ import { assert } from '@ember/debug'; import { readOnly } from '@ember/object/computed'; import Service from '@ember/service'; import { consumeTag, tagFor } from '@glimmer/validator'; -import type { ModelFor, Transition } from 'router_js'; +import { type ModelFor, type Transition } from 'router_js'; import type Route from '@ember/routing/route'; import EmberRouter from '@ember/routing/router'; import { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/-internals'; -import type { RouteArgs, RouteOptions } from './lib/utils'; -import { extractRouteArgs, resemblesURL, shallowEqual } from './lib/utils'; +import { + type RouteArgs, + type RouteOptions, + extractRouteArgs, + resemblesURL, + shallowEqual, +} from './lib/utils'; export const ROUTER = Symbol('ROUTER'); diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts index 1aa886edc9f..f9b190a8116 100644 --- a/packages/@ember/routing/router.ts +++ b/packages/@ember/routing/router.ts @@ -1,53 +1,62 @@ import { privatize as P } from '@ember/-internals/container'; -import type { - BootEnvironment, - OutletState as GlimmerOutletState, - OutletView, +import { + type BootEnvironment, + type OutletState as GlimmerOutletState, + type OutletView, } from '@ember/-internals/glimmer'; -import { computed, get, set } from '@ember/object'; -import type { default as Owner, FactoryManager } from '@ember/owner'; -import { getOwner } from '@ember/owner'; -import { BucketCache, DSL, RouterState } from '@ember/routing/-internals'; -import type { DSLCallback, EngineRouteInfo } from '@ember/routing/-internals'; +import EmberObject, { computed, get, set } from '@ember/object'; +import { type default as Owner, type FactoryManager, getOwner } from '@ember/owner'; + +import { + type DSLCallback, + type EngineRouteInfo, + BucketCache, + DSL, + RouterState, +} from '@ember/routing/-internals'; + import { + type RouteArgs, + type RouteOptions, calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL, } from './lib/utils'; -import type { RouteArgs, RouteOptions } from './lib/utils'; import EmberLocation, { type ILocation as IEmberLocation } from '@ember/routing/location'; import type RouterService from '@ember/routing/router-service'; -import EmberObject from '@ember/object'; import { A as emberA } from '@ember/array'; import { typeOf } from '@ember/utils'; import Evented from '@ember/object/evented'; import { assert, deprecate, info } from '@ember/debug'; import { cancel, once, run, scheduleOnce } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import type { QueryParamMeta, RenderOptions } from '@ember/routing/route'; -import type Route from '@ember/routing/route'; import { + type QueryParamMeta, + type RenderOptions, defaultSerialize, getFullQueryParams, hasDefaultSerialize, ROUTE_CONNECTIONS, } from '@ember/routing/route'; -import type { - InternalRouteInfo, - ModelFor, - RouteInfo, - RouteInfoWithAttributes, - Transition, - TransitionError, - TransitionState, +import type Route from '@ember/routing/route'; + +import Router, { + logAbort, + STATE_SYMBOL, + type InternalRouteInfo, + type ModelFor, + type RouteInfo, + type RouteInfoWithAttributes, + type Transition, + type TransitionError, + type TransitionState, } from 'router_js'; -import Router, { logAbort, STATE_SYMBOL } from 'router_js'; -import type { Timer } from 'backburner'; +import { type Timer } from 'backburner'; import EngineInstance from '@ember/engine/instance'; -import type { QueryParams } from 'route-recognizer'; -import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utility-types'; -import type { Template } from '@glimmer/interfaces'; +import { type QueryParams } from 'route-recognizer'; +import { type AnyFn, type MethodNamesOf, type OmitFirst } from '@ember/-internals/utility-types'; +import { type Template } from '@glimmer/interfaces'; import type ApplicationInstance from '@ember/application/instance'; /** diff --git a/packages/@ember/routing/tests/location/util_test.js b/packages/@ember/routing/tests/location/util_test.js index ba957725058..ad78c8a0909 100644 --- a/packages/@ember/routing/tests/location/util_test.js +++ b/packages/@ember/routing/tests/location/util_test.js @@ -1,5 +1,11 @@ -import { replacePath, getPath, getQuery, getFullPath } from '../../lib/location-utils'; -import { supportsHistory, supportsHashChange } from '../../lib/location-utils'; +import { + replacePath, + getPath, + getQuery, + getFullPath, + supportsHistory, + supportsHashChange, +} from '../../lib/location-utils'; import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; function mockBrowserLocation(overrides, assert) { diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts index 8e572a52ca0..3796af9c3cd 100644 --- a/packages/@ember/runloop/index.ts +++ b/packages/@ember/runloop/index.ts @@ -1,9 +1,9 @@ import { assert } from '@ember/debug'; import { onErrorTarget } from '@ember/-internals/error-handling'; import { flushAsyncObservers } from '@ember/-internals/metal'; -import type { DeferredActionQueues } from 'backburner'; -import Backburner, { Timer } from 'backburner'; -import type { AnyFn } from '@ember/-internals/utility-types'; + +import Backburner, { Timer, type DeferredActionQueues } from 'backburner'; +import { type AnyFn } from '@ember/-internals/utility-types'; export { Timer }; diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts index 199b0765cd6..09b7e2559bd 100644 --- a/packages/@ember/service/index.ts +++ b/packages/@ember/service/index.ts @@ -1,6 +1,9 @@ import { FrameworkObject } from '@ember/object/-internals'; -import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal'; -import { inject as metalInject } from '@ember/-internals/metal'; +import { + type DecoratorPropertyDescriptor, + type ElementDescriptor, + metalInject, +} from '@ember/-internals/metal'; /** @module @ember/service diff --git a/packages/@ember/service/tests/service_test.js b/packages/@ember/service/tests/service_test.js index 0bc2aac7ee4..814bcc38987 100644 --- a/packages/@ember/service/tests/service_test.js +++ b/packages/@ember/service/tests/service_test.js @@ -1,7 +1,6 @@ import Service, { inject, service } from '@ember/service'; import EmberObject from '@ember/object'; -import { buildOwner, runDestroy } from 'internal-test-helpers'; -import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; +import { buildOwner, runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers'; moduleFor( 'inject - decorator', diff --git a/packages/@ember/service/tests/service_ts_test.ts b/packages/@ember/service/tests/service_ts_test.ts index fa36782b953..e2a22c15671 100644 --- a/packages/@ember/service/tests/service_ts_test.ts +++ b/packages/@ember/service/tests/service_ts_test.ts @@ -1,7 +1,6 @@ import Service, { inject, service } from '@ember/service'; import EmberObject from '@ember/object'; -import { buildOwner, runDestroy } from 'internal-test-helpers'; -import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; +import { buildOwner, runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers'; moduleFor( 'inject - decorator (TS)', diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts index ec975da09c9..dcab826a3ac 100644 --- a/packages/@ember/string/index.ts +++ b/packages/@ember/string/index.ts @@ -7,11 +7,7 @@ export { getStrings as _getStrings, setStrings as _setStrings } from './lib/stri import { Cache } from '@ember/-internals/utils'; import { deprecate } from '@ember/debug'; -import type { SafeString } from '@ember/-internals/glimmer'; -import { - htmlSafe as internalHtmlSafe, - isHTMLSafe as internalIsHtmlSafe, -} from '@ember/-internals/glimmer'; +import { type SafeString, internalHtmlSafe, internalIsHtmlSafe } from '@ember/-internals/glimmer'; const STRING_DASHERIZE_REGEXP = /[ _]/g; diff --git a/packages/@ember/utils/lib/compare.ts b/packages/@ember/utils/lib/compare.ts index d4d963b0516..768f4881cf9 100644 --- a/packages/@ember/utils/lib/compare.ts +++ b/packages/@ember/utils/lib/compare.ts @@ -1,5 +1,4 @@ -import type { TypeName } from './type-of'; -import typeOf from './type-of'; +import typeOf, { type TypeName } from './type-of'; import { Comparable } from '@ember/-internals/runtime'; import { assert } from '@ember/debug'; diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts index 9a81ab58736..46da6dcd6b4 100644 --- a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts +++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; /** @module ember diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts index c680f3b7259..3e7fd8ec39f 100644 --- a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts +++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; /** @module ember diff --git a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts index f16e76056c4..c3ff5208299 100644 --- a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts +++ b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath } from './utils'; export default function errorOnInputWithContent(env: EmberASTPluginEnvironment): ASTPlugin { diff --git a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts index b769ba64b1b..14eecab8e2a 100644 --- a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts +++ b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; export default function assertReservedNamedArguments(env: EmberASTPluginEnvironment): ASTPlugin { let moduleName = env.meta?.moduleName; diff --git a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts index 4859871efdf..6e4124c068e 100644 --- a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts +++ b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import type { ASTPlugin } from '@glimmer/syntax'; +import { type ASTPlugin } from '@glimmer/syntax'; import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; export default function assertSplattributeExpressions(env: EmberASTPluginEnvironment): ASTPlugin { let moduleName = env.meta?.moduleName; diff --git a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts index 2ee6fdd4bc4..5aa620fc1a1 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts @@ -1,5 +1,5 @@ -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import type { Builders, EmberASTPluginEnvironment } from '../types'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; +import { type Builders, type EmberASTPluginEnvironment } from '../types'; import { isPath } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts index 895721210f2..72db4861bd7 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts @@ -1,5 +1,5 @@ -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts index 269937a098c..2e0799f9711 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts @@ -1,6 +1,6 @@ -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import { assert } from '@ember/debug'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts index 2adeb1c12c8..bc23b6ec3be 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts @@ -1,6 +1,6 @@ import { assert } from '@ember/debug'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts index d576592a37c..01d986aa85a 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts @@ -1,4 +1,4 @@ -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; export default function transformQuotedBindingsIntoJustBindings(/* env */): ASTPlugin { return { diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts index 513aa05ff69..9ab74a881f0 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts @@ -1,9 +1,9 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import { print } from '@glimmer/syntax'; +import { type AST, type ASTPlugin, print } from '@glimmer/syntax'; + import calculateLocationDisplay from '../system/calculate-location-display'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath, isStringLiteral, trackLocals } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts index f6e178878b7..673263ca1db 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts @@ -1,5 +1,5 @@ -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import type { EmberASTPluginEnvironment } from '../types'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; +import { type EmberASTPluginEnvironment } from '../types'; import { isPath, trackLocals } from './utils'; /** diff --git a/packages/ember-template-compiler/lib/plugins/utils.ts b/packages/ember-template-compiler/lib/plugins/utils.ts index 6bfe6240668..9e6f7f08ecb 100644 --- a/packages/ember-template-compiler/lib/plugins/utils.ts +++ b/packages/ember-template-compiler/lib/plugins/utils.ts @@ -1,4 +1,4 @@ -import type { AST } from '@glimmer/syntax'; +import { type AST } from '@glimmer/syntax'; export function isPath(node: AST.Node): node is AST.PathExpression { return node.type === 'PathExpression'; diff --git a/packages/ember-template-compiler/lib/system/bootstrap.ts b/packages/ember-template-compiler/lib/system/bootstrap.ts index 52efec31e18..0dacfc9c3d3 100644 --- a/packages/ember-template-compiler/lib/system/bootstrap.ts +++ b/packages/ember-template-compiler/lib/system/bootstrap.ts @@ -2,7 +2,7 @@ @module ember */ -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; import compile from './compile'; export interface BootstrapOptions { diff --git a/packages/ember-template-compiler/lib/system/calculate-location-display.ts b/packages/ember-template-compiler/lib/system/calculate-location-display.ts index 70d240cb729..22d13a8580b 100644 --- a/packages/ember-template-compiler/lib/system/calculate-location-display.ts +++ b/packages/ember-template-compiler/lib/system/calculate-location-display.ts @@ -1,4 +1,4 @@ -import type { AST } from '@glimmer/syntax'; +import { type AST } from '@glimmer/syntax'; export default function calculateLocationDisplay( moduleName: string | undefined, diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts index 78bd7ca78a7..cc00d189555 100644 --- a/packages/ember-template-compiler/lib/system/compile-options.ts +++ b/packages/ember-template-compiler/lib/system/compile-options.ts @@ -1,6 +1,6 @@ import { assert } from '@ember/debug'; import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index'; -import type { EmberPrecompileOptions, PluginFunc } from '../types'; +import { type EmberPrecompileOptions, type PluginFunc } from '../types'; import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name'; let USER_PLUGINS: PluginFunc[] = []; diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts index ba112ed1b2d..1f2ec5dcfc6 100644 --- a/packages/ember-template-compiler/lib/system/compile.ts +++ b/packages/ember-template-compiler/lib/system/compile.ts @@ -2,10 +2,10 @@ @module ember */ import require, { has } from 'require'; -import type { EmberPrecompileOptions } from '../types'; +import { type EmberPrecompileOptions } from '../types'; import precompile from './precompile'; -import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces'; -import type { templateFactory } from '@glimmer/opcode-compiler'; +import { type SerializedTemplateWithLazyBlock, type TemplateFactory } from '@glimmer/interfaces'; +import { type templateFactory } from '@glimmer/opcode-compiler'; let template: typeof templateFactory; diff --git a/packages/ember-template-compiler/lib/system/precompile.ts b/packages/ember-template-compiler/lib/system/precompile.ts index 85f26c81489..fafc4c23721 100644 --- a/packages/ember-template-compiler/lib/system/precompile.ts +++ b/packages/ember-template-compiler/lib/system/precompile.ts @@ -3,7 +3,7 @@ */ import { precompile as glimmerPrecompile } from '@glimmer/compiler'; -import type { EmberPrecompileOptions } from '../types'; +import { type EmberPrecompileOptions } from '../types'; import compileOptions from './compile-options'; /** diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts index 6c068cb74c3..b1c4a7b0e7e 100644 --- a/packages/ember-template-compiler/lib/types.d.ts +++ b/packages/ember-template-compiler/lib/types.d.ts @@ -1,8 +1,8 @@ -import type { - ASTPluginBuilder, - ASTPluginEnvironment, - builders, - PrecompileOptions, +import { + type ASTPluginBuilder, + type ASTPluginEnvironment, + type builders, + type PrecompileOptions, } from '@glimmer/syntax'; export type Builders = typeof builders; diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts index 768a733d1a8..7a2e5c30ca7 100644 --- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts +++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts @@ -1,6 +1,6 @@ import { precompile } from '@glimmer/compiler'; -import type { Option } from '@glimmer/interfaces'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; +import { type Option } from '@glimmer/interfaces'; +import { type AST, type ASTPlugin } from '@glimmer/syntax'; import { AbstractTestCase } from 'internal-test-helpers'; import { compileOptions } from '../../index'; diff --git a/packages/ember-testing/lib/ext/application.ts b/packages/ember-testing/lib/ext/application.ts index b99f66e8c0e..27ecc207ad3 100644 --- a/packages/ember-testing/lib/ext/application.ts +++ b/packages/ember-testing/lib/ext/application.ts @@ -6,7 +6,7 @@ import run from '../test/run'; import { invokeInjectHelpersCallbacks } from '../test/on_inject_helpers'; import { asyncStart, asyncEnd } from '../test/adapter'; import type Application from '@ember/application'; -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import { assert } from '@ember/debug'; export interface TestableApp extends Application { diff --git a/packages/ember-testing/lib/helpers/and_then.ts b/packages/ember-testing/lib/helpers/and_then.ts index ba38bca6520..5c286f046b0 100644 --- a/packages/ember-testing/lib/helpers/and_then.ts +++ b/packages/ember-testing/lib/helpers/and_then.ts @@ -1,5 +1,5 @@ import { assert } from '@ember/debug'; -import type { TestableApp } from '../ext/application'; +import { type TestableApp } from '../ext/application'; export default function andThen(app: TestableApp, callback: (app: TestableApp) => unknown) { let wait = app.testHelpers['wait']; diff --git a/packages/ember-testing/lib/helpers/visit.ts b/packages/ember-testing/lib/helpers/visit.ts index e882ab7d58b..f7805299ace 100644 --- a/packages/ember-testing/lib/helpers/visit.ts +++ b/packages/ember-testing/lib/helpers/visit.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; import Router from '@ember/routing/router'; import { run } from '@ember/runloop'; -import type { TestableApp } from '../ext/application'; +import { type TestableApp } from '../ext/application'; /** Loads a route, sets up any controllers, and renders any templates associated diff --git a/packages/ember-testing/lib/initializers.ts b/packages/ember-testing/lib/initializers.ts index debe4fdd517..0e739e3461c 100644 --- a/packages/ember-testing/lib/initializers.ts +++ b/packages/ember-testing/lib/initializers.ts @@ -1,6 +1,6 @@ import { onLoad } from '@ember/application'; import type Application from '@ember/application'; -import type { TestableApp } from './ext/application'; +import { type TestableApp } from './ext/application'; let name = 'deferReadiness in `testing` mode'; diff --git a/packages/ember-testing/lib/test/helpers.ts b/packages/ember-testing/lib/test/helpers.ts index 884e7352609..634a58e9a47 100644 --- a/packages/ember-testing/lib/test/helpers.ts +++ b/packages/ember-testing/lib/test/helpers.ts @@ -1,4 +1,4 @@ -import type { AnyFn } from '@ember/-internals/utility-types'; +import { type AnyFn } from '@ember/-internals/utility-types'; import TestPromise from './promise'; export const helpers: Record< diff --git a/packages/ember-testing/tests/reexports_test.js b/packages/ember-testing/tests/reexports_test.js index a667216214b..c79e9ef975b 100644 --- a/packages/ember-testing/tests/reexports_test.js +++ b/packages/ember-testing/tests/reexports_test.js @@ -1,6 +1,5 @@ import Ember from 'ember'; -import { confirmExport } from 'internal-test-helpers'; -import { moduleFor, AbstractTestCase } from 'internal-test-helpers'; +import { confirmExport, moduleFor, AbstractTestCase } from 'internal-test-helpers'; class ReexportsTestCase extends AbstractTestCase {} diff --git a/packages/ember/index.ts b/packages/ember/index.ts index 16f9e3aeb1e..e5f4411bf6d 100644 --- a/packages/ember/index.ts +++ b/packages/ember/index.ts @@ -129,8 +129,7 @@ import { unregisterDestructor, } from '@ember/destroyable'; -import type * as EmberTemplateCompiler from 'ember-template-compiler'; -import type { precompile, compile } from 'ember-template-compiler'; +import { type precompile, type compile, type EmberTemplateCompiler } from 'ember-template-compiler'; import type * as EmberTesting from 'ember-testing'; /** diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js index 16ba2acb900..d875b0fabda 100644 --- a/packages/ember/tests/routing/model_loading_test.js +++ b/packages/ember/tests/routing/model_loading_test.js @@ -1,11 +1,10 @@ /* eslint-disable no-console */ import Route from '@ember/routing/route'; import Controller from '@ember/controller'; -import EmberObject from '@ember/object'; +import EmberObject, { computed, set } from '@ember/object'; import { A as emberA } from '@ember/array'; import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers'; import { run } from '@ember/runloop'; -import { computed, set } from '@ember/object'; let originalConsoleError; diff --git a/packages/internal-test-helpers/lib/build-owner.ts b/packages/internal-test-helpers/lib/build-owner.ts index bf087cc2d38..d7105570a6f 100644 --- a/packages/internal-test-helpers/lib/build-owner.ts +++ b/packages/internal-test-helpers/lib/build-owner.ts @@ -3,7 +3,7 @@ import ApplicationInstance from '@ember/application/instance'; import Engine from '@ember/engine'; import { registerDestructor } from '@ember/destroyable'; import type Resolver from './test-resolver'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; +import { type EngineInstanceOptions } from '@ember/engine/instance'; class ResolverWrapper { resolver: Resolver | undefined; diff --git a/packages/internal-test-helpers/lib/compile.ts b/packages/internal-test-helpers/lib/compile.ts index 7fd317a7fe8..b02155e2ce8 100644 --- a/packages/internal-test-helpers/lib/compile.ts +++ b/packages/internal-test-helpers/lib/compile.ts @@ -2,10 +2,9 @@ @module ember */ import { precompileJSON } from '@glimmer/compiler'; -import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces'; +import { type SerializedTemplateWithLazyBlock, type TemplateFactory } from '@glimmer/interfaces'; import { templateFactory } from '@glimmer/opcode-compiler'; -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compileOptions } from 'ember-template-compiler'; +import { type EmberPrecompileOptions, compileOptions } from 'ember-template-compiler'; /** Uses HTMLBars `compile` function to process a string into a compiled template. diff --git a/packages/internal-test-helpers/lib/define-template-values.ts b/packages/internal-test-helpers/lib/define-template-values.ts index a4a93af4c71..0c6424e4b6d 100644 --- a/packages/internal-test-helpers/lib/define-template-values.ts +++ b/packages/internal-test-helpers/lib/define-template-values.ts @@ -7,11 +7,11 @@ import { } from '@glimmer/manager'; import { templateOnlyComponent } from '@glimmer/runtime'; -import type { - Arguments, - ComponentDefinitionState, - HelperManager, - ModifierManager, +import { + type Arguments, + type ComponentDefinitionState, + type HelperManager, + type ModifierManager, } from '@glimmer/interfaces'; import compile from './compile'; diff --git a/packages/internal-test-helpers/lib/ember-dev/assertion.ts b/packages/internal-test-helpers/lib/ember-dev/assertion.ts index 928d038e048..3a97a01adb3 100644 --- a/packages/internal-test-helpers/lib/ember-dev/assertion.ts +++ b/packages/internal-test-helpers/lib/ember-dev/assertion.ts @@ -1,6 +1,5 @@ import { DEBUG } from '@glimmer/env'; -import type { DebugEnv, Message } from './utils'; -import { callWithStub, checkTest } from './utils'; +import { type DebugEnv, type Message, callWithStub, checkTest } from './utils'; type ExpectAssertionFunc = (func: () => void, expectedMessage: Message) => void; type IgnoreAssertionFunc = (func: () => void) => void; diff --git a/packages/internal-test-helpers/lib/ember-dev/debug.ts b/packages/internal-test-helpers/lib/ember-dev/debug.ts index b6010b71b9d..b32c314a7c6 100644 --- a/packages/internal-test-helpers/lib/ember-dev/debug.ts +++ b/packages/internal-test-helpers/lib/ember-dev/debug.ts @@ -1,5 +1,5 @@ import MethodCallTracker from './method-call-tracker'; -import type { DebugEnv } from './utils'; +import { type DebugEnv } from './utils'; class DebugAssert { private tracker: MethodCallTracker | null; diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts index 6f84d9df3fb..edb1b3965d5 100644 --- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts +++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts @@ -1,7 +1,6 @@ import { assert } from '@ember/debug'; import DebugAssert from './debug'; -import type { DebugEnv, Message } from './utils'; -import { callWithStub } from './utils'; +import { type DebugEnv, type Message, callWithStub } from './utils'; type ExtendedWindow = Window & typeof globalThis & { diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts index 369d1bb2ca9..9ae7f40c2a5 100644 --- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts +++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts @@ -1,7 +1,6 @@ import { DEBUG } from '@glimmer/env'; import { assert as emberAssert } from '@ember/debug'; -import type { DebugEnv, DebugFunction, DebugFunctionOptions } from './utils'; -import { checkTest } from './utils'; +import { type DebugEnv, type DebugFunction, type DebugFunctionOptions, checkTest } from './utils'; type Actual = [string, boolean, DebugFunctionOptions]; type Message = string | RegExp; diff --git a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts index 8911bfe363d..b14033516f4 100644 --- a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts +++ b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts @@ -9,7 +9,7 @@ import { setupDeprecationHelpers } from './deprecation'; import { setupNamespacesCheck } from './namespaces'; import { setupObserversCheck } from './observers'; import { setupRunLoopCheck } from './run-loop'; -import type { DebugEnv } from './utils'; +import { type DebugEnv } from './utils'; import { setupWarningHelpers } from './warning'; declare global { diff --git a/packages/internal-test-helpers/lib/ember-dev/warning.ts b/packages/internal-test-helpers/lib/ember-dev/warning.ts index aa669ab26c0..35a0f9d1b9d 100644 --- a/packages/internal-test-helpers/lib/ember-dev/warning.ts +++ b/packages/internal-test-helpers/lib/ember-dev/warning.ts @@ -1,6 +1,5 @@ import DebugAssert from './debug'; -import type { DebugEnv, Message } from './utils'; -import { callWithStub } from './utils'; +import { type DebugEnv, type Message, callWithStub } from './utils'; type ExpectNoWarningFunc = (func?: (() => void) | undefined) => void; type ExpectWarningFunc = ( diff --git a/packages/internal-test-helpers/lib/module-for.ts b/packages/internal-test-helpers/lib/module-for.ts index 38f2bbdc338..7a0f878f960 100644 --- a/packages/internal-test-helpers/lib/module-for.ts +++ b/packages/internal-test-helpers/lib/module-for.ts @@ -1,8 +1,8 @@ /* globals URLSearchParams */ import { DEBUG } from '@glimmer/env'; import { isEnabled } from '@ember/canary-features'; -import type { Mixin, Generator } from './apply-mixins'; -import applyMixins from './apply-mixins'; + +import applyMixins, { type Mixin, type Generator } from './apply-mixins'; import getAllPropertyNames from './get-all-property-names'; import { setContext, unsetContext } from './test-context'; import { all } from 'rsvp'; diff --git a/packages/internal-test-helpers/lib/node-query.ts b/packages/internal-test-helpers/lib/node-query.ts index ccba8cd6b1e..57ece98e74c 100644 --- a/packages/internal-test-helpers/lib/node-query.ts +++ b/packages/internal-test-helpers/lib/node-query.ts @@ -1,8 +1,14 @@ /* global Node */ import { assert } from '@ember/debug'; -import type { KEYBOARD_EVENT_TYPES, MOUSE_EVENT_TYPES } from './system/synthetic-events'; -import { blur, fireEvent, focus, matches } from './system/synthetic-events'; +import { + type KEYBOARD_EVENT_TYPES, + type MOUSE_EVENT_TYPES, + blur, + fireEvent, + focus, + matches, +} from './system/synthetic-events'; export default class NodeQuery { static query(selector: string, context: Document | DocumentFragment | Element = document) { diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts index 45fcb41647f..372df89286e 100644 --- a/packages/internal-test-helpers/lib/registry-check.ts +++ b/packages/internal-test-helpers/lib/registry-check.ts @@ -1,4 +1,4 @@ -import type { FullName } from '@ember/-internals/owner'; +import { type FullName } from '@ember/-internals/owner'; import type Engine from '@ember/engine'; export function verifyRegistration(assert: QUnit['assert'], owner: Engine, fullName: FullName) { diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts index bfae6b31741..0196d60e9e1 100644 --- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts +++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts @@ -1,9 +1,9 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { type EmberPrecompileOptions, compile } from 'ember-template-compiler'; + import { ENV } from '@ember/-internals/environment'; import AbstractTestCase from './abstract'; import { runDestroy, runTask, runLoopSettled } from '../run'; -import type { BootOptions } from '@ember/engine/instance'; +import { type BootOptions } from '@ember/engine/instance'; import type Application from '@ember/application'; import type ApplicationInstance from '@ember/application/instance'; import type Router from '@ember/routing/router'; diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts index 18cddb58c0a..684662c7ac2 100644 --- a/packages/internal-test-helpers/lib/test-cases/query-param.ts +++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts @@ -1,4 +1,4 @@ -import type { BootOptions } from '@ember/engine/instance'; +import { type BootOptions } from '@ember/engine/instance'; import Controller from '@ember/controller'; import type EmberObject from '@ember/object'; import NoneLocation from '@ember/routing/none-location'; diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts index b73a952824d..016199a1b6e 100644 --- a/packages/internal-test-helpers/lib/test-cases/rendering.ts +++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts @@ -1,19 +1,19 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { type EmberPrecompileOptions, compile } from 'ember-template-compiler'; + import { EventDispatcher } from '@ember/-internals/views'; -import type { Renderer } from '@ember/-internals/glimmer'; +import { type Renderer, helper, Helper, _resetRenderers } from '@ember/-internals/glimmer'; import Component from '@ember/component'; -import { helper, Helper, _resetRenderers } from '@ember/-internals/glimmer'; + import type Resolver from '../test-resolver'; import { ModuleBasedResolver } from '../test-resolver'; import AbstractTestCase from './abstract'; import buildOwner from '../build-owner'; import { runAppend, runDestroy, runTask } from '../run'; -import type { InternalFactory } from '@ember/-internals/owner'; -import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance'; +import { type InternalFactory } from '@ember/-internals/owner'; +import { type BootOptions, type EngineInstanceOptions } from '@ember/engine/instance'; import type EngineInstance from '@ember/engine/instance'; -import type { HelperFunction } from '@ember/-internals/glimmer/lib/helper'; +import { type HelperFunction } from '@ember/-internals/glimmer/lib/helper'; const TextNode = window.Text; diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts index 03803cc22f1..c4ae6936843 100644 --- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts +++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts @@ -1,18 +1,18 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { type EmberPrecompileOptions, compile } from 'ember-template-compiler'; + import { EventDispatcher } from '@ember/-internals/views'; -import type { Renderer } from '@ember/-internals/glimmer'; +import { type Renderer, _resetRenderers } from '@ember/-internals/glimmer'; import Component from '@ember/component'; -import { _resetRenderers } from '@ember/-internals/glimmer'; + import type Resolver from '../test-resolver'; import { ModuleBasedResolver } from '../test-resolver'; import AbstractTestCase from './abstract'; import buildOwner from '../build-owner'; import { runAppend, runDestroy } from '../run'; -import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance'; +import { type BootOptions, type EngineInstanceOptions } from '@ember/engine/instance'; import type EngineInstance from '@ember/engine/instance'; -import type { InternalFactory } from '@ember/-internals/owner'; +import { type InternalFactory } from '@ember/-internals/owner'; export default class RouterNonApplicationTestCase extends AbstractTestCase { owner: EngineInstance; diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts index e292fecc4ef..3770ea12d2c 100644 --- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts +++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts @@ -2,7 +2,7 @@ import AbstractApplicationTestCase from './abstract-application'; import type Resolver from '../test-resolver'; import { ModuleBasedResolver } from '../test-resolver'; import Component from '@ember/component'; -import type { InternalFactory } from '@ember/-internals/owner'; +import { type InternalFactory } from '@ember/-internals/owner'; export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase { abstract resolver?: Resolver; diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts index 2372832089c..eee993129e9 100644 --- a/packages/internal-test-helpers/lib/test-resolver.ts +++ b/packages/internal-test-helpers/lib/test-resolver.ts @@ -1,6 +1,6 @@ import { compile } from 'ember-template-compiler'; -import type { InternalFactory, Resolver as IResolver } from '@ember/-internals/owner'; +import { type InternalFactory, type Resolver as IResolver } from '@ember/-internals/owner'; const DELIMITER = '%';