-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(nx): add presets to simplify the creation of workspaces with ang…
…ular and fullstack apps
- Loading branch information
Showing
35 changed files
with
517 additions
and
172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ node_modules | |
| packages/schematics/src/collection/**/files/*.json | ||
| /.vscode | ||
| /.idea | ||
| /.github | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,217 @@ | ||
| import { | ||
| apply, | ||
| branchAndMerge, | ||
| chain, | ||
| mergeWith, | ||
| move, | ||
| noop, | ||
| Rule, | ||
| schematic, | ||
| SchematicContext, | ||
| template, | ||
| Tree, | ||
| url | ||
| Tree | ||
| } from '@angular-devkit/schematics'; | ||
| import { Schema } from './schema'; | ||
| import { strings } from '@angular-devkit/core'; | ||
| import { addImportToModule, insert } from '../../utils/ast-utils'; | ||
| import * as ts from 'typescript'; | ||
| import { insertImport } from '@schematics/angular/utility/ast-utils'; | ||
| import { | ||
| NodePackageInstallTask, | ||
| RepositoryInitializerTask | ||
| } from '@angular-devkit/schematics/tasks'; | ||
| import { libVersions } from '../../lib-versions'; | ||
| import { DEFAULT_NRWL_PRETTIER_CONFIG } from '../../utils/common'; | ||
|
|
||
| export default function(options: Schema): Rule { | ||
| if (!options.name) { | ||
| throw new Error(`Invalid options, "name" is required.`); | ||
| } | ||
| if (!options.directory) { | ||
| options.directory = options.name; | ||
| } | ||
|
|
||
| const workspaceOpts = { ...options, preset: undefined }; | ||
| return (host: Tree, context: SchematicContext) => { | ||
| addTasks(options, context); | ||
| const npmScope = options.npmScope ? options.npmScope : options.name; | ||
| const templateSource = apply(url('./files'), [ | ||
| template({ | ||
| utils: strings, | ||
| dot: '.', | ||
| tmpl: '', | ||
| ...libVersions, | ||
| ...(options as object), | ||
| npmScope, | ||
| defaultNrwlPrettierConfig: JSON.stringify( | ||
| DEFAULT_NRWL_PRETTIER_CONFIG, | ||
| null, | ||
| 2 | ||
| ) | ||
| }) | ||
| ]); | ||
| return chain([branchAndMerge(chain([mergeWith(templateSource)]))])( | ||
| host, | ||
| context | ||
| ); | ||
| return chain([ | ||
| schematic('workspace', workspaceOpts), | ||
| createPreset(options), | ||
| move('/', options.directory), | ||
| addTasks(options) | ||
| ])(Tree.empty(), context); | ||
| }; | ||
| } | ||
|
|
||
| function addTasks(options: Schema, context: SchematicContext) { | ||
| let packageTask; | ||
| if (!options.skipInstall) { | ||
| packageTask = context.addTask( | ||
| new NodePackageInstallTask(options.directory) | ||
| function createPreset(options: Schema): Rule { | ||
| if (options.preset === 'empty') { | ||
| return noop(); | ||
| } else if (options.preset === 'angular') { | ||
| return chain([ | ||
| schematic( | ||
| 'application', | ||
| { name: options.name, style: options.style }, | ||
| { interactive: false } | ||
| ) | ||
| ]); | ||
| } else { | ||
| return chain([ | ||
| schematic( | ||
| 'application', | ||
| { name: options.name, style: options.style }, | ||
| { interactive: false } | ||
| ), | ||
| schematic( | ||
| 'node-application', | ||
| { | ||
| name: 'api', | ||
| frontendProject: options.name | ||
| }, | ||
| { interactive: false } | ||
| ), | ||
| schematic( | ||
| 'library', | ||
| { name: 'api-interface', framework: 'none' }, | ||
| { interactive: false } | ||
| ), | ||
| connectFrontendAndApi(options) | ||
| ]); | ||
| } | ||
| } | ||
|
|
||
| function connectFrontendAndApi(options: Schema) { | ||
| return (host: Tree) => { | ||
| host.create( | ||
| 'libs/api-interface/src/lib/interfaces.ts', | ||
| `export interface Message { message: string }` | ||
| ); | ||
| host.overwrite( | ||
| 'libs/api-interface/src/index.ts', | ||
| `export * from './lib/interfaces';` | ||
| ); | ||
|
|
||
| const modulePath = `apps/${options.name}/src/app/app.module.ts`; | ||
| const moduleFile = ts.createSourceFile( | ||
| modulePath, | ||
| host.read(modulePath).toString(), | ||
| ts.ScriptTarget.Latest, | ||
| true | ||
| ); | ||
| insert(host, modulePath, [ | ||
| insertImport( | ||
| moduleFile, | ||
| modulePath, | ||
| 'HttpClientModule', | ||
| `@angular/common/http` | ||
| ), | ||
| ...addImportToModule( | ||
| moduleFile, | ||
| `@angular/common/http`, | ||
| `HttpClientModule` | ||
| ) | ||
| ]); | ||
|
|
||
| const scope = options.npmScope ? options.npmScope : options.name; | ||
| const style = options.style ? options.style : 'css'; | ||
| host.overwrite( | ||
| `apps/${options.name}/src/app/app.component.ts`, | ||
| `import { Component } from '@angular/core'; | ||
| import { HttpClient } from '@angular/common/http'; | ||
| import { Message } from '@${scope}/api-interface'; | ||
| @Component({ | ||
| selector: '${scope}-root', | ||
| templateUrl: './app.component.html', | ||
| styleUrls: ['./app.component.${style}'] | ||
| }) | ||
| export class AppComponent { | ||
| hello$ = this.http.get<Message>('/api/hello') | ||
| constructor(private http: HttpClient) {} | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| host.overwrite( | ||
| `apps/${options.name}/src/app/app.component.spec.ts`, | ||
| `import { Component } from '@angular/core'; | ||
| import { TestBed, async } from '@angular/core/testing'; | ||
| import { HttpClientModule } from '@angular/common/http'; | ||
| import { AppComponent } from './app.component'; | ||
| describe('AppComponent', () => { | ||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [AppComponent], | ||
| imports: [HttpClientModule] | ||
| }).compileComponents(); | ||
| })); | ||
| it('should create the app', () => { | ||
| const fixture = TestBed.createComponent(AppComponent); | ||
| const app = fixture.debugElement.componentInstance; | ||
| expect(app).toBeTruthy(); | ||
| }); | ||
| }); | ||
| ` | ||
| ); | ||
|
|
||
| host.overwrite( | ||
| `apps/${options.name}/src/app/app.component.html`, | ||
| `<div style="text-align:center"> | ||
| <h1>Welcome to ${options.name}!</h1> | ||
| <img | ||
| width="300" | ||
| src="https://raw.githubusercontent.com/nrwl/nx/master/nx-logo.png" | ||
| /> | ||
| </div> | ||
| <div>Message: {{ (hello$|async)|json }}</div> | ||
| ` | ||
| ); | ||
|
|
||
| host.overwrite( | ||
| `apps/api/src/app/app.controller.ts`, | ||
| `import { Controller, Get } from '@nestjs/common'; | ||
| import { Message } from '@${scope}/api-interface'; | ||
| import { AppService } from './app.service'; | ||
| @Controller() | ||
| export class AppController { | ||
| constructor(private readonly appService: AppService) {} | ||
| @Get('hello') | ||
| getData(): Message { | ||
| return this.appService.getData(); | ||
| } | ||
| if (!options.skipGit) { | ||
| const commit = | ||
| typeof options.commit == 'object' | ||
| ? options.commit | ||
| : !!options.commit | ||
| ? {} | ||
| : false; | ||
| context.addTask( | ||
| new RepositoryInitializerTask(options.directory, commit), | ||
| packageTask ? [packageTask] : [] | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| host.overwrite( | ||
| `apps/api/src/app/app.service.ts`, | ||
| `import { Injectable } from '@nestjs/common'; | ||
| import { Message } from '@${scope}/api-interface'; | ||
| @Injectable() | ||
| export class AppService { | ||
| getData(): Message { | ||
| return { message: 'Welcome to api!' }; | ||
| } | ||
| } | ||
| ` | ||
| ); | ||
| }; | ||
| } | ||
|
|
||
| function addTasks(options: Schema) { | ||
| return (host: Tree, context: SchematicContext) => { | ||
| let packageTask; | ||
| if (!options.skipInstall) { | ||
| packageTask = context.addTask( | ||
| new NodePackageInstallTask(options.directory) | ||
| ); | ||
| } | ||
| if (!options.skipGit) { | ||
| const commit = | ||
| typeof options.commit == 'object' | ||
| ? options.commit | ||
| : !!options.commit | ||
| ? {} | ||
| : false; | ||
| context.addTask( | ||
| new RepositoryInitializerTask(options.directory, commit), | ||
| packageTask ? [packageTask] : [] | ||
| ); | ||
| } | ||
| }; | ||
| } |
Oops, something went wrong.