javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(angular): ng-add schematic (#20281)

Browse Source 
* fix(angular): update ng-add schematic to use the project name

* fix(angular): use relative schematics collection.json path.
This commit is contained in:
Walter S
2020-01-24 20:13:02 +02:00
committed by Mike Hartington
parent 59d064979f
commit 09d951ae1b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
angular/src/schematics/add/index.ts
View File

@ -1,9 +1,8 @@
import { join, Path } from '@angular-devkit/core';
import { apply, chain, mergeWith, move, Rule, SchematicContext, SchematicsException, template, Tree, url } from '@angular-devkit/schematics';
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
import { WorkspaceProject } from '@angular-devkit/core/src/experimental/workspace';
import { addModuleImportToRootModule } from './../utils/ast';
import { addArchitectBuilder, addStyle, getWorkspace, addAsset } from './../utils/config';
import { addArchitectBuilder, addStyle, getWorkspace, addAsset, WorkspaceProject, WorkspaceSchema } from './../utils/config';
import { addPackageToPackageJson } from './../utils/package';
import { Schema as IonAddOptions } from './schema';
@ -70,29 +69,29 @@ function addIonicons(): Rule {
};
}
function addIonicBuilder(project: WorkspaceProject): Rule {
function addIonicBuilder(projectName: string): Rule {
return (host: Tree) => {
addArchitectBuilder(host, 'ionic-cordova-serve', {
builder: '@ionic/angular-toolkit:cordova-serve',
options: {
cordovaBuildTarget: `${project}:ionic-cordova-build`,
devServerTarget: `${project}:serve`
cordovaBuildTarget: `${projectName}:ionic-cordova-build`,
devServerTarget: `${projectName}:serve`
},
configurations: {
production: {
cordovaBuildTarget: `${project}:ionic-cordova-build:production`,
devServerTarget: `${project}:serve:production`
cordovaBuildTarget: `${projectName}:ionic-cordova-build:production`,
devServerTarget: `${projectName}:serve:production`
}
}
});
addArchitectBuilder(host, 'ionic-cordova-build', {
builder: '@ionic/angular-toolkit:cordova-build',
options: {
browserTarget: `${project}:build`
browserTarget: `${projectName}:build`
},
configurations: {
production: {
browserTarget: `${project}:build:production`
browserTarget: `${projectName}:build:production`
}
}
});
@ -108,17 +107,17 @@ function installNodeDeps() {
export default function ngAdd(options: IonAddOptions): Rule {
return (host: Tree) => {
const workspace = getWorkspace(host);
const workspace: WorkspaceSchema = getWorkspace(host);
if (!options.project) {
options.project = Object.keys(workspace.projects)[0];
}
const project = workspace.projects[options.project];
const project: WorkspaceProject = workspace.projects[options.project];
if (project.projectType !== 'application') {
throw new SchematicsException(
`Ionic Add requires a project type of "application".`
);
}
const sourcePath = join(project.root as Path, project.sourceRoot as Path);
const sourcePath: Path = join(project.root as Path, project.sourceRoot as Path);
const rootTemplateSource = apply(url('./files/root'), [
template({ ...options }),
move(sourcePath)
@ -128,7 +127,7 @@ export default function ngAdd(options: IonAddOptions): Rule {
addIonicAngularToPackageJson(),
addIonicAngularToolkitToPackageJson(),
addIonicAngularModuleToAppModule(sourcePath),
addIonicBuilder(project),
addIonicBuilder(options.project),
addIonicStyles(sourcePath),
addIonicons(),
mergeWith(rootTemplateSource),

1
angular/src/schematics/utils/config.ts
View File

@ -89,6 +89,7 @@ export function addArchitectBuilder(host: Tree, builderName: string, builderOpts
}
export type WorkspaceSchema = experimental.workspace.WorkspaceSchema;
export type WorkspaceProject = experimental.workspace.WorkspaceProject;
export function getWorkspacePath(host: Tree): string {
const possibleFiles = ['/angular.json', '/.angular.json'];