Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Commit dd99f14

Browse files
committed
fix(deep-linking): use .ts file extension for lazy loading in dev mode, and .js in AoT mode since the AoT compiler no longer emits an ngfactory.ts file
1 parent e9217c2 commit dd99f14

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

package-lock.json

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/deep-linking/util.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ export class HomePageModule {}
614614

615615
const result = util.getNgModuleDataFromPage(appNgModulePath, pagePath, knownClassName, fileCache, false);
616616

617-
expect(result.absolutePath).toEqual(helpers.changeExtension(pageNgModulePath, '.js'));
617+
expect(result.absolutePath).toEqual(pageNgModulePath);
618618
expect(result.userlandModulePath).toEqual('../pages/page-one/page-one.module');
619619
expect(result.className).toEqual('HomePageModule');
620620
});
@@ -1224,7 +1224,7 @@ export class PageThreeModule {
12241224
expect(entryOne.segment).toEqual('page-one');
12251225
expect(entryOne.priority).toEqual('low');
12261226
expect(entryOne.defaultHistory.length).toEqual(0);
1227-
expect(entryOne.absolutePath).toEqual(join(srcDir, 'pages', 'page-one', 'page-one.module.js'));
1227+
expect(entryOne.absolutePath).toEqual(join(srcDir, 'pages', 'page-one', 'page-one.module.ts'));
12281228
expect(entryOne.userlandModulePath).toEqual('../pages/page-one/page-one.module');
12291229
expect(entryOne.className).toEqual('PageOneModule');
12301230

@@ -1233,7 +1233,7 @@ export class PageThreeModule {
12331233
expect(entryTwo.segment).toEqual('page-two');
12341234
expect(entryTwo.priority).toEqual('low');
12351235
expect(entryTwo.defaultHistory.length).toEqual(0);
1236-
expect(entryTwo.absolutePath).toEqual(join(srcDir, 'pages', 'page-two', 'page-two.module.js'));
1236+
expect(entryTwo.absolutePath).toEqual(join(srcDir, 'pages', 'page-two', 'page-two.module.ts'));
12371237
expect(entryTwo.userlandModulePath).toEqual('../pages/page-two/page-two.module');
12381238
expect(entryTwo.className).toEqual('PageTwoModule');
12391239

@@ -1244,7 +1244,7 @@ export class PageThreeModule {
12441244
expect(entryThree.defaultHistory.length).toEqual(2);
12451245
expect(entryThree.defaultHistory[0]).toEqual('page-one');
12461246
expect(entryThree.defaultHistory[1]).toEqual('page-two');
1247-
expect(entryThree.absolutePath).toEqual(join(srcDir, 'pages', 'settings-page', 'fake-dir', 'settings-page.module.js'));
1247+
expect(entryThree.absolutePath).toEqual(join(srcDir, 'pages', 'settings-page', 'fake-dir', 'settings-page.module.ts'));
12481248
expect(entryThree.userlandModulePath).toEqual('../pages/settings-page/fake-dir/settings-page.module');
12491249
expect(entryThree.className).toEqual('PageThreeModule');
12501250
});

src/deep-linking/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export function getNgModuleDataFromPage(appNgModuleFilePath: string, filePath: s
113113
const exportedClassName = getNgModuleClassName(ngModuleFile.path, ngModuleFile.content);
114114
const relativePathToAppNgModule = getRelativePathToPageNgModuleFromAppNgModule(appNgModuleFilePath, ngModulePath);
115115

116-
const absolutePath = isAot ? changeExtension(ngModulePath, '.ngfactory.js') : changeExtension(ngModulePath, '.js');
116+
const absolutePath = isAot ? changeExtension(ngModulePath, '.ngfactory.js') : changeExtension(ngModulePath, '.ts');
117117
const userlandModulePath = isAot ? changeExtension(relativePathToAppNgModule, '.ngfactory') : changeExtension(relativePathToAppNgModule, '');
118118
const namedExport = isAot ? `${exportedClassName}NgFactory` : exportedClassName;
119119

0 commit comments

Comments
 (0)