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

fix(angular): fix adding @ionic/angular when using ng add (#17597)

Browse Source 
closes #17596
This commit is contained in:
Amadou Sall
2019-02-27 22:08:43 +01:00
committed by Liam DeBeasi
parent 9b3a3716df
commit 484d92cd50
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,20 @@
import { import {
Rule,
SchematicContext,
SchematicsException,
Tree,
apply, apply,
chain, chain,
mergeWith, mergeWith,
move, move,
Rule,
SchematicContext,
SchematicsException,
template, template,
Tree,
url url
} from '@angular-devkit/schematics'; } from '@angular-devkit/schematics';
import { Path, join } from '@angular-devkit/core'; import { join, Path } from '@angular-devkit/core';
import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks'; import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
import { addPackageToPackageJson } from './../utils/package'; import { addPackageToPackageJson } from './../utils/package';
import { addModuleImportToRootModule } from './../utils/ast'; import { addModuleImportToRootModule } from './../utils/ast';
import { addStyle, getWorkspace, addArchitectBuilder } from './../utils/config'; import { addArchitectBuilder, addStyle, getWorkspace } from './../utils/config';
import { Schema as IonAddOptions } from './schema'; import { Schema as IonAddOptions } from './schema';
function addIonicAngularToPackageJson(): Rule { function addIonicAngularToPackageJson(): Rule {
@ -36,10 +36,11 @@ function addIonicAngularToolkitToPackageJson(): Rule {
}; };
} }
function addIonicAngularModuleToAppModule(): Rule { function addIonicAngularModuleToAppModule(projectSourceRoot): Rule {
return (host: Tree) => { return (host: Tree) => {
addModuleImportToRootModule( addModuleImportToRootModule(
host, host,
projectSourceRoot,
'IonicModule.forRoot()', 'IonicModule.forRoot()',
'@ionic/angular' '@ionic/angular'
); );
@ -118,14 +119,14 @@ export default function ngAdd(options: IonAddOptions): Rule {
const sourcePath = join(project.root as Path, 'src'); const sourcePath = join(project.root as Path, 'src');
const rootTemplateSource = apply(url('./files/root'), [ const rootTemplateSource = apply(url('./files/root'), [
template({ ...options }), template({...options}),
move(sourcePath) move(sourcePath)
]); ]);
return chain([ return chain([
// @ionic/angular // @ionic/angular
addIonicAngularToPackageJson(), addIonicAngularToPackageJson(),
addIonicAngularToolkitToPackageJson(), addIonicAngularToolkitToPackageJson(),
addIonicAngularModuleToAppModule(), addIonicAngularModuleToAppModule(sourcePath),
addIonicBuilder(), addIonicBuilder(),
addIonicStyles(), addIonicStyles(),
mergeWith(rootTemplateSource), mergeWith(rootTemplateSource),

3
angular/src/schematics/utils/ast.ts
View File

@ -27,12 +27,13 @@ export function getSourceFile(host: Tree, path: string): ts.SourceFile {
*/ */
export function addModuleImportToRootModule( export function addModuleImportToRootModule(
host: Tree, host: Tree,
projectSourceRoot,
moduleName: string, moduleName: string,
importSrc: string importSrc: string
) { ) {
addModuleImportToModule( addModuleImportToModule(
host, host,
normalize(`src/app/app.module.ts`), normalize(`${projectSourceRoot}/app/app.module.ts`),
moduleName, moduleName,
importSrc importSrc
); );