miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(schematics): rename skipModuleName to simpleModuleName

Browse Source
This commit is contained in:
listepo-alterpost 2018-11-12 22:13:09 +02:00 committed by Victor Savkin
parent c0ec046b0b
commit 0c70d0777d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/schematics/src/collection/library/index.ts
View File

@ -464,7 +464,7 @@ function normalizeOptions(host: Tree, options: Schema): NormalizedSchema {
: name; : name;
const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-'); const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
const fileName = options.skipModulePrefix ? name : projectName; const fileName = options.simpleModuleName ? name : projectName;
const projectRoot = `libs/${projectDirectory}`; const projectRoot = `libs/${projectDirectory}`;
const moduleName = `${toClassName(fileName)}Module`; const moduleName = `${toClassName(fileName)}Module`;

14
packages/schematics/src/collection/library/library.spec.ts
View File

@ -140,7 +140,7 @@ describe('lib', () => {
const tree2 = schematicRunner.runSchematic( const tree2 = schematicRunner.runSchematic(
'lib', 'lib',
{ name: 'myLib2', skipModulePrefix: true }, { name: 'myLib2', simpleModuleName: true },
tree tree
); );
expect(tree2.exists(`libs/my-lib2/karma.conf.js`)).toBeTruthy(); expect(tree2.exists(`libs/my-lib2/karma.conf.js`)).toBeTruthy();
@ -225,7 +225,7 @@ describe('lib', () => {
name: 'myLib2', name: 'myLib2',
directory: 'myDir', directory: 'myDir',
tags: 'one,two', tags: 'one,two',
skipModulePrefix: true simpleModuleName: true
}, },
tree tree
); );
@ -270,7 +270,7 @@ describe('lib', () => {
const tree2 = schematicRunner.runSchematic( const tree2 = schematicRunner.runSchematic(
'lib', 'lib',
{ name: 'myLib2', directory: 'myDir', skipModulePrefix: true }, { name: 'myLib2', directory: 'myDir', simpleModuleName: true },
tree tree
); );
expect(tree2.exists(`libs/my-dir/my-lib2/karma.conf.js`)).toBeTruthy(); expect(tree2.exists(`libs/my-dir/my-lib2/karma.conf.js`)).toBeTruthy();
@ -387,7 +387,7 @@ describe('lib', () => {
directory: 'myDir', directory: 'myDir',
routing: true, routing: true,
lazy: true, lazy: true,
skipModulePrefix: true simpleModuleName: true
}, },
tree tree
); );
@ -465,7 +465,7 @@ describe('lib', () => {
routing: true, routing: true,
lazy: true, lazy: true,
parentModule: 'apps/myapp/src/app/app.module.ts', parentModule: 'apps/myapp/src/app/app.module.ts',
skipModulePrefix: true simpleModuleName: true
}, },
tree2 tree2
); );
@ -518,7 +518,7 @@ describe('lib', () => {
name: 'myLib2', name: 'myLib2',
directory: 'myDir', directory: 'myDir',
routing: true, routing: true,
skipModulePrefix: true simpleModuleName: true
}, },
tree tree
); );
@ -574,7 +574,7 @@ describe('lib', () => {
directory: 'myDir', directory: 'myDir',
routing: true, routing: true,
parentModule: 'apps/myapp/src/app/app.module.ts', parentModule: 'apps/myapp/src/app/app.module.ts',
skipModulePrefix: true simpleModuleName: true
}, },
tree2 tree2
); );

2
packages/schematics/src/collection/library/schema.d.ts vendored
View File

@ -3,7 +3,7 @@ import { UnitTestRunner } from '../../utils/test-runners';
export interface Schema { export interface Schema {
name: string; name: string;
skipFormat: boolean; skipFormat: boolean;
skipModulePrefix: boolean; simpleModuleName: boolean;
directory?: string; directory?: string;
sourceDir?: string; sourceDir?: string;
publishable: boolean; publishable: boolean;

2
packages/schematics/src/collection/library/schema.json
View File

@ -34,7 +34,7 @@
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"skipModulePrefix": { "simpleModuleName": {
"description": "Skip module prefix when using --directory", "description": "Skip module prefix when using --directory",
"type": "boolean", "type": "boolean",
"default": false "default": false