Skip to content

fix(@schematics/angular): module imports paths are incorrect when flat option is used #12177

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.

Sign up for GitHub

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

Merged
kyliau merged 1 commit into from
Sep 7, 2018
+15 −7
Merged

fix(@schematics/angular): module imports paths are incorrect when flat option is used #12177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions packages/schematics/angular/module/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import { basename, dirname, normalize, relative, strings } from '@angular-devkit/core';
import { normalize, strings } from '@angular-devkit/core';
import {
Rule,
SchematicsException,
Expand All @@ -24,7 +24,7 @@ import * as ts from 'typescript';
import { addImportToModule } from '../utility/ast-utils';
import { InsertChange } from '../utility/change';
import { getWorkspace } from '../utility/config';
import { findModuleFromOptions } from '../utility/find-module';
import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
import { parseName } from '../utility/parse-name';
import { buildDefaultPath } from '../utility/project';
import { Schema as ModuleOptions } from './schema';
Expand All @@ -36,7 +36,7 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
return host;
}

const modulePath = normalize('/' + options.module);
const modulePath = options.module;

const text = host.read(modulePath);
if (text === null) {
Expand All @@ -51,10 +51,9 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
+ strings.dasherize(options.name)
+ '.module',
);
const relativeDir = relative(dirname(modulePath), dirname(importModulePath));
const relativePath = (relativeDir.startsWith('.') ? relativeDir : './' + relativeDir)
+ '/' + basename(importModulePath);
const changes = addImportToModule(source, modulePath,
const relativePath = buildRelativePath(modulePath, importModulePath);
const changes = addImportToModule(source,
modulePath,
strings.classify(`${options.name}Module`),
relativePath);

Expand Down
9 changes: 9 additions & 0 deletions packages/schematics/angular/module/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ describe('Module Schematic', () => {
expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
});

it('should import into another module when using flat', () => {
const options = { ...defaultOptions, flat: true, module: 'app.module.ts' };

const tree = schematicRunner.runSchematic('module', options, appTree);
const content = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(content).toMatch(/import { FooModule } from '.\/foo.module'/);
expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
});

it('should import into another module (deep)', () => {
let tree = appTree;

Expand Down