Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 02:54:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(@schematics/angular): update browser output path when adding universal

Browse Source 
Currently, in the CLI universal schematic we are setting the server output path to `dist/project-server` and not amending the build outputPath

Ex:
```
dist/project
dist/project-server
```

However, the above paths are being update when adding `nguniversal` to the below:

```
dist/project/browser
dist/project/server
```

With this change it is proposed to move that logic to upstream.

Related PR to clean up nguniversal schematics https://github.com/angular/universal/pull/1265
This commit is contained in:
Alan Agius 2019-09-30 19:13:43 +02:00 committed by vikerman
parent 6525d59fea
commit fca9cbe6fd
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/schematics/angular/universal/index.ts
View File

@ -49,12 +49,16 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
fileReplacements = buildTarget.configurations.production.fileReplacements;
}
if (buildTarget && buildTarget.options) {
buildTarget.options.outputPath = `dist/${options.clientProject}/browser`;
}
const mainPath = options.main as string;
clientProject.targets.add({
name: 'server',
builder: Builders.Server,
options: {
outputPath: `dist/${options.clientProject}-server`,
outputPath: `dist/${options.clientProject}/server`,
main: join(normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
},

12
packages/schematics/angular/universal/index_spec.ts
View File

@ -149,7 +149,7 @@ describe('Universal Schematic', () => {
expect(targets.server).toBeDefined();
expect(targets.server.builder).toBeDefined();
const opts = targets.server.options;
expect(opts.outputPath).toEqual('dist/bar-server');
expect(opts.outputPath).toEqual('dist/bar/server');
expect(opts.main).toEqual('projects/bar/src/main.server.ts');
expect(opts.tsConfig).toEqual('projects/bar/tsconfig.server.json');
const configurations = targets.server.configurations;
@ -161,6 +161,16 @@ describe('Universal Schematic', () => {
expect(fileReplacements[0].with).toEqual('projects/bar/src/environments/environment.prod.ts');
});
it('should update workspace with a build target outputPath', async () => {
const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
.toPromise();
const filePath = '/angular.json';
const contents = tree.readContent(filePath);
const config = JSON.parse(contents.toString());
const targets = config.projects.bar.architect;
expect(targets.build.options.outputPath).toEqual('dist/bar/browser');
});
it('should add a server transition to BrowerModule import', async () => {
const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
.toPromise();

4
tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
View File

@ -17,8 +17,8 @@ export default async function () {
await silentNpm('install');
await ng('run', 'test-project:app-shell');
await expectFileToMatch('dist/test-project/index.html', /app-shell works!/);
await expectFileToMatch('dist/test-project/browser/index.html', /app-shell works!/);
await ng('run', 'test-project:app-shell:production');
await expectFileToMatch('dist/test-project/index.html', /app-shell works!/);
await expectFileToMatch('dist/test-project/browser/index.html', /app-shell works!/);
}