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

fix(schematics): nested apps generation

Browse Source
This commit is contained in:
vsavkin 2017-12-06 17:37:34 -05:00 committed by Victor Savkin
parent 013a828d1e
commit ecfd5cca21
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/schematics/application.test.ts
View File

@ -25,7 +25,7 @@ describe('Nrwl Workspace', () => {
`
);
runCLI('build --aot');
runCLI('build --aot -a=my-dir/my-app');
expect(runCLI('test --single-run')).toContain('Executed 2 of 2 SUCCESS');
},
1000000
@ -38,7 +38,7 @@ describe('Nrwl Workspace', () => {
newApp('myApp --directory=myDir --routing');
newLib('myLib --directory=myDir --routing --lazy --parentModule=apps/my-dir/my-app/src/app/app.module.ts');
runCLI('build --aot');
runCLI('build --aot -a=my-dir/my-app');
expect(runCLI('test --single-run')).toContain('Executed 2 of 2 SUCCESS');
},
1000000
@ -51,7 +51,7 @@ describe('Nrwl Workspace', () => {
newApp('myApp --directory=myDir --routing');
newLib('myLib --directory=myDir --routing --parentModule=apps/my-dir/my-app/src/app/app.module.ts');
runCLI('build --aot');
runCLI('build --aot -a=my-dir/my-app');
expect(runCLI('test --single-run')).toContain('Executed 2 of 2 SUCCESS');
},
1000000

18
packages/schematics/src/collection/app/component-files/app.component.html__tmpl__
View File

@ -1,18 +0,0 @@
<div style="text-align:center">
<h1>
Welcome to an Angular CLI app built with Nrwl Nx!
</h1>
<img width="300" src="assets/nx-logo.png">
</div>
<h2>Nx</h2>
An open source toolkit for enterprise Angular applications.
Nx is designed to help you create and build enterprise grade Angular applications. It provides an opinionated approach to application project structure and patterns.
<h2>Quick Start & Documentation</h2>
<a href="https://nrwl.io/nx">Watch a 5-minute video on how to get started with Nx.</a><% if (routing) { %>
<router-outlet></router-outlet><% } %>

37
packages/schematics/src/collection/app/index.ts
View File

@ -114,6 +114,33 @@ function addRouterRootConfiguration(path: string): Rule {
};
}
const staticComponentContent = `
<div style="text-align:center">
<h1>
Welcome to an Angular CLI app built with Nrwl Nx!
</h1>
<img width="300" src="assets/nx-logo.png">
</div>
<h2>Nx</h2>
An open source toolkit for enterprise Angular applications.
Nx is designed to help you create and build enterprise grade Angular applications. It provides an opinionated approach to application project structure and patterns.
<h2>Quick Start & Documentation</h2>
<a href="https://nrwl.io/nx">Watch a 5-minute video on how to get started with Nx.</a>`;
function updateComponentTemplate(options: NormalizedSchema): Rule {
return (host: Tree) => {
const content = options.routing
? `${staticComponentContent}\n<router-outlet></router-outlet>`
: staticComponentContent;
host.overwrite(`${options.fullPath}/app/app.component.html`, content);
};
}
export default function(schema: Schema): Rule {
const options = normalizeOptions(schema);
@ -144,15 +171,7 @@ export default function(schema: Schema): Rule {
viewEncapsulation: options.viewEncapsulation,
changeDetection: options.changeDetection
}),
mergeWith(
apply(url('./component-files'), [
options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
template({ ...options, tmpl: '' }),
move(`${options.fullPath}/app`)
]),
MergeStrategy.Overwrite
),
updateComponentTemplate(options),
addBootstrap(options.fullPath),
addNxModule(options.fullPath),
addAppToAngularCliJson(options),