Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: type modifier on imports #20101

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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.*"
Expand Down
25 changes: 13 additions & 12 deletions packages/@ember/-internals/routing/lib/system/route.ts
Expand Up @@ -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,
Expand All @@ -31,25 +30,27 @@ 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 {
PARAMS_SYMBOL,
STATE_SYMBOL
snewcomer marked this conversation as resolved.
Show resolved Hide resolved
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<R extends Route> extends InternalRouteInfo<R> {
_names?: unknown[];
Expand Down