diff --git a/.eslintrc.js b/.eslintrc.js index 921dc164dd6..91bdc4f17e5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -56,7 +56,12 @@ 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', + { + prefer: 'type-imports', + }, + ], // TODO: Enable and fix these rules // Typescript provides better types with these rules enabled diff --git a/package.json b/package.json index 6b84256d775..54b7c448133 100644 --- a/package.json +++ b/package.json @@ -95,8 +95,8 @@ "@simple-dom/document": "^1.4.0", "@types/qunit": "^2.11.3", "@types/rsvp": "^4.0.4", - "@typescript-eslint/eslint-plugin": "^5.22.0", - "@typescript-eslint/parser": "^5.15.0", + "@typescript-eslint/eslint-plugin": "^5.26.0", + "@typescript-eslint/parser": "^5.26.0", "auto-dist-tag": "^2.1.1", "aws-sdk": "^2.1095.0", "babel-template": "^6.26.0", @@ -118,12 +118,12 @@ "ember-cli-dependency-checker": "^3.2.0", "ember-cli-yuidoc": "^0.9.1", "ember-publisher": "0.0.7", - "eslint": "^8.11.0", + "eslint": "^8.16.0", "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-node": "^0.3.6", "eslint-plugin-disable-features": "^0.1.3", "eslint-plugin-ember-internal": "^2.0.0", - "eslint-plugin-import": "^2.25.4", + "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-qunit": "^7.2.0", @@ -152,7 +152,7 @@ "simple-dom": "^1.4.0", "testem": "^3.6.0", "testem-failure-only-reporter": "^1.0.0", - "typescript": "~4.6.4" + "typescript": "~4.7.2" }, "engines": { "node": ">= 12.*" diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts index af6e4a5df6f..fdb0debb178 100644 --- a/packages/@ember/-internals/container/lib/container.ts +++ b/packages/@ember/-internals/container/lib/container.ts @@ -1,9 +1,8 @@ -import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { setOwner, type Factory, type FactoryClass, type Owner } from '@ember/-internals/owner'; import { dictionary } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { DebugRegistry, TypeOptions } from './registry'; +import { type DebugRegistry, type TypeOptions } from './registry'; import type Registry from './registry'; interface LeakTracking { @@ -231,7 +230,9 @@ function wrapManagerInDeprecationProxy( let validator = { set(_obj: T, prop: keyof T) { throw new Error( - `You attempted to set "${prop}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.` + `You attempted to set "${String( + prop + )}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.` ); }, }; diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts index 86ecc34ed3a..15b2604d602 100644 --- a/packages/@ember/-internals/container/lib/registry.ts +++ b/packages/@ember/-internals/container/lib/registry.ts @@ -1,10 +1,9 @@ -import type { Factory } from '@ember/-internals/owner'; +import { type Factory } 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/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts index 36cdb3aeb42..2382333bd8d 100644 --- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts +++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts @@ -1,9 +1,13 @@ import { classify, dasherize } from '@ember/string'; -import type { NativeArray } from '@ember/-internals/runtime'; -import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime'; -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; -import type { Resolver } from '@ember/-internals/container/lib/registry'; +import { + A as emberA, + typeOf, + Namespace, + Object as EmberObject, + type NativeArray, +} from '@ember/-internals/runtime'; +import { getOwner, type Owner } from '@ember/-internals/owner'; +import { type Resolver } from '@ember/-internals/container/lib/registry'; /** @module @ember/debug diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.ts b/packages/@ember/-internals/extension-support/lib/data_adapter.ts index 96a756dd90a..1a9fdaa2422 100644 --- a/packages/@ember/-internals/extension-support/lib/data_adapter.ts +++ b/packages/@ember/-internals/extension-support/lib/data_adapter.ts @@ -1,13 +1,15 @@ -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { getOwner, type Owner } from '@ember/-internals/owner'; import { _backburner } from '@ember/runloop'; import { get } from '@ember/-internals/metal'; import { dasherize } from '@ember/string'; -import type { NativeArray } from '@ember/-internals/runtime'; -import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime'; -import type { Cache } from '@glimmer/validator'; -import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator'; -import type { ContainerDebugAdapter } from '..'; +import { + Namespace, + Object as EmberObject, + A as emberA, + type NativeArray, +} from '@ember/-internals/runtime'; +import { consumeTag, createCache, getValue, tagFor, untrack, type Cache } from '@glimmer/validator'; +import { type ContainerDebugAdapter } from '..'; type RecordColor = 'black' | 'red' | 'blue' | 'green'; diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts index 180e2b70293..5ed6c8731e9 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts @@ -1,28 +1,32 @@ -import type { Factory, Owner } from '@ember/-internals/owner'; -import { getOwner, setOwner } from '@ember/-internals/owner'; +import { getOwner, setOwner, type Factory, type Owner } from '@ember/-internals/owner'; import { enumerableSymbol, guidFor } from '@ember/-internals/utils'; import { addChildView, setElementView, setViewElement } from '@ember/-internals/views'; 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 { + childRefFor, + createComputeRef, + createPrimitiveRef, + valueForRef, + type Reference, +} from '@glimmer/reference'; import { reifyPositional } from '@glimmer/runtime'; import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util'; import { @@ -34,9 +38,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 eca2486d3b6..9078de26772 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts @@ -1,26 +1,25 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { generateControllerFactory } from '@ember/-internals/routing'; 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 { createConstRef, valueForRef, type Reference } 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 df836e6f5ce..4b8af4e5ddf 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts @@ -1,34 +1,33 @@ import { ENV } from '@ember/-internals/environment'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } 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 { createConstRef, valueForRef, type Reference } 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 7dc608f6ada..0d89ee1703b 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts @@ -1,18 +1,18 @@ import { getFactoryFor } from '@ember/-internals/container'; 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..ed0170fff28 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,11 @@ 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 { createTag, dirtyTag, type DirtyableTag } 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..d8650e277c7 100644 --- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts +++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts @@ -1,10 +1,14 @@ 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 { + isConstRef, + isUpdatableRef, + updateRef, + valueForRef, + type Reference, +} 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 8d2c66af8ca..66ee01e95ab 100644 --- a/packages/@ember/-internals/glimmer/lib/components/internal.ts +++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts @@ -1,21 +1,19 @@ -import type { Owner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { setOwner, type Owner } 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 { createConstRef, isConstRef, valueForRef, type Reference } 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 7973fb716c6..e3d64dc3f43 100644 --- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts +++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts @@ -1,4 +1,4 @@ -import type { Route, RouterState, RoutingService } from '@ember/-internals/routing'; +import { type Route, type RouterState, type RoutingService } from '@ember/-internals/routing'; import { isSimpleClick } from '@ember/-internals/views'; import { assert, debugFreeze, inspect, warn } from '@ember/debug'; import { getEngineParent } from '@ember/engine'; @@ -7,9 +7,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 4265a73f819..37014216724 100644 --- a/packages/@ember/-internals/glimmer/lib/environment.ts +++ b/packages/@ember/-internals/glimmer/lib/environment.ts @@ -1,15 +1,15 @@ import { ENV } from '@ember/-internals/environment'; import { get, set, _getProp, _setProp } from '@ember/-internals/metal'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { getDebugName } from '@ember/-internals/utils'; import { constructStyleDeprecationMessage } from '@ember/-internals/views'; import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features'; import { assert, deprecate, warn } from '@ember/debug'; -import type { DeprecationOptions } from '@ember/debug/lib/deprecate'; +import { type DeprecationOptions } from '@ember/debug/lib/deprecate'; 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 0e652396cf1..2c181d15f9a 100644 --- a/packages/@ember/-internals/glimmer/lib/helper.ts +++ b/packages/@ember/-internals/glimmer/lib/helper.ts @@ -2,17 +2,15 @@ @module @ember/component */ -import type { FactoryManager } from '@ember/-internals/container/lib/container'; -import type { Factory, Owner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { type FactoryManager } from '@ember/-internals/container/lib/container'; +import { setOwner, type Factory, type Owner } from '@ember/-internals/owner'; import { FrameworkObject } from '@ember/-internals/runtime'; 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 { consumeTag, createTag, dirtyTag, type DirtyableTag } from '@glimmer/validator'; export const RECOMPUTE_TAG = Symbol('RECOMPUTE_TAG'); @@ -105,7 +103,7 @@ class Helper extends FrameworkObject { static isHelperFactory = true; static [IS_CLASSIC_HELPER] = true; - [RECOMPUTE_TAG]: DirtyableTag; + [RECOMPUTE_TAG]!: DirtyableTag; init(properties: object | undefined) { super.init(properties); 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 52b2989294b..0559eeb308f 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/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 91e49504ddd..e319d447bd4 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 { Owner } from '@ember/-internals/owner'; +import { type Owner } 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 0cc23151449..cb572df7933 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts @@ -2,14 +2,19 @@ @module ember */ import { get } from '@ember/-internals/metal'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/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 { + createUnboundRef, + isInvokableRef, + updateRef, + valueForRef, + type Reference, +} 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 979156e0629..9f6d8e27d9d 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 { Owner } from '@ember/-internals/owner'; -import type { Helper, HelperDefinitionState } from '@glimmer/interfaces'; +import { type Owner } 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 032cd66b6a8..b05d12cdf1a 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts @@ -25,8 +25,7 @@ @public */ -import type { Reference } from '@glimmer/reference'; -import { createConstRef } from '@glimmer/reference'; +import { createConstRef, type Reference } 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 0512a08942d..0a349114a0e 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 { Owner } from '@ember/-internals/owner'; +import { type Owner } 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,16 @@ 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 { createUpdatableTag, type UpdatableTag } 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 84a9078dd01..0a257d55ba6 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts @@ -1,15 +1,14 @@ -import type { Owner } from '@ember/-internals/owner'; -import { setOwner } from '@ember/-internals/owner'; +import { setOwner, type Owner } 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 9e7625728f5..3011b72a2ae 100644 --- a/packages/@ember/-internals/glimmer/lib/renderer.ts +++ b/packages/@ember/-internals/glimmer/lib/renderer.ts @@ -1,33 +1,35 @@ import { privatize as P } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { getOwner, type Owner } 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 { + CurriedType, + 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, } 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 { + createConstRef, + UNDEFINED_REFERENCE, + valueForRef, + type Reference, +} from '@glimmer/reference'; import { clientBuilder, curry, @@ -36,10 +38,11 @@ import { inTransaction, renderMain, runtimeContext, + type CurriedValue, } 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 +51,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 d374a7e2727..fd4bb1f1069 100644 --- a/packages/@ember/-internals/glimmer/lib/resolver.ts +++ b/packages/@ember/-internals/glimmer/lib/resolver.ts @@ -1,21 +1,20 @@ import { privatize as P } from '@ember/-internals/container'; -import type { TypeOptions } from '@ember/-internals/container/lib/registry'; +import { type TypeOptions } from '@ember/-internals/container/lib/registry'; import { ENV } from '@ember/-internals/environment'; -import type { Factory, Owner } from '@ember/-internals/owner'; -import { isFactory } from '@ember/-internals/owner'; +import { isFactory, type Factory, type Owner } from '@ember/-internals/owner'; import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features'; 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 f30fcf3b4b1..5e7156fcefc 100644 --- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts +++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts @@ -1,5 +1,4 @@ -import type { Registry } from '@ember/-internals/container'; -import { privatize as P } from '@ember/-internals/container'; +import { privatize as P, type Registry } 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 8769597b306..322a00c24b2 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts @@ -1,15 +1,12 @@ /** @module ember */ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } 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 { CurriedType, type CapturedArguments, type Option } from '@glimmer/interfaces'; +import { createComputeRef, valueForRef, type Reference } from '@glimmer/reference'; +import { createCapturedArgs, curry, EMPTY_POSITIONAL, type CurriedValue } 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 f7e2b290504..acc3bac51ea 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts @@ -1,23 +1,23 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } 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 { CurriedType, type CapturedArguments, type DynamicScope } from '@glimmer/interfaces'; import { childRefFromParts, createComputeRef, createDebugAliasRef, valueForRef, + type Reference, } from '@glimmer/reference'; -import type { CurriedValue } from '@glimmer/runtime'; -import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime'; +import { createCapturedArgs, curry, EMPTY_POSITIONAL, type CurriedValue } from '@glimmer/runtime'; import { dict } from '@glimmer/util'; -import type { OutletDefinitionState } from '../component-managers/outlet'; -import { OutletComponentDefinition } from '../component-managers/outlet'; +import { + OutletComponentDefinition, + type OutletDefinitionState, +} 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 ba4ffd4f88c..b8feedb636b 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 26069564072..2c4f1ac56c6 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts @@ -1,14 +1,14 @@ import { get } from '@ember/-internals/metal'; import { assert } from '@ember/debug'; import { dasherize } from '@ember/string'; -import type { ElementOperations } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; +import { type ElementOperations } from '@glimmer/interfaces'; import { childRefFor, childRefFromParts, createComputeRef, createPrimitiveRef, valueForRef, + type Reference, } from '@glimmer/reference'; import type Component from '../component'; 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..21a6f217456 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,14 @@ 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 { createConstRef, type Reference } from '@glimmer/reference'; +import { + beginUntrackFrame, + endUntrackFrame, + valueForTag, + type Revision, + type Tag, +} 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 abb32a9b85c..b6e982f619c 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts @@ -1,8 +1,8 @@ import { objectAt } from '@ember/-internals/metal'; -import type { Array as EmberArray } from '@ember/-internals/runtime'; +import { type Array as EmberArray } from '@ember/-internals/runtime'; import { isEmberArray, 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'; diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts index 5c2876b9ac4..d6253cd6b95 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 { Owner } from '@ember/-internals/owner'; -import type { ComponentManager } from '@glimmer/interfaces'; +import { type Owner } 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 94d17850c01..cc86bf70e4a 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 { Owner } from '@ember/-internals/owner'; -import type { Template, TemplateFactory } from '@glimmer/interfaces'; +import { type Owner } 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..02894480095 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts @@ -1,7 +1,6 @@ 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 { isUpdatableRef, updateRef, valueForRef, type Reference } 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/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts index 724f9b354a6..06b68bfd2f9 100644 --- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts @@ -1,16 +1,14 @@ -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; -import type { BootOptions } from '@ember/application/instance'; +import { getOwner, type Owner } from '@ember/-internals/owner'; +import { type BootOptions } from '@ember/application/instance'; import { assert } from '@ember/debug'; import { schedule } from '@ember/runloop'; -import type { Template } from '@glimmer/interfaces'; -import type { Reference } from '@glimmer/reference'; -import { createComputeRef, updateRef } from '@glimmer/reference'; +import { type Template } from '@glimmer/interfaces'; +import { createComputeRef, updateRef, type Reference } 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 b3ed61ad6dd..2540cb2db74 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,19 @@ import { import { ENV } from '@ember/-internals/environment'; import { Component, setComponentManager } from '@ember/-internals/glimmer'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { Route } from '@ember/-internals/routing'; 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 { compile, type EmberPrecompileOptions } from 'ember-template-compiler'; import { runTask } from 'internal-test-helpers/lib/run'; interface CapturedBounds { 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 f769ef276db..92bca9b946b 100644 --- a/packages/@ember/-internals/metal/lib/alias.ts +++ b/packages/@ember/-internals/metal/lib/alias.ts @@ -1,9 +1,7 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { meta as metaFor, type Meta } from '@ember/-internals/meta'; import { inspect } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import EmberError from '@ember/error'; -import type { UpdatableTag } from '@glimmer/validator'; import { consumeTag, tagFor, @@ -12,14 +10,15 @@ import { updateTag, validateTag, valueForTag, + type UpdatableTag, } from '@glimmer/validator'; import { CHAIN_PASS_THROUGH, finishLazyChains, getChainTagsForKey } from './chain-tags'; -import type { ExtendedMethodDecorator } from './decorator'; import { ComputedDescriptor, descriptorForDecorator, isElementDescriptor, makeComputedDecorator, + type ExtendedMethodDecorator, } from './decorator'; import { defineProperty } from './properties'; import { get } from './property_get'; diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts index 4b9bb3e3360..f10fd00516b 100644 --- a/packages/@ember/-internals/metal/lib/array.ts +++ b/packages/@ember/-internals/metal/lib/array.ts @@ -1,4 +1,4 @@ -import type { Array as EmberArray, MutableArray } from '@ember/-internals/runtime'; +import { type Array as EmberArray, type MutableArray } from '@ember/-internals/runtime'; import { assert } from '@ember/debug'; import { arrayContentDidChange, arrayContentWillChange } from './array_events'; import { addListener, removeListener } from './events'; diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts index bbcfb80bb0c..cafb271044b 100644 --- a/packages/@ember/-internals/metal/lib/chain-tags.ts +++ b/packages/@ember/-internals/metal/lib/chain-tags.ts @@ -1,15 +1,15 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { meta as metaFor, peekMeta, type Meta } 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 { combine, createUpdatableTag, tagMetaFor, updateTag, validateTag, + type Tag, + type TagMeta, } 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 64aec6efd21..39b1a45b255 100644 --- a/packages/@ember/-internals/metal/lib/computed.ts +++ b/packages/@ember/-internals/metal/lib/computed.ts @@ -1,11 +1,9 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { meta as metaFor, type Meta } from '@ember/-internals/meta'; import { inspect, toString } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import EmberError from '@ember/error'; import { isDestroyed } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; -import type { UpdatableTag } from '@glimmer/validator'; import { ALLOW_CYCLES, consumeTag, @@ -16,13 +14,9 @@ import { updateTag, validateTag, valueForTag, + type UpdatableTag, } from '@glimmer/validator'; import { finishLazyChains, getChainTagsForKeys } from './chain-tags'; -import type { - ExtendedMethodDecorator, - DecoratorPropertyDescriptor, - ElementDescriptor, -} from './decorator'; import { ComputedDescriptor, descriptorForDecorator, @@ -30,16 +24,19 @@ import { isClassicDecorator, isElementDescriptor, makeComputedDecorator, + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, + type ElementDescriptor, } from './decorator'; import expandProperties from './expand_properties'; import { addObserver, setObserverSuspended } from './observer'; -import type { PropertyDidChange } from './property_events'; import { beginPropertyChanges, endPropertyChanges, hasPropertyDidChange, notifyPropertyChange, PROPERTY_DID_CHANGE, + type PropertyDidChange, } from './property_events'; export type ComputedPropertyGetterFunction = (this: any, key: string) => unknown; diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts index 71bc8ad6494..edc66da9d93 100644 --- a/packages/@ember/-internals/metal/lib/decorator.ts +++ b/packages/@ember/-internals/metal/lib/decorator.ts @@ -1,5 +1,4 @@ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { meta as metaFor, peekMeta, type Meta } 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 8c2c49dbd59..b2b5c5f01e3 100644 --- a/packages/@ember/-internals/metal/lib/deprecate_property.ts +++ b/packages/@ember/-internals/metal/lib/deprecate_property.ts @@ -3,7 +3,7 @@ */ import { deprecate } from '@ember/debug'; -import type { DeprecationOptions } from '@ember/debug/lib/deprecate'; +import { type DeprecationOptions } from '@ember/debug/lib/deprecate'; 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 efb69e00b5b..359d24dd6e6 100644 --- a/packages/@ember/-internals/metal/lib/events.ts +++ b/packages/@ember/-internals/metal/lib/events.ts @@ -1,10 +1,9 @@ /** @module @ember/object */ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { meta as metaFor, peekMeta, type Meta } from '@ember/-internals/meta'; import { setListeners } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/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..283a0a11023 100644 --- a/packages/@ember/-internals/metal/lib/injected_property.ts +++ b/packages/@ember/-internals/metal/lib/injected_property.ts @@ -2,8 +2,11 @@ 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 { + isElementDescriptor, + type DecoratorPropertyDescriptor, + type ElementDescriptor, +} from './decorator'; import { defineProperty } from './properties'; export let DEBUG_INJECTION_FUNCTIONS: WeakMap; diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts index 493ffd7d4d0..0e88bdce7aa 100644 --- a/packages/@ember/-internals/metal/lib/mixin.ts +++ b/packages/@ember/-internals/metal/lib/mixin.ts @@ -3,8 +3,7 @@ */ import { INIT_FACTORY } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; +import { meta as metaFor, peekMeta, type Meta } from '@ember/-internals/meta'; import { guidFor, makeArray, @@ -13,19 +12,23 @@ import { setObservers, wrap, } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/types'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; import { _WeakSet } from '@glimmer/util'; -import type { - ComputedDecorator, - ComputedPropertyGetter, - ComputedPropertyObj, - ComputedPropertySetter, +import { + ComputedProperty, + type ComputedDecorator, + type ComputedPropertyGetter, + type ComputedPropertyObj, + type ComputedPropertySetter, } from './computed'; -import { ComputedProperty } from './computed'; -import type { ComputedDescriptor } from './decorator'; -import { descriptorForDecorator, makeComputedDecorator, nativeDescDecorator } from './decorator'; +import { + descriptorForDecorator, + makeComputedDecorator, + nativeDescDecorator, + type ComputedDescriptor, +} from './decorator'; import { addListener, removeListener } from './events'; import expandProperties from './expand_properties'; import { setUnprocessedMixins } from './namespace_search'; diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts index 4cae45d4b62..8bc8b9ec2d6 100644 --- a/packages/@ember/-internals/metal/lib/observer.ts +++ b/packages/@ember/-internals/metal/lib/observer.ts @@ -2,8 +2,7 @@ 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 { CURRENT_TAG, tagMetaFor, validateTag, valueForTag, type Tag } 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..4792794a362 100644 --- a/packages/@ember/-internals/metal/lib/properties.ts +++ b/packages/@ember/-internals/metal/lib/properties.ts @@ -2,12 +2,14 @@ @module @ember/object */ -import type { Meta } from '@ember/-internals/meta'; -import { meta as metaFor } from '@ember/-internals/meta'; +import { meta as metaFor, type Meta } 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 { + descriptorForProperty, + isClassicDecorator, + type ExtendedMethodDecorator, +} 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..affe6781a56 100644 --- a/packages/@ember/-internals/metal/lib/property_events.ts +++ b/packages/@ember/-internals/metal/lib/property_events.ts @@ -1,5 +1,4 @@ -import type { Meta } from '@ember/-internals/meta'; -import { peekMeta } from '@ember/-internals/meta'; +import { peekMeta, type Meta } 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..fbf5a6f14ae 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 { CONSTANT_TAG, dirtyTagFor, tagFor, type Tag, type TagMeta } from '@glimmer/validator'; ///////// diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts index 143bf6379c6..5edab6d4eda 100644 --- a/packages/@ember/-internals/metal/lib/tracked.ts +++ b/packages/@ember/-internals/metal/lib/tracked.ts @@ -3,10 +3,15 @@ import { isEmberArray } from '@ember/-internals/utils'; 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 { + COMPUTED_SETTERS, + isElementDescriptor, + setClassicDecorator, + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, +} from './decorator'; import { SELF_TAG } from './tags'; /** diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts index 82a39200501..3e692f26fae 100644 --- a/packages/@ember/-internals/owner/index.ts +++ b/packages/@ember/-internals/owner/index.ts @@ -1,7 +1,7 @@ import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner'; import { TypeOptions } from '../container/lib/registry'; -import type { IContainer } from '../runtime/lib/mixins/container_proxy'; -import type { IRegistry } from '../runtime/lib/mixins/registry_proxy'; +import { type IContainer } from '../runtime/lib/mixins/container_proxy'; +import { type IRegistry } from '../runtime/lib/mixins/registry_proxy'; /** @module @ember/application diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts index c12d374b6f0..fe984a23685 100644 --- a/packages/@ember/-internals/routing/lib/ext/controller.ts +++ b/packages/@ember/-internals/routing/lib/ext/controller.ts @@ -2,10 +2,9 @@ import { get } from '@ember/-internals/metal'; import { getOwner } from '@ember/-internals/owner'; import type Controller from '@ember/controller'; import ControllerMixin from '@ember/controller/lib/controller_mixin'; -import type { Transition } from 'router_js'; -import type { Route, Router } from '../..'; -import type { RouteArgs } from '../utils'; -import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils'; +import { type Transition } from 'router_js'; +import { type Route, type Router } from '../..'; +import { deprecateTransitionMethods, prefixRouteNameArg, type RouteArgs } from '../utils'; /** @module ember diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts index 6ab31704b32..2fb7e05fb87 100644 --- a/packages/@ember/-internals/routing/lib/location/auto_location.ts +++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts @@ -2,9 +2,9 @@ import { history, location, userAgent, window } from '@ember/-internals/browser- import { set } from '@ember/-internals/metal'; import { getOwner } from '@ember/-internals/owner'; import { Object as EmberObject } from '@ember/-internals/runtime'; -import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types'; +import { type AnyFn, type MethodNamesOf } from '@ember/-internals/utils/types'; import { assert } from '@ember/debug'; -import type { EmberLocation, UpdateCallback } from './api'; +import { type EmberLocation, type UpdateCallback } from './api'; import { getFullPath, getHash, diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts index 728ea7ae202..5034bec28fd 100644 --- a/packages/@ember/-internals/routing/lib/location/hash_location.ts +++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts @@ -1,7 +1,7 @@ import { set } from '@ember/-internals/metal'; import { Object as EmberObject } from '@ember/-internals/runtime'; import { bind } from '@ember/runloop'; -import type { EmberLocation, UpdateCallback } from './api'; +import { type EmberLocation, type UpdateCallback } from './api'; import { getHash } from './util'; /** diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts index f28763ba882..b517984df6a 100644 --- a/packages/@ember/-internals/routing/lib/location/history_location.ts +++ b/packages/@ember/-internals/routing/lib/location/history_location.ts @@ -1,6 +1,6 @@ import { set } from '@ember/-internals/metal'; import { Object as EmberObject } from '@ember/-internals/runtime'; -import type { EmberLocation, UpdateCallback } from './api'; +import { type EmberLocation, type UpdateCallback } from './api'; import { getHash } from './util'; /** diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts index e00a5fd23d8..6e9c86870d4 100644 --- a/packages/@ember/-internals/routing/lib/location/none_location.ts +++ b/packages/@ember/-internals/routing/lib/location/none_location.ts @@ -1,7 +1,7 @@ import { set } from '@ember/-internals/metal'; import { Object as EmberObject } from '@ember/-internals/runtime'; import { assert } from '@ember/debug'; -import type { EmberLocation, UpdateCallback } from './api'; +import { type EmberLocation, type UpdateCallback } from './api'; /** @module @ember/routing diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts index 73f4a98840a..48af30cb0a5 100644 --- a/packages/@ember/-internals/routing/lib/services/router.ts +++ b/packages/@ember/-internals/routing/lib/services/router.ts @@ -4,12 +4,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 '../system/route'; import EmberRouter from '../system/router'; import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info'; -import type { RouteArgs, RouteOptions } from '../utils'; -import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils'; +import { + extractRouteArgs, + resemblesURL, + shallowEqual, + type RouteArgs, + type RouteOptions, +} from '../utils'; export const ROUTER = Symbol('ROUTER'); diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts index b21d22dd523..24dcd79cd95 100644 --- a/packages/@ember/-internals/routing/lib/services/routing.ts +++ b/packages/@ember/-internals/routing/lib/services/routing.ts @@ -6,8 +6,8 @@ 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 { Route } from '../..'; +import { type ModelFor } from 'router_js'; +import { type Route } from '../..'; import EmberRouter from '../system/router'; import type RouterState from '../system/router_state'; import { ROUTER } from './router'; diff --git a/packages/@ember/-internals/routing/lib/system/controller_for.ts b/packages/@ember/-internals/routing/lib/system/controller_for.ts index 1f638a75d29..930d74df1db 100644 --- a/packages/@ember/-internals/routing/lib/system/controller_for.ts +++ b/packages/@ember/-internals/routing/lib/system/controller_for.ts @@ -1,5 +1,5 @@ -import type { Container } from '@ember/-internals/container'; -import type { TypeOptions } from '@ember/-internals/container/lib/registry'; +import { type Container } from '@ember/-internals/container'; +import { type TypeOptions } from '@ember/-internals/container/lib/registry'; /** @module ember */ diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts index bad99044a3d..84d6dd0b28a 100644 --- a/packages/@ember/-internals/routing/lib/system/dsl.ts +++ b/packages/@ember/-internals/routing/lib/system/dsl.ts @@ -1,8 +1,8 @@ -import type { Factory } from '@ember/-internals/owner'; +import { type Factory } 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/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/-internals/routing/lib/system/generate_controller.ts index c96969714d6..63015937e92 100644 --- a/packages/@ember/-internals/routing/lib/system/generate_controller.ts +++ b/packages/@ember/-internals/routing/lib/system/generate_controller.ts @@ -1,5 +1,5 @@ import { get } from '@ember/-internals/metal'; -import type { Factory, Owner } from '@ember/-internals/owner'; +import { type Factory, type 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/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts index 877d3ba23b9..6f4dc38cfe1 100644 --- a/packages/@ember/-internals/routing/lib/system/route.ts +++ b/packages/@ember/-internals/routing/lib/system/route.ts @@ -11,8 +11,7 @@ import { set, setProperties, } from '@ember/-internals/metal'; -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { getOwner, type Owner } from '@ember/-internals/owner'; import { BucketCache } from '@ember/-internals/routing'; import { A as emberA, @@ -22,34 +21,36 @@ import { typeOf, } from '@ember/-internals/runtime'; import { isProxy, lookupDescriptor } from '@ember/-internals/utils'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/types'; import Controller from '@ember/controller'; -import type { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin'; +import { type ControllerQueryParamType } from '@ember/controller/lib/controller_mixin'; 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 { + PARAMS_SYMBOL, + STATE_SYMBOL, + type InternalRouteInfo, + type ModelFor, + type Route as IRoute, + type Transition, + type TransitionState, } from 'router_js'; -import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js'; -import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from '../utils'; import { calculateCacheKey, deprecateTransitionMethods, normalizeControllerQueryParams, prefixRouteNameArg, stashParamNames, + type ExpandedControllerQueryParam, + type NamedRouteArgs, + type RouteArgs, } from '../utils'; import generateController from './generate_controller'; -import type { QueryParam } from './router'; -import EmberRouter from './router'; +import EmberRouter, { type QueryParam } from './router'; export interface ExtendedInternalRouteInfo extends InternalRouteInfo { _names?: unknown[]; diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts index f6ebc554c2a..41f276cc720 100644 --- a/packages/@ember/-internals/routing/lib/system/router.ts +++ b/packages/@ember/-internals/routing/lib/system/router.ts @@ -1,8 +1,7 @@ import { privatize as P } from '@ember/-internals/container'; -import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer'; +import { type OutletState as GlimmerOutletState, type OutletView } from '@ember/-internals/glimmer'; import { computed, get, set } from '@ember/-internals/metal'; -import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { getOwner, type Factory, type FactoryClass, type Owner } from '@ember/-internals/owner'; import { BucketCache } from '@ember/-internals/routing'; import type RouterService from '@ember/-internals/routing/lib/services/router'; import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime'; @@ -10,19 +9,24 @@ import { assert, deprecate, info } from '@ember/debug'; import EmberError from '@ember/error'; import { cancel, once, run, scheduleOnce } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import type { EmberLocation as IEmberLocation } from '../location/api'; -import EmberLocation from '../location/api'; -import type { RouteArgs, RouteOptions } from '../utils'; -import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils'; -import type { DSLCallback } from './dsl'; -import DSL from './dsl'; -import type { QueryParamMeta, RenderOptions } from './route'; +import EmberLocation, { type EmberLocation as IEmberLocation } from '../location/api'; +import { + calculateCacheKey, + extractRouteArgs, + getActiveTargetName, + resemblesURL, + type RouteArgs, + type RouteOptions, +} from '../utils'; +import DSL, { type DSLCallback } from './dsl'; import type Route from './route'; import { defaultSerialize, getFullQueryParams, hasDefaultSerialize, ROUTE_CONNECTIONS, + type QueryParamMeta, + type RenderOptions, } from './route'; import RouterState from './router_state'; @@ -30,21 +34,22 @@ import RouterState from './router_state'; @module @ember/routing */ -import type { - InternalRouteInfo, - ModelFor, - RouteInfo, - RouteInfoWithAttributes, - Transition, - TransitionError, - TransitionState, +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 { EngineRouteInfo } from './engines'; +import { type Timer } from 'backburner'; +import { type EngineRouteInfo } from './engines'; import EngineInstance from '@ember/engine/instance'; -import type { QueryParams } from 'route-recognizer'; -import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types'; +import { type QueryParams } from 'route-recognizer'; +import { type AnyFn, type MethodNamesOf, type OmitFirst } from '@ember/-internals/utils/types'; function defaultDidTransition( this: EmberRouter, diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts index 810d1e351de..4846fbbf2e0 100644 --- a/packages/@ember/-internals/routing/lib/system/router_state.ts +++ b/packages/@ember/-internals/routing/lib/system/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 './route'; diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts index 0e5e5471687..a268dfbe00a 100644 --- a/packages/@ember/-internals/routing/lib/utils.ts +++ b/packages/@ember/-internals/routing/lib/utils.ts @@ -1,16 +1,15 @@ import { get } from '@ember/-internals/metal'; import { getOwner } from '@ember/-internals/owner'; -import type { - ControllerQueryParam, - ControllerQueryParamType, +import { + type ControllerQueryParam, + type ControllerQueryParamType, } from '@ember/controller/lib/controller_mixin'; import { assert, deprecate } from '@ember/debug'; import EngineInstance from '@ember/engine/instance'; import EmberError from '@ember/error'; -import type { InternalRouteInfo, ModelFor } from 'router_js'; import type Router from 'router_js'; -import { STATE_SYMBOL } from 'router_js'; -import type { ExtendedInternalRouteInfo } from './system/route'; +import { STATE_SYMBOL, type InternalRouteInfo, type ModelFor } from 'router_js'; +import { type ExtendedInternalRouteInfo } from './system/route'; import type Route from './system/route'; import type EmberRouter from './system/router'; diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts index c6f7775e1b8..b76d3662b9f 100644 --- a/packages/@ember/-internals/runtime/lib/compare.ts +++ b/packages/@ember/-internals/runtime/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 './mixins/comparable'; import { assert } from '@ember/debug'; diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts index 5465507604d..17b75bb2ed8 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 { + combine, + updateTag, + tagFor, + tagMetaFor, + type UpdatableTag, + type Tag, +} from '@glimmer/validator'; export function contentFor(proxy: ProxyMixin): T | null { let content = get(proxy, 'content'); diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.ts b/packages/@ember/-internals/runtime/lib/mixins/array.ts index e99c23c1cfc..71758014560 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/array.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/array.ts @@ -22,8 +22,8 @@ import { ENV } from '@ember/-internals/environment'; import Observable from '../mixins/observable'; import MutableEnumerable from './mutable_enumerable'; import { typeOf } from '../type-of'; -import type { AnyFn } from '@ember/-internals/utils/types'; -import type { ComputedPropertyCallback } from '@ember/-internals/metal/lib/computed'; +import { type AnyFn } from '@ember/-internals/utils/types'; +import { type ComputedPropertyCallback } from '@ember/-internals/metal/lib/computed'; type Value = K extends keyof T ? T[K] : unknown; diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts index 39d411fc915..ae045ed5d2d 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts @@ -2,11 +2,11 @@ import { schedule, join } from '@ember/runloop'; /** @module ember */ -import type { FactoryManager } from '@ember/-internals/container/lib/container'; +import { type FactoryManager } from '@ember/-internals/container/lib/container'; import type Container from '@ember/-internals/container/lib/container'; -import type { TypeOptions } from '@ember/-internals/container/lib/registry'; +import { type TypeOptions } from '@ember/-internals/container/lib/registry'; import { Mixin } from '@ember/-internals/metal'; -import type { Factory } from '@ember/-internals/owner'; +import { type Factory } 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/promise_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts index 7e41b6bd327..19e7227317d 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts @@ -1,5 +1,5 @@ import { get, setProperties, computed, Mixin } from '@ember/-internals/metal'; -import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types'; +import { type AnyFn, type MethodNamesOf } from '@ember/-internals/utils/types'; import EmberError from '@ember/error'; import type RSVP from 'rsvp'; import type CoreObject from '../system/core_object'; diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts index 10537cde256..1358868db47 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts @@ -2,11 +2,11 @@ @module ember */ -import type { Registry } from '@ember/-internals/container'; -import type { TypeOptions } from '@ember/-internals/container/lib/registry'; +import { type Registry } from '@ember/-internals/container'; +import { type TypeOptions } from '@ember/-internals/container/lib/registry'; import { Mixin } from '@ember/-internals/metal'; -import type { Factory } from '@ember/-internals/owner'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type Factory } from '@ember/-internals/owner'; +import { type AnyFn } from '@ember/-internals/utils/types'; import { assert } from '@ember/debug'; // This is defined as a separate interface so that it can be used in the definition of diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts index b025402f2aa..acb74a21f85 100644 --- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts +++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts @@ -19,9 +19,16 @@ import EmberObject from './object'; import EmberArray, { MutableArray } from '../mixins/array'; import { assert } from '@ember/debug'; import { setCustomTagFor } from '@glimmer/manager'; -import type { Tag, Revision } from '@glimmer/validator'; -import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator'; -import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events'; +import { + combine, + consumeTag, + validateTag, + valueForTag, + tagFor, + type Tag, + type Revision, +} from '@glimmer/validator'; +import { type PropertyDidChange } from '@ember/-internals/metal/lib/property_events'; function isMutable(obj: T[] | EmberArray): obj is T[] | MutableArray { return Array.isArray(obj) || typeof (obj as MutableArray).replace === 'function'; diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts index 14904e8542b..e89253b6977 100644 --- a/packages/@ember/-internals/runtime/lib/system/core_object.ts +++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts @@ -3,11 +3,9 @@ */ import { getFactoryFor, setFactoryFor } from '@ember/-internals/container'; -import { getOwner } from '@ember/-internals/owner'; -import type { Owner } from '@ember/-internals/owner'; +import { getOwner, type Owner } from '@ember/-internals/owner'; import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils'; import { meta } from '@ember/-internals/meta'; -import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal'; import { PROXY_CONTENT, sendEvent, @@ -19,6 +17,8 @@ import { isClassicDecorator, DEBUG_INJECTION_FUNCTIONS, hasUnknownProperty, + type ComputedProperty, + type HasUnknownProperty, } from '@ember/-internals/metal'; import ActionHandler from '../mixins/action_handler'; import { assert } from '@ember/debug'; diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts index 13da81f4b66..dee721e1a2a 100644 --- a/packages/@ember/-internals/utils/lib/ember-array.ts +++ b/packages/@ember/-internals/utils/lib/ember-array.ts @@ -1,4 +1,4 @@ -import type { Array as EmberArray } from '@ember/-internals/runtime'; +import { type Array as EmberArray } from '@ember/-internals/runtime'; import { _WeakSet } from '@glimmer/util'; const EMBER_ARRAYS = new _WeakSet(); 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 232f24d016b..4ba7bcd59f5 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 { Owner, TypeOptions } from '@ember/-internals/owner'; +import { type Owner, type TypeOptions } from '@ember/-internals/owner'; import { Object as EmberObject } from '@ember/-internals/runtime'; 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 1495dcada03..79fa58340b4 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 { Mixin, nativeDescDecorator } from '@ember/-internals/metal'; 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 ad7077ba5db..aa592521be3 100644 --- a/packages/@ember/-internals/views/lib/mixins/view_support.ts +++ b/packages/@ember/-internals/views/lib/mixins/view_support.ts @@ -4,8 +4,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 30a903f4094..928fbe6172a 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 { Object as EmberObject } from '@ember/-internals/runtime'; 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 cbcfc94833b..110abdfe0dd 100644 --- a/packages/@ember/-internals/views/lib/system/utils.ts +++ b/packages/@ember/-internals/views/lib/system/utils.ts @@ -1,10 +1,9 @@ -import type { View } from '@ember/-internals/glimmer/lib/renderer'; -import type { Owner } from '@ember/-internals/owner'; -import { getOwner } from '@ember/-internals/owner'; +import { type View } from '@ember/-internals/glimmer/lib/renderer'; +import { getOwner, type Owner } 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 bec610a2df9..91b4e811ea1 100644 --- a/packages/@ember/-internals/views/lib/views/core_view.ts +++ b/packages/@ember/-internals/views/lib/views/core_view.ts @@ -1,8 +1,7 @@ -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, Evented, FrameworkObject } from '@ember/-internals/runtime'; -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/-internals/views/lib/views/states/default.ts b/packages/@ember/-internals/views/lib/views/states/default.ts index 0bd4a1b17a3..3bd4020ebbd 100644 --- a/packages/@ember/-internals/views/lib/views/states/default.ts +++ b/packages/@ember/-internals/views/lib/views/states/default.ts @@ -1,5 +1,5 @@ import EmberError from '@ember/error'; -import type { ViewState } from '../states'; +import { type ViewState } from '../states'; const _default: ViewState = { // appendChild is only legal while rendering the buffer. diff --git a/packages/@ember/-internals/views/lib/views/states/destroying.ts b/packages/@ember/-internals/views/lib/views/states/destroying.ts index 11f3a685b41..26ed7d34a26 100644 --- a/packages/@ember/-internals/views/lib/views/states/destroying.ts +++ b/packages/@ember/-internals/views/lib/views/states/destroying.ts @@ -1,5 +1,5 @@ import EmberError from '@ember/error'; -import type { ViewState } from '../states'; +import { type ViewState } from '../states'; import _default from './default'; const destroying: ViewState = { diff --git a/packages/@ember/-internals/views/lib/views/states/has_element.ts b/packages/@ember/-internals/views/lib/views/states/has_element.ts index 8e4a8d151af..3a07da4c670 100644 --- a/packages/@ember/-internals/views/lib/views/states/has_element.ts +++ b/packages/@ember/-internals/views/lib/views/states/has_element.ts @@ -2,7 +2,7 @@ import _default from './default'; import { join } from '@ember/runloop'; import { flaggedInstrument } from '@ember/instrumentation'; import type Component from '@ember/component'; -import type { ViewState } from '../states'; +import { type ViewState } from '../states'; const hasElement: ViewState = { ..._default, diff --git a/packages/@ember/-internals/views/lib/views/states/in_dom.ts b/packages/@ember/-internals/views/lib/views/states/in_dom.ts index 6a1a6a71897..ffa9aab3e43 100644 --- a/packages/@ember/-internals/views/lib/views/states/in_dom.ts +++ b/packages/@ember/-internals/views/lib/views/states/in_dom.ts @@ -3,7 +3,7 @@ import type Component from '@ember/component'; import { assert } from '@ember/debug'; import EmberError from '@ember/error'; import { DEBUG } from '@glimmer/env'; -import type { ViewState } from '../states'; +import { type ViewState } from '../states'; import hasElement from './has_element'; const inDOM: ViewState = { diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts index b4f2e6a0d03..a731a39358a 100644 --- a/packages/@ember/application/instance.ts +++ b/packages/@ember/application/instance.ts @@ -7,13 +7,12 @@ import * as environment from '@ember/-internals/browser-environment'; import EngineInstance from '@ember/engine/instance'; import type Application from './lib/application'; import { renderSettled } from '@ember/-internals/glimmer'; -import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; +import { type BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; import { assert } from '@ember/debug'; import { Router } from '@ember/-internals/routing'; -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 { EventDispatcher, type ViewMixin } from '@ember/-internals/views'; +import { type Registry } from '@ember/-internals/container'; +import { type SimpleElement } from '@simple-dom/interface'; export interface BootOptions { isBrowser?: boolean; diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts index 8a332f6ffa7..fa1168ff219 100644 --- a/packages/@ember/application/lib/application.ts +++ b/packages/@ember/application/lib/application.ts @@ -21,15 +21,13 @@ import { NoneLocation, BucketCache, } from '@ember/-internals/routing'; -import type { BootOptions } from '../instance'; -import ApplicationInstance from '../instance'; +import ApplicationInstance, { type BootOptions } from '../instance'; import Engine, { buildInitializerMethod } from '@ember/engine'; -import type { Container, Registry } from '@ember/-internals/container'; -import { privatize as P } from '@ember/-internals/container'; +import { privatize as P, type Container, type Registry } from '@ember/-internals/container'; import { setupApplicationRegistry } from '@ember/-internals/glimmer'; import { RouterService } from '@ember/-internals/routing'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; -import type { SimpleDocument, SimpleElement } from '@simple-dom/interface'; +import { type EngineInstanceOptions } from '@ember/engine/instance'; +import { type SimpleDocument, type SimpleElement } from '@simple-dom/interface'; /** An instance of `Application` is the starting point for every Ember diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts index 34cf4dc36d9..0d40dcfedbf 100644 --- a/packages/@ember/application/type-tests/index.test.ts +++ b/packages/@ember/application/type-tests/index.test.ts @@ -1,7 +1,7 @@ -import type { EventDispatcher } from '@ember/-internals/views'; +import { type EventDispatcher } from '@ember/-internals/views'; import Application, { getOwner, setOwner } from '@ember/application'; import type ApplicationInstance from '@ember/application/instance'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts index afd3572c5bb..3e811a1115d 100644 --- a/packages/@ember/application/type-tests/instance.test.ts +++ b/packages/@ember/application/type-tests/instance.test.ts @@ -1,6 +1,6 @@ -import type { Factory, Owner } from '@ember/-internals/owner'; +import { type Factory, type Owner } from '@ember/-internals/owner'; import Application from '@ember/application'; -import type { BootOptions } from '@ember/application/instance'; +import { type BootOptions } from '@ember/application/instance'; import type ApplicationInstance from '@ember/application/instance'; import type EngineInstance from '@ember/engine/instance'; import EmberObject from '@ember/object'; diff --git a/packages/@ember/array/type-tests/index.ts b/packages/@ember/array/type-tests/index.ts index a15c8c150ef..a787d490341 100644 --- a/packages/@ember/array/type-tests/index.ts +++ b/packages/@ember/array/type-tests/index.ts @@ -1,6 +1,5 @@ -import type { NativeArray } from '@ember/array'; import type EmberArray from '@ember/array'; -import { A, isArray, makeArray } from '@ember/array'; +import { A, isArray, makeArray, type NativeArray } from '@ember/array'; import type MutableArray from '@ember/array/mutable'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/array/type-tests/proxy.ts b/packages/@ember/array/type-tests/proxy.ts index 6821586a073..595b119c434 100644 --- a/packages/@ember/array/type-tests/proxy.ts +++ b/packages/@ember/array/type-tests/proxy.ts @@ -1,6 +1,5 @@ -import type { NativeArray } from '@ember/array'; import type EmberArray from '@ember/array'; -import { A } from '@ember/array'; +import { A, type NativeArray } from '@ember/array'; import ArrayProxy from '@ember/array/proxy'; import type MutableArray from '@ember/array/mutable'; diff --git a/packages/@ember/component/type-tests/get-component-template.test.ts b/packages/@ember/component/type-tests/get-component-template.test.ts index 2acd0a5a365..485869c3381 100644 --- a/packages/@ember/component/type-tests/get-component-template.test.ts +++ b/packages/@ember/component/type-tests/get-component-template.test.ts @@ -1,5 +1,5 @@ import { getComponentTemplate } from '@ember/component'; -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; import { expectTypeOf } from 'expect-type'; expectTypeOf(getComponentTemplate({})).toEqualTypeOf(); diff --git a/packages/@ember/component/type-tests/helper/helper.test.ts b/packages/@ember/component/type-tests/helper/helper.test.ts index cdd73f4eedd..04937cb00d0 100644 --- a/packages/@ember/component/type-tests/helper/helper.test.ts +++ b/packages/@ember/component/type-tests/helper/helper.test.ts @@ -1,4 +1,4 @@ -import type { HelperFactory, SimpleHelper } from '@ember/-internals/glimmer/lib/helper'; +import { type HelperFactory, type SimpleHelper } from '@ember/-internals/glimmer/lib/helper'; import { helper } from '@ember/component/helper'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts index 009756cf990..ac6d6556a05 100644 --- a/packages/@ember/component/type-tests/helper/index.test.ts +++ b/packages/@ember/component/type-tests/helper/index.test.ts @@ -1,5 +1,5 @@ -import type { Owner } from '@ember/-internals/owner'; -import type { FrameworkObject } from '@ember/-internals/runtime'; +import { type Owner } from '@ember/-internals/owner'; +import { type FrameworkObject } from '@ember/-internals/runtime'; import Helper from '@ember/component/helper'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/component/type-tests/index.test.ts b/packages/@ember/component/type-tests/index.test.ts index e8fc4bae0e9..8ea20cc47c3 100644 --- a/packages/@ember/component/type-tests/index.test.ts +++ b/packages/@ember/component/type-tests/index.test.ts @@ -1,7 +1,7 @@ import Component from '@ember/component'; -import type { CoreView } from '@ember/-internals/views'; +import { type CoreView } from '@ember/-internals/views'; import { expectTypeOf } from 'expect-type'; -import type { View } from '@ember/-internals/glimmer/lib/renderer'; +import { type View } from '@ember/-internals/glimmer/lib/renderer'; const MyComponent = Component.extend(); diff --git a/packages/@ember/component/type-tests/set-component-manager.test.ts b/packages/@ember/component/type-tests/set-component-manager.test.ts index ee2b87c4d50..a7d1d519c8b 100644 --- a/packages/@ember/component/type-tests/set-component-manager.test.ts +++ b/packages/@ember/component/type-tests/set-component-manager.test.ts @@ -1,6 +1,6 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { setComponentManager } from '@ember/component'; -import type { ComponentManager } from '@glimmer/interfaces'; +import { type ComponentManager } from '@glimmer/interfaces'; import { expectTypeOf } from 'expect-type'; // Obviously this is invalid, but it works for our purposes. diff --git a/packages/@ember/component/type-tests/set-component-template.test.ts b/packages/@ember/component/type-tests/set-component-template.test.ts index 9cf8615b4c4..18e91c02027 100644 --- a/packages/@ember/component/type-tests/set-component-template.test.ts +++ b/packages/@ember/component/type-tests/set-component-template.test.ts @@ -1,5 +1,5 @@ import { setComponentTemplate } from '@ember/component'; -import type { TemplateFactory } from '@glimmer/interfaces'; +import { type TemplateFactory } from '@glimmer/interfaces'; import { expectTypeOf } from 'expect-type'; // Good enough for testing diff --git a/packages/@ember/component/type-tests/template-only.test.ts b/packages/@ember/component/type-tests/template-only.test.ts index 77cfa79575d..5bc3ec1447c 100644 --- a/packages/@ember/component/type-tests/template-only.test.ts +++ b/packages/@ember/component/type-tests/template-only.test.ts @@ -1,5 +1,5 @@ import templateOnlyComponent from '@ember/component/template-only'; -import type { TemplateOnlyComponentDefinition } from '@glimmer/runtime/dist/types/lib/component/template-only'; +import { type TemplateOnlyComponentDefinition } from '@glimmer/runtime/dist/types/lib/component/template-only'; import { expectTypeOf } from 'expect-type'; expectTypeOf(templateOnlyComponent()).toEqualTypeOf(); diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts index 4562ee425aa..03e3050fd08 100644 --- a/packages/@ember/controller/index.ts +++ b/packages/@ember/controller/index.ts @@ -1,7 +1,10 @@ import { FrameworkObject } from '@ember/-internals/runtime'; -import { inject as metalInject } from '@ember/-internals/metal'; +import { + inject as metalInject, + type DecoratorPropertyDescriptor, + type ElementDescriptor, +} from '@ember/-internals/metal'; import ControllerMixin from './lib/controller_mixin'; -import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal'; /** @module @ember/controller diff --git a/packages/@ember/controller/lib/controller_mixin.ts b/packages/@ember/controller/lib/controller_mixin.ts index 06d9d58ceda..27c34e826fc 100644 --- a/packages/@ember/controller/lib/controller_mixin.ts +++ b/packages/@ember/controller/lib/controller_mixin.ts @@ -1,9 +1,9 @@ import { Mixin, computed } from '@ember/-internals/metal'; -import type { RouteArgs } from '@ember/-internals/routing/lib/utils'; +import { type RouteArgs } from '@ember/-internals/routing/lib/utils'; import { ActionHandler } from '@ember/-internals/runtime'; import { symbol } from '@ember/-internals/utils'; import type Route from '@ember/routing/route'; -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/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts index 70874c0f95d..c3f2b466e21 100644 --- a/packages/@ember/controller/type-tests/index.test.ts +++ b/packages/@ember/controller/type-tests/index.test.ts @@ -1,4 +1,4 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import Controller, { inject } from '@ember/controller'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts index c458b3e4be2..6533084e02b 100644 --- a/packages/@ember/debug/index.ts +++ b/packages/@ember/debug/index.ts @@ -1,12 +1,10 @@ import { isChrome, isFirefox } from '@ember/-internals/browser-environment'; -import type { AnyFn } from '@ember/-internals/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/types'; import EmberError from '@ember/error'; 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 { inspect } from '@ember/-internals/utils'; export { registerHandler as registerWarnHandler } from './lib/warn'; diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts index 564d4b23cb2..17da8295f84 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 { Owner } from '@ember/-internals/owner'; -import type { CapturedRenderNode } from '@glimmer/interfaces'; +import { type Renderer } from '@ember/-internals/glimmer'; +import { type Owner } from '@ember/-internals/owner'; +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 d0f4557dab4..323b67f5ab4 100644 --- a/packages/@ember/debug/lib/deprecate.ts +++ b/packages/@ember/debug/lib/deprecate.ts @@ -2,8 +2,11 @@ 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 { + invoke, + registerHandler as genericRegisterHandler, + type HandlerCallback, +} from './handlers'; declare global { const __fail__: { diff --git a/packages/@ember/debug/lib/warn.ts b/packages/@ember/debug/lib/warn.ts index 6c1711ea765..edf9daf7b0e 100644 --- a/packages/@ember/debug/lib/warn.ts +++ b/packages/@ember/debug/lib/warn.ts @@ -1,8 +1,11 @@ import { DEBUG } from '@glimmer/env'; import { assert } from '../index'; -import type { HandlerCallback } from './handlers'; -import { invoke, registerHandler as genericRegisterHandler } from './handlers'; +import { + invoke, + registerHandler as genericRegisterHandler, + type HandlerCallback, +} from './handlers'; export interface WarnOptions { id: string; diff --git a/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts index a84a85d9425..66d6126bfd5 100644 --- a/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts +++ b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts @@ -1,7 +1,7 @@ import { registerDeprecationHandler } from '@ember/debug'; import { expectTypeOf } from 'expect-type'; -import type { DeprecationOptions } from '../lib/deprecate'; -import type { Handler } from '../lib/handlers'; +import { type DeprecationOptions } from '../lib/deprecate'; +import { type Handler } from '../lib/handlers'; let ret = registerDeprecationHandler((message, options, next) => { expectTypeOf(message).toEqualTypeOf(); diff --git a/packages/@ember/debug/type-tests/register-warn-handler.test.ts b/packages/@ember/debug/type-tests/register-warn-handler.test.ts index 064f2d5a4cf..c65ea25bf24 100644 --- a/packages/@ember/debug/type-tests/register-warn-handler.test.ts +++ b/packages/@ember/debug/type-tests/register-warn-handler.test.ts @@ -1,7 +1,7 @@ import { registerWarnHandler } from '@ember/debug'; import { expectTypeOf } from 'expect-type'; -import type { Handler } from '../lib/handlers'; -import type { WarnOptions } from '../lib/warn'; +import { type Handler } from '../lib/handlers'; +import { type WarnOptions } from '../lib/warn'; let ret = registerWarnHandler((message, options, next) => { expectTypeOf(message).toEqualTypeOf(); diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts index 4c33154b453..0dfa9e7904f 100644 --- a/packages/@ember/engine/index.ts +++ b/packages/@ember/engine/index.ts @@ -7,14 +7,13 @@ import { Registry } from '@ember/-internals/container'; import DAG from 'dag-map'; import { assert } from '@ember/debug'; import { get, set } from '@ember/-internals/metal'; -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/-internals/routing'; import { ContainerDebugAdapter } from '@ember/-internals/extension-support'; import { ComponentLookup } from '@ember/-internals/views'; import { setupEngineRegistry } from '@ember/-internals/glimmer'; import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy'; -import type { ResolverClass } from '@ember/-internals/container/lib/registry'; +import { type ResolverClass } from '@ember/-internals/container/lib/registry'; function props(obj: object) { let properties = []; diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts index 54f3cd76836..3ff85d5734c 100644 --- a/packages/@ember/engine/instance.ts +++ b/packages/@ember/engine/instance.ts @@ -13,8 +13,8 @@ import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_ import { isFactory } from '@ember/-internals/owner'; import Engine from '.'; import type Application from '@ember/application'; -import type { BootOptions } from '@ember/application/instance'; -import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; +import { type BootOptions } from '@ember/application/instance'; +import { type BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet'; const CEngine = Engine; diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts index 6002b05edde..204d4b4bd0f 100644 --- a/packages/@ember/engine/type-tests/index.test.ts +++ b/packages/@ember/engine/type-tests/index.test.ts @@ -1,8 +1,7 @@ -import type { ResolverClass, TypeOptions } from '@ember/-internals/container/lib/registry'; -import type { Factory, Owner } from '@ember/-internals/owner'; +import { type ResolverClass, type TypeOptions } from '@ember/-internals/container/lib/registry'; +import { type Factory, type Owner } from '@ember/-internals/owner'; import type Namespace from '@ember/application/namespace'; -import type { Initializer } from '@ember/engine'; -import Engine from '@ember/engine'; +import Engine, { type Initializer } from '@ember/engine'; import type EngineInstance from '@ember/engine/instance'; import EmberObject from '@ember/object'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts index b5e28dda8e5..cdef2caa08f 100644 --- a/packages/@ember/engine/type-tests/instance.test.ts +++ b/packages/@ember/engine/type-tests/instance.test.ts @@ -1,4 +1,4 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import EngineInstance from '@ember/engine/instance'; import type EmberObject from '@ember/object'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts index 9cec53e2729..f4f086c52e1 100644 --- a/packages/@ember/helper/type-tests/invoke-helper.test.ts +++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts @@ -2,7 +2,7 @@ import Component from '@ember/-internals/glimmer/lib/component'; import { getValue } from '@ember/-internals/metal'; import Helper from '@ember/component/helper'; import { invokeHelper } from '@ember/helper'; -import type { Cache } from '@glimmer/validator'; +import { type Cache } from '@glimmer/validator'; import { expectTypeOf } from 'expect-type'; // NOTE: The types should probably be stricter, but they're from glimmer itself diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts index d6138bad37f..76446773262 100644 --- a/packages/@ember/helper/type-tests/set-helper-manager.test.ts +++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts @@ -1,11 +1,11 @@ -import type { - HelperFactory, - HelperFunction, - SimpleHelper, +import { + type HelperFactory, + type HelperFunction, + type SimpleHelper, } from '@ember/-internals/glimmer/lib/helper'; import { getDebugName } from '@ember/-internals/utils'; import { capabilities, setHelperManager } from '@ember/helper'; -import type { Arguments, Dict, HelperManager } from '@glimmer/interfaces'; +import { type Arguments, type Dict, type HelperManager } from '@glimmer/interfaces'; import { expectTypeOf } from 'expect-type'; class Wrapper = Dict> diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts index 7458b9c0607..b02d848c8f2 100644 --- a/packages/@ember/object/compat.ts +++ b/packages/@ember/object/compat.ts @@ -1,14 +1,14 @@ -import type { Meta } from '@ember/-internals/meta'; -import type { ExtendedMethodDecorator, DecoratorPropertyDescriptor } from '@ember/-internals/metal'; +import { type Meta } from '@ember/-internals/meta'; import { descriptorForProperty, isElementDescriptor, setClassicDecorator, + type ExtendedMethodDecorator, + type DecoratorPropertyDescriptor, } from '@ember/-internals/metal'; -import type { ElementDescriptor } from '@ember/-internals/metal/lib/decorator'; +import { type ElementDescriptor } from '@ember/-internals/metal/lib/decorator'; import { assert } from '@ember/debug'; -import type { UpdatableTag } from '@glimmer/validator'; -import { consumeTag, tagFor, track, updateTag } from '@glimmer/validator'; +import { consumeTag, tagFor, track, updateTag, type UpdatableTag } from '@glimmer/validator'; let wrapGetterSetter = function (target: object, key: string, desc: PropertyDescriptor) { let { get: originalGet } = desc; diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts index b0528068aea..51ea5b91e1f 100644 --- a/packages/@ember/object/index.ts +++ b/packages/@ember/object/index.ts @@ -1,6 +1,10 @@ import { assert } from '@ember/debug'; -import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal'; -import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal'; +import { + isElementDescriptor, + setClassicDecorator, + type ElementDescriptor, + type ExtendedMethodDecorator, +} from '@ember/-internals/metal'; export { Object as default } from '@ember/-internals/runtime'; diff --git a/packages/@ember/object/lib/computed/computed_macros.ts b/packages/@ember/object/lib/computed/computed_macros.ts index b294766d914..39ed39d64d6 100644 --- a/packages/@ember/object/lib/computed/computed_macros.ts +++ b/packages/@ember/object/lib/computed/computed_macros.ts @@ -8,8 +8,7 @@ import { alias, expandProperties, } from '@ember/-internals/metal'; -import type { DeprecationOptions } from '@ember/debug'; -import { assert, deprecate } from '@ember/debug'; +import { assert, deprecate, type DeprecationOptions } from '@ember/debug'; /** @module @ember/object diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts index 264747c1e1c..e962cfaec76 100644 --- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts +++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts @@ -5,8 +5,7 @@ import { DEBUG } from '@glimmer/env'; import { assert } from '@ember/debug'; import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal'; import { compare, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime'; -import type { NativeArray } from '@ember/-internals/runtime/lib/mixins/array'; -import EmberArray from '@ember/-internals/runtime/lib/mixins/array'; +import EmberArray, { type NativeArray } from '@ember/-internals/runtime/lib/mixins/array'; function isNativeOrEmberArray(obj: unknown): obj is unknown[] | EmberArray { return Array.isArray(obj) || EmberArray.detect(obj); diff --git a/packages/@ember/object/type-tests/action.test.ts b/packages/@ember/object/type-tests/action.test.ts index 3ea07ed7596..9f5bbf84b2e 100644 --- a/packages/@ember/object/type-tests/action.test.ts +++ b/packages/@ember/object/type-tests/action.test.ts @@ -1,7 +1,7 @@ import { expectTypeOf } from 'expect-type'; import { action } from '@ember/object'; -import type { ExtendedMethodDecorator } from '@ember/-internals/metal/lib/decorator'; +import { type ExtendedMethodDecorator } from '@ember/-internals/metal/lib/decorator'; expectTypeOf(action).toMatchTypeOf(); diff --git a/packages/@ember/object/type-tests/computed/alias.test.ts b/packages/@ember/object/type-tests/computed/alias.test.ts index e04ad389e71..7aec83ff11a 100644 --- a/packages/@ember/object/type-tests/computed/alias.test.ts +++ b/packages/@ember/object/type-tests/computed/alias.test.ts @@ -1,4 +1,4 @@ -import type { AliasDecorator } from '@ember/-internals/metal/lib/alias'; +import { type AliasDecorator } from '@ember/-internals/metal/lib/alias'; import { alias } from '@ember/object/computed'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts index a8efec698f2..23570016a1f 100644 --- a/packages/@ember/object/type-tests/core/index.test.ts +++ b/packages/@ember/object/type-tests/core/index.test.ts @@ -1,4 +1,4 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import CoreObject from '@ember/object/core'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts index dbe809bdc70..776f058e353 100644 --- a/packages/@ember/object/type-tests/ember-object.test.ts +++ b/packages/@ember/object/type-tests/ember-object.test.ts @@ -1,7 +1,7 @@ import { expectTypeOf } from 'expect-type'; import EmberObject from '@ember/object'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; // Good enough for tests let owner = {} as Owner; diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts index f4c4f5bda8d..69d92ffa123 100644 --- a/packages/@ember/object/type-tests/events/index.test.ts +++ b/packages/@ember/object/type-tests/events/index.test.ts @@ -2,7 +2,7 @@ import { addListener, removeListener, sendEvent } from '@ember/object/events'; import EmberObject from '@ember/object'; import { on } from '@ember/object/evented'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; class Job extends EmberObject { logStartOrUpdate = on('started', 'updated', () => { diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts index ef04fdde681..728c925175d 100644 --- a/packages/@ember/routing/type-tests/auto-location.test.ts +++ b/packages/@ember/routing/type-tests/auto-location.test.ts @@ -1,7 +1,7 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import type EmberObject from '@ember/object'; import AutoLocation from '@ember/routing/auto-location'; -import type { ILocation } from '@ember/routing/location'; +import { type ILocation } from '@ember/routing/location'; import { expectTypeOf } from 'expect-type'; // Good enough for tests diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts index 3fd50fe8d7a..a1cbbe7bcc7 100644 --- a/packages/@ember/routing/type-tests/hash-location.test.ts +++ b/packages/@ember/routing/type-tests/hash-location.test.ts @@ -1,8 +1,8 @@ -import type { ILocation } from '@ember/routing/location'; +import { type ILocation } from '@ember/routing/location'; import type EmberObject from '@ember/object'; import HashLocation from '@ember/routing/hash-location'; import { expectTypeOf } from 'expect-type'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; // Good enough for tests let owner = {} as Owner; diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts index c3fe61e6eeb..79bab24a9ea 100644 --- a/packages/@ember/routing/type-tests/history-location.test.ts +++ b/packages/@ember/routing/type-tests/history-location.test.ts @@ -1,7 +1,7 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import type EmberObject from '@ember/object'; import HistoryLocation from '@ember/routing/history-location'; -import type { ILocation } from '@ember/routing/location'; +import { type ILocation } from '@ember/routing/location'; import { expectTypeOf } from 'expect-type'; // Good enough for tests diff --git a/packages/@ember/routing/type-tests/link-to.test.ts b/packages/@ember/routing/type-tests/link-to.test.ts index 6346c34988f..4138e6f49b5 100644 --- a/packages/@ember/routing/type-tests/link-to.test.ts +++ b/packages/@ember/routing/type-tests/link-to.test.ts @@ -1,4 +1,4 @@ -import type { OpaqueInternalComponentConstructor } from '@ember/-internals/glimmer/lib/components/internal'; +import { type OpaqueInternalComponentConstructor } from '@ember/-internals/glimmer/lib/components/internal'; import { LinkTo } from '@ember/routing'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/routing/type-tests/location.test.ts b/packages/@ember/routing/type-tests/location.test.ts index 9bfae6cebb7..da234603561 100644 --- a/packages/@ember/routing/type-tests/location.test.ts +++ b/packages/@ember/routing/type-tests/location.test.ts @@ -1,5 +1,4 @@ -import type { ILocation } from '@ember/routing/location'; -import Location from '@ember/routing/location'; +import Location, { type ILocation } from '@ember/routing/location'; import { expectTypeOf } from 'expect-type'; // This is deprecated so let's not bother with more testing diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts index 63fe6cbeca3..6798a42213e 100644 --- a/packages/@ember/routing/type-tests/none-location.test.ts +++ b/packages/@ember/routing/type-tests/none-location.test.ts @@ -1,8 +1,8 @@ import type EmberObject from '@ember/object'; import NoneLocation from '@ember/routing/none-location'; -import type { ILocation } from '@ember/routing/location'; +import { type ILocation } from '@ember/routing/location'; import { expectTypeOf } from 'expect-type'; -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; // Good enough for tests let owner = {} as Owner; diff --git a/packages/@ember/routing/type-tests/route/index.test.ts b/packages/@ember/routing/type-tests/route/index.test.ts index 72d4c8dced5..03e607706a5 100644 --- a/packages/@ember/routing/type-tests/route/index.test.ts +++ b/packages/@ember/routing/type-tests/route/index.test.ts @@ -1,9 +1,9 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import type Controller from '@ember/controller'; import type EmberObject from '@ember/object'; import Route from '@ember/routing/route'; import { expectTypeOf } from 'expect-type'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; // NOTE: This is invalid, but acceptable for type tests let owner = {} as Owner; diff --git a/packages/@ember/routing/type-tests/route/overrides.test.ts b/packages/@ember/routing/type-tests/route/overrides.test.ts index cdc718ac1f4..1fa7dc26628 100644 --- a/packages/@ember/routing/type-tests/route/overrides.test.ts +++ b/packages/@ember/routing/type-tests/route/overrides.test.ts @@ -1,8 +1,8 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import type Controller from '@ember/controller'; import { action } from '@ember/object'; import Route from '@ember/routing/route'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; // NOTE: This is invalid, but acceptable for type tests let owner = {} as Owner; diff --git a/packages/@ember/routing/type-tests/route/query-params.test.ts b/packages/@ember/routing/type-tests/route/query-params.test.ts index ccb5dd61645..6454e3321d1 100644 --- a/packages/@ember/routing/type-tests/route/query-params.test.ts +++ b/packages/@ember/routing/type-tests/route/query-params.test.ts @@ -1,4 +1,4 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import Route from '@ember/routing/route'; // NOTE: This is invalid, but acceptable for type tests diff --git a/packages/@ember/routing/type-tests/route/send.test.ts b/packages/@ember/routing/type-tests/route/send.test.ts index 2ab8c12b9fc..978e093a48d 100644 --- a/packages/@ember/routing/type-tests/route/send.test.ts +++ b/packages/@ember/routing/type-tests/route/send.test.ts @@ -1,4 +1,4 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import { action } from '@ember/object'; import Route from '@ember/routing/route'; diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts index cff46275e96..1a8643f81b1 100644 --- a/packages/@ember/routing/type-tests/router-service.test.ts +++ b/packages/@ember/routing/type-tests/router-service.test.ts @@ -1,13 +1,15 @@ /* eslint-disable no-self-assign */ -import type { Owner } from '@ember/-internals/owner'; -import type { EmberLocation } from '@ember/-internals/routing'; +import { type Owner } from '@ember/-internals/owner'; +import { type EmberLocation } from '@ember/-internals/routing'; import type Route from '@ember/routing/route'; -import type { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service'; -import RouterService from '@ember/routing/router-service'; +import RouterService, { + type RouteInfo, + type RouteInfoWithAttributes, +} from '@ember/routing/router-service'; import { expectTypeOf } from 'expect-type'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; // Good enough for tests let owner = {} as Owner; diff --git a/packages/@ember/routing/type-tests/router/index.test.ts b/packages/@ember/routing/type-tests/router/index.test.ts index bc1f3ab7690..926fc08231e 100644 --- a/packages/@ember/routing/type-tests/router/index.test.ts +++ b/packages/@ember/routing/type-tests/router/index.test.ts @@ -1,10 +1,10 @@ -import type { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; import type EmberObject from '@ember/object'; import type Evented from '@ember/object/evented'; -import type { ILocation } from '@ember/routing/location'; +import { type ILocation } from '@ember/routing/location'; import Router from '@ember/routing/router'; import { expectTypeOf } from 'expect-type'; -import type { Transition } from 'router_js'; +import { type Transition } from 'router_js'; expectTypeOf().toMatchTypeOf(); expectTypeOf().toMatchTypeOf(); diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts index 40426afd53e..758b0d4c28d 100644 --- a/packages/@ember/runloop/index.ts +++ b/packages/@ember/runloop/index.ts @@ -1,9 +1,8 @@ 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/utils/types'; +import Backburner, { Timer, type DeferredActionQueues } from 'backburner'; +import { type AnyFn } from '@ember/-internals/utils/types'; export { Timer }; diff --git a/packages/@ember/runloop/type-tests.ts/debounce.test.ts b/packages/@ember/runloop/type-tests.ts/debounce.test.ts index be0e290798f..c4fd6b52905 100644 --- a/packages/@ember/runloop/type-tests.ts/debounce.test.ts +++ b/packages/@ember/runloop/type-tests.ts/debounce.test.ts @@ -1,5 +1,5 @@ import { debounce } from '@ember/runloop'; -import type { Timer } from 'backburner.js'; +import { type Timer } from 'backburner.js'; import { expectTypeOf } from 'expect-type'; // From Docs diff --git a/packages/@ember/runloop/type-tests.ts/later.test.ts b/packages/@ember/runloop/type-tests.ts/later.test.ts index bcd218a19b2..6a7dec2d59a 100644 --- a/packages/@ember/runloop/type-tests.ts/later.test.ts +++ b/packages/@ember/runloop/type-tests.ts/later.test.ts @@ -1,5 +1,4 @@ -import type { Timer } from '@ember/runloop'; -import { later } from '@ember/runloop'; +import { later, type Timer } from '@ember/runloop'; import { expectTypeOf } from 'expect-type'; class Foo { diff --git a/packages/@ember/runloop/type-tests.ts/next.test.ts b/packages/@ember/runloop/type-tests.ts/next.test.ts index 8cccad4614c..b190ddc97ab 100644 --- a/packages/@ember/runloop/type-tests.ts/next.test.ts +++ b/packages/@ember/runloop/type-tests.ts/next.test.ts @@ -1,5 +1,4 @@ -import type { Timer } from '@ember/runloop'; -import { next } from '@ember/runloop'; +import { next, type Timer } from '@ember/runloop'; import { expectTypeOf } from 'expect-type'; class Foo { diff --git a/packages/@ember/runloop/type-tests.ts/once.test.ts b/packages/@ember/runloop/type-tests.ts/once.test.ts index e55124820ca..6a5a3df9c63 100644 --- a/packages/@ember/runloop/type-tests.ts/once.test.ts +++ b/packages/@ember/runloop/type-tests.ts/once.test.ts @@ -1,5 +1,4 @@ -import type { Timer } from '@ember/runloop'; -import { once } from '@ember/runloop'; +import { once, type Timer } from '@ember/runloop'; import { expectTypeOf } from 'expect-type'; class Foo { diff --git a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts index 091869b1a14..917fd6ccb37 100644 --- a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts +++ b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts @@ -1,5 +1,4 @@ -import type { Timer } from '@ember/runloop'; -import { scheduleOnce } from '@ember/runloop'; +import { scheduleOnce, type Timer } from '@ember/runloop'; import { expectTypeOf } from 'expect-type'; class Foo { diff --git a/packages/@ember/runloop/type-tests.ts/schedule.test.ts b/packages/@ember/runloop/type-tests.ts/schedule.test.ts index 7960fd8f736..a2b6882464d 100644 --- a/packages/@ember/runloop/type-tests.ts/schedule.test.ts +++ b/packages/@ember/runloop/type-tests.ts/schedule.test.ts @@ -1,5 +1,4 @@ -import type { Timer } from '@ember/runloop'; -import { schedule } from '@ember/runloop'; +import { schedule, type Timer } from '@ember/runloop'; import { expectTypeOf } from 'expect-type'; class Foo { diff --git a/packages/@ember/runloop/type-tests.ts/throttle.test.ts b/packages/@ember/runloop/type-tests.ts/throttle.test.ts index 92e1b7ab165..7e237f077d3 100644 --- a/packages/@ember/runloop/type-tests.ts/throttle.test.ts +++ b/packages/@ember/runloop/type-tests.ts/throttle.test.ts @@ -1,5 +1,5 @@ import { throttle } from '@ember/runloop'; -import type { Timer } from 'backburner.js'; +import { type Timer } from 'backburner.js'; import { expectTypeOf } from 'expect-type'; // From Docs diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts index 8337855f18e..d614530a4c6 100644 --- a/packages/@ember/service/index.ts +++ b/packages/@ember/service/index.ts @@ -1,6 +1,9 @@ import { FrameworkObject } from '@ember/-internals/runtime'; -import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal'; -import { inject as metalInject } from '@ember/-internals/metal'; +import { + inject as metalInject, + type DecoratorPropertyDescriptor, + type ElementDescriptor, +} from '@ember/-internals/metal'; /** @module @ember/service diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts index 0f4bab1fae3..f32a434966c 100644 --- a/packages/@ember/service/type-tests/index.test.ts +++ b/packages/@ember/service/type-tests/index.test.ts @@ -1,5 +1,5 @@ -import type { Owner } from '@ember/-internals/owner'; -import type { FrameworkObject } from '@ember/-internals/runtime'; +import { type Owner } from '@ember/-internals/owner'; +import { type FrameworkObject } from '@ember/-internals/runtime'; import EmberObject from '@ember/object'; import Service, { inject, service } from '@ember/service'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts index 980b299f16d..c977393b9ff 100644 --- a/packages/@ember/string/index.ts +++ b/packages/@ember/string/index.ts @@ -7,10 +7,10 @@ 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, + type SafeString, } from '@ember/-internals/glimmer'; const STRING_DASHERIZE_REGEXP = /[ _]/g; diff --git a/packages/@ember/template/type-tests/index.test.ts b/packages/@ember/template/type-tests/index.test.ts index ded5701a55a..1b1e91751a2 100644 --- a/packages/@ember/template/type-tests/index.test.ts +++ b/packages/@ember/template/type-tests/index.test.ts @@ -1,4 +1,4 @@ -import type { SafeString } from '@ember/-internals/glimmer'; +import { type SafeString } from '@ember/-internals/glimmer'; import { htmlSafe, isHTMLSafe } from '@ember/template'; import { expectTypeOf } from 'expect-type'; 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 b955b1af4e0..a87b1568123 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..b548e2af4ac 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts @@ -1,9 +1,8 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { AST, ASTPlugin } from '@glimmer/syntax'; -import { print } from '@glimmer/syntax'; +import { print, 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, 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 11e497ea548..03a1c5aff81 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/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/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 4d278fd0a0e..b1109581b7d 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/utils/types'; +import { type AnyFn } from '@ember/-internals/utils/types'; import TestPromise from './promise'; export const helpers: Record< 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..40d2bd2838f 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 { compileOptions, type EmberPrecompileOptions } 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 be9d015543a..415e6c7bdc8 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 { callWithStub, checkTest, type DebugEnv, type Message } 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 b139b2736b6..fdd9c3a39e0 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 { callWithStub, type DebugEnv, type Message } from './utils'; declare global { interface Window { expectNoDeprecation: DeprecationAssert['expectNoDeprecation'] | undefined; 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..a2d1c2e062f 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 { checkTest, type DebugEnv, type DebugFunction, type DebugFunctionOptions } 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 31d53e5bd5f..032fafd6515 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 { callWithStub, type DebugEnv, type Message } 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..449371939cb 100644 --- a/packages/internal-test-helpers/lib/module-for.ts +++ b/packages/internal-test-helpers/lib/module-for.ts @@ -1,8 +1,7 @@ /* 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..e8af11bfd6f 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 { + blur, + fireEvent, + focus, + matches, + type KEYBOARD_EVENT_TYPES, + type MOUSE_EVENT_TYPES, +} 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 b6b1f65a7b2..9d724bd7746 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 { Owner } from '@ember/-internals/owner'; +import { type Owner } from '@ember/-internals/owner'; export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: string) { assert.ok(owner.resolveRegistration(fullName), `has registration: ${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 d1c9f8666d1..9f6948833cc 100644 --- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts +++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts @@ -1,10 +1,9 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { compile, type EmberPrecompileOptions } from 'ember-template-compiler'; import { ENV } from '@ember/-internals/environment'; import AbstractTestCase from './abstract'; import { runDestroy, runTask, runLoopSettled } from '../run'; import type Application from '@ember/application'; -import type { BootOptions } from '@ember/application/instance'; +import { type BootOptions } from '@ember/application/instance'; 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 503930b0290..a69af1c612e 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/application/instance'; +import { type BootOptions } from '@ember/application/instance'; import Controller from '@ember/controller'; import type EmberObject from '@ember/object'; import { NoneLocation } from '@ember/-internals/routing'; diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts index 04d2dd3f7a2..42fcfbb8256 100644 --- a/packages/internal-test-helpers/lib/test-cases/rendering.ts +++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts @@ -1,19 +1,23 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { compile, type EmberPrecompileOptions } from 'ember-template-compiler'; import { EventDispatcher } from '@ember/-internals/views'; -import type { Renderer } from '@ember/-internals/glimmer'; -import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer'; +import { + helper, + Helper, + Component, + _resetRenderers, + type Renderer, +} 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 { Factory } from '@ember/-internals/owner'; -import type { BootOptions } from '@ember/application/instance'; -import type { EngineInstanceOptions } from '@ember/engine/instance'; +import { type Factory } from '@ember/-internals/owner'; +import { type BootOptions } from '@ember/application/instance'; +import { 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 50a89e4381b..1275c950f41 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,16 @@ -import type { EmberPrecompileOptions } from 'ember-template-compiler'; -import { compile } from 'ember-template-compiler'; +import { compile, type EmberPrecompileOptions } from 'ember-template-compiler'; import { EventDispatcher } from '@ember/-internals/views'; -import type { Renderer } from '@ember/-internals/glimmer'; -import { Component, _resetRenderers } from '@ember/-internals/glimmer'; +import { Component, _resetRenderers, type Renderer } 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 { EngineInstanceOptions } from '@ember/engine/instance'; +import { type EngineInstanceOptions } from '@ember/engine/instance'; import type EngineInstance from '@ember/engine/instance'; -import type { BootOptions } from '@ember/application/instance'; -import type { Factory } from '@ember/-internals/owner'; +import { type BootOptions } from '@ember/application/instance'; +import { type Factory } 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 a068d92ac32..5fe32fd9b9b 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/-internals/glimmer'; -import type { Factory } from '@ember/-internals/owner'; +import { type Factory } 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 e8c8be71390..708727eccf5 100644 --- a/packages/internal-test-helpers/lib/test-resolver.ts +++ b/packages/internal-test-helpers/lib/test-resolver.ts @@ -1,7 +1,7 @@ import { compile } from 'ember-template-compiler'; -import type { Resolver as IResolver } from '@ember/-internals/container/lib/registry'; -import type { Factory } from '@ember/-internals/owner'; +import { type Resolver as IResolver } from '@ember/-internals/container/lib/registry'; +import { type Factory } from '@ember/-internals/owner'; const DELIMITER = '%'; diff --git a/yarn.lock b/yarn.lock index 1750886f734..733a02c6ae3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,19 +1011,19 @@ semver "^7.3.5" typescript-memoize "^1.0.1" -"@eslint/eslintrc@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" - integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== +"@eslint/eslintrc@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" + integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.1" - globals "^13.9.0" + espree "^9.3.2" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" - minimatch "^3.0.4" + minimatch "^3.1.2" strip-json-comments "^3.1.1" "@glimmer/compiler@0.84.2": @@ -1507,119 +1507,85 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a" - integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg== +"@typescript-eslint/eslint-plugin@^5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz#c1f98ccba9d345e38992975d3ca56ed6260643c2" + integrity sha512-oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA== dependencies: - "@typescript-eslint/scope-manager" "5.22.0" - "@typescript-eslint/type-utils" "5.22.0" - "@typescript-eslint/utils" "5.22.0" - debug "^4.3.2" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/type-utils" "5.26.0" + "@typescript-eslint/utils" "5.26.0" + debug "^4.3.4" functional-red-black-tree "^1.0.1" - ignore "^5.1.8" + ignore "^5.2.0" regexpp "^3.2.0" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728" - integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ== +"@typescript-eslint/parser@^5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.26.0.tgz#a61b14205fe2ab7533deb4d35e604add9a4ceee2" + integrity sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q== dependencies: - "@typescript-eslint/scope-manager" "5.15.0" - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/typescript-estree" "5.15.0" - debug "^4.3.2" - -"@typescript-eslint/scope-manager@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee" - integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg== - dependencies: - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/visitor-keys" "5.15.0" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/typescript-estree" "5.26.0" + debug "^4.3.4" -"@typescript-eslint/scope-manager@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24" - integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA== +"@typescript-eslint/scope-manager@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz#44209c7f649d1a120f0717e0e82da856e9871339" + integrity sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw== dependencies: - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/visitor-keys" "5.22.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/visitor-keys" "5.26.0" -"@typescript-eslint/type-utils@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19" - integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA== +"@typescript-eslint/type-utils@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz#937dee97702361744a3815c58991acf078230013" + integrity sha512-7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A== dependencies: - "@typescript-eslint/utils" "5.22.0" - debug "^4.3.2" + "@typescript-eslint/utils" "5.26.0" + debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501" - integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA== - -"@typescript-eslint/types@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0" - integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw== +"@typescript-eslint/types@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.26.0.tgz#cb204bb154d3c103d9cc4d225f311b08219469f3" + integrity sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA== -"@typescript-eslint/typescript-estree@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac" - integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA== +"@typescript-eslint/typescript-estree@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz#16cbceedb0011c2ed4f607255f3ee1e6e43b88c3" + integrity sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w== dependencies: - "@typescript-eslint/types" "5.15.0" - "@typescript-eslint/visitor-keys" "5.15.0" - debug "^4.3.2" - globby "^11.0.4" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/visitor-keys" "5.26.0" + debug "^4.3.4" + globby "^11.1.0" is-glob "^4.0.3" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97" - integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw== - dependencies: - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/visitor-keys" "5.22.0" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/utils@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8" - integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ== +"@typescript-eslint/utils@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.26.0.tgz#896b8480eb124096e99c8b240460bb4298afcfb4" + integrity sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.22.0" - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/typescript-estree" "5.22.0" + "@typescript-eslint/scope-manager" "5.26.0" + "@typescript-eslint/types" "5.26.0" + "@typescript-eslint/typescript-estree" "5.26.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.15.0": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027" - integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ== - dependencies: - "@typescript-eslint/types" "5.15.0" - eslint-visitor-keys "^3.0.0" - -"@typescript-eslint/visitor-keys@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c" - integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg== +"@typescript-eslint/visitor-keys@5.26.0": + version "5.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz#7195f756e367f789c0e83035297c45b417b57f57" + integrity sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q== dependencies: - "@typescript-eslint/types" "5.22.0" - eslint-visitor-keys "^3.0.0" + "@typescript-eslint/types" "5.26.0" + eslint-visitor-keys "^3.3.0" "@ungap/promise-all-settled@1.1.2": version "1.1.2" @@ -1651,7 +1617,7 @@ acorn-dynamic-import@^3.0.0: dependencies: acorn "^5.0.0" -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -1661,10 +1627,10 @@ acorn@^5.0.0, acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==" -acorn@^8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== +acorn@^8.7.1: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== agent-base@5: version "5.1.1" @@ -3600,6 +3566,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" @@ -4337,10 +4310,10 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.2: - version "2.7.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129" - integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg== +eslint-module-utils@^2.7.3: + version "2.7.3" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" + integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" find-up "^2.1.0" @@ -4368,24 +4341,24 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@^2.25.4: - version "2.25.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" - integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== +eslint-plugin-import@^2.26.0: + version "2.26.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" + integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.2" + eslint-module-utils "^2.7.3" has "^1.0.3" - is-core-module "^2.8.0" + is-core-module "^2.8.1" is-glob "^4.0.3" - minimatch "^3.0.4" + minimatch "^3.1.2" object.values "^1.1.5" - resolve "^1.20.0" - tsconfig-paths "^3.12.0" + resolve "^1.22.0" + tsconfig-paths "^3.14.1" eslint-plugin-node@^11.1.0: version "11.1.0" @@ -4454,17 +4427,17 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==" -eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0: +eslint-visitor-keys@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" - integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== +eslint@^8.16.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae" + integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA== dependencies: - "@eslint/eslintrc" "^1.2.1" + "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -4475,14 +4448,14 @@ eslint@^8.11.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.1" + espree "^9.3.2" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" - globals "^13.6.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -4491,7 +4464,7 @@ eslint@^8.11.0: json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.0.4" + minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" regexpp "^3.2.0" @@ -4505,13 +4478,13 @@ esm@^3.2.4: resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3" integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA==" -espree@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" - integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== +espree@^9.3.2: + version "9.3.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" + integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== dependencies: - acorn "^8.7.0" - acorn-jsx "^5.3.1" + acorn "^8.7.1" + acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@~4.0.0: @@ -4783,7 +4756,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" -fast-glob@^3.0.3, fast-glob@^3.1.1: +fast-glob@^3.0.3: version "3.2.10" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee" integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A== @@ -4794,6 +4767,17 @@ fast-glob@^3.0.3, fast-glob@^3.1.1: merge2 "^1.3.0" micromatch "^4.0.4" +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -5428,10 +5412,10 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== -globals@^13.6.0, globals@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== +globals@^13.15.0: + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" + integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== dependencies: type-fest "^0.20.2" @@ -5459,16 +5443,16 @@ globby@10.0.0: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.4: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" globrex@^0.1.2: @@ -5829,7 +5813,7 @@ ieee754@1.1.13, ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q= sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" -ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0: +ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -5992,7 +5976,7 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1: +is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -7208,10 +7192,10 @@ merge-trees@^2.0.0: fs-updater "^1.0.4" heimdalljs "^0.2.5" -merge2@^1.2.3, merge2@^1.3.0: +merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity "sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== methods@~1.1.2: version "1.1.2" @@ -7313,6 +7297,13 @@ minimatch@4.2.1: dependencies: brace-expansion "^1.1.7" +minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7332,6 +7323,11 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + minipass@^2.2.0: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" @@ -9859,14 +9855,14 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -tsconfig-paths@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" - integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== +tsconfig-paths@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" - minimist "^1.2.0" + minimist "^1.2.6" strip-bom "^3.0.0" tslib@^1.8.1, tslib@^1.9.0: @@ -9953,10 +9949,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1: resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79" integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg== -typescript@~4.6.4: - version "4.6.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" - integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== +typescript@~4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" + integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6"