Skip to content

Commit dec0718

Browse files
committed
Move remaining routing code into @ember/routing
1 parent c8a2375 commit dec0718

27 files changed

+34
-26
lines changed

packages/@ember/-internals/glimmer/lib/component-managers/mount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Owner } from '@ember/-internals/owner';
2-
import { generateControllerFactory } from '@ember/-internals/routing';
2+
import { generateControllerFactory } from '@ember/routing/internals';
33
import { assert } from '@ember/debug';
44
import EngineInstance from '@ember/engine/instance';
55
import { associateDestroyableChild } from '@glimmer/destroyable';
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
export {
2-
default as generateController,
2+
controllerFor,
3+
generateController,
34
generateControllerFactory,
4-
} from './lib/system/generate_controller';
5-
export { default as controllerFor } from './lib/system/controller_for';
6-
export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
7-
export { EngineRouteInfo } from './lib/system/engines';
8-
export { default as QueryParams } from './lib/system/query_params';
9-
export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
10-
export { default as BucketCache } from './lib/system/cache';
5+
DSL as RouterDSL,
6+
} from '@ember/routing/internals';

packages/@ember/application/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import AutoLocation from '@ember/routing/auto-location';
1919
import HashLocation from '@ember/routing/hash-location';
2020
import HistoryLocation from '@ember/routing/history-location';
2121
import NoneLocation from '@ember/routing/none-location';
22-
import { BucketCache } from '@ember/-internals/routing';
22+
import { BucketCache } from '@ember/routing/internals';
2323
import ApplicationInstance from '@ember/application/instance';
2424
import Engine, { buildInitializerMethod } from '@ember/engine';
2525
import type { BootOptions } from '@ember/engine/instance';
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
export { default as RouterState } from './lib/router_state';
22
export { default as RoutingService } from './lib/routing-service';
33
export { RouteArgs, deprecateTransitionMethods, prefixRouteNameArg } from './lib/utils';
4+
export {
5+
default as generateController,
6+
generateControllerFactory,
7+
} from './lib/generate_controller';
8+
export { default as BucketCache } from './lib/cache';
9+
export { default as DSL, DSLCallback } from './lib/dsl';
10+
export { EngineRouteInfo } from './lib/engines';
11+
export { RouteInfo, RouteInfoWithAttributes } from './lib/route-info';
12+
export { default as controllerFor } from './lib/controller_for';
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)