From a24c37adeb8e2f0e5b38ed67d1cd23e47c05c846 Mon Sep 17 00:00:00 2001 From: Eduardo Roth Date: Wed, 13 Nov 2019 15:26:04 -0600 Subject: [PATCH 1/4] feat(ng-add): Fix path for css styles in monorepo --- angular/src/schematics/add/index.ts | 7 ++++--- angular/src/schematics/add/schema.d.ts | 1 + angular/src/schematics/add/schema.json | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/angular/src/schematics/add/index.ts b/angular/src/schematics/add/index.ts index 59df57a8259..5717a88e2cd 100644 --- a/angular/src/schematics/add/index.ts +++ b/angular/src/schematics/add/index.ts @@ -37,7 +37,7 @@ function addIonicAngularModuleToAppModule(projectSourceRoot): Rule { }; } -function addIonicStyles(): Rule { +function addIonicStyles(root?: string): Rule { return (host: Tree) => { const ionicStyles = [ 'node_modules/@ionic/angular/css/normalize.css', @@ -49,7 +49,7 @@ function addIonicStyles(): Rule { 'node_modules/@ionic/angular/css/text-alignment.css', 'node_modules/@ionic/angular/css/text-transformation.css', 'node_modules/@ionic/angular/css/flex-utils.css', - 'src/theme/variables.css' + `${root}src/theme/variables.css` ].forEach(entry => { addStyle(host, entry); }); @@ -117,6 +117,7 @@ export default function ngAdd(options: IonAddOptions): Rule { `Ionic Add requires a project type of "application".` ); } + const root = (options.root) ? `${options.root}/${options.project}/` : ''; const sourcePath = join(project.root as Path, 'src'); const rootTemplateSource = apply(url('./files/root'), [ @@ -129,7 +130,7 @@ export default function ngAdd(options: IonAddOptions): Rule { addIonicAngularToolkitToPackageJson(), addIonicAngularModuleToAppModule(sourcePath), addIonicBuilder(), - addIonicStyles(), + addIonicStyles(root), addIonicons(), mergeWith(rootTemplateSource), // install freshly added dependencies diff --git a/angular/src/schematics/add/schema.d.ts b/angular/src/schematics/add/schema.d.ts index 0f8f1b52154..cfa19b842b5 100644 --- a/angular/src/schematics/add/schema.d.ts +++ b/angular/src/schematics/add/schema.d.ts @@ -1,3 +1,4 @@ export interface Schema { project?: string; + root?: string; } diff --git a/angular/src/schematics/add/schema.json b/angular/src/schematics/add/schema.json index 936d5cab1fa..def5de7c8cf 100644 --- a/angular/src/schematics/add/schema.json +++ b/angular/src/schematics/add/schema.json @@ -10,6 +10,10 @@ "$default": { "$source": "projectName" } + }, + "root": { + "type": "string", + "description": "The root of the project when it's a multiple application angular project" } }, "required": [] From 1f43ce277b6928eb7b602dd0f8110709e95e3ae9 Mon Sep 17 00:00:00 2001 From: Eduardo Roth Date: Wed, 22 Jan 2020 00:06:43 -0600 Subject: [PATCH 2/4] fix(): Changes proposed by SchnWalter --- angular/src/schematics/add/index.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/angular/src/schematics/add/index.ts b/angular/src/schematics/add/index.ts index 5717a88e2cd..0d316de94d1 100644 --- a/angular/src/schematics/add/index.ts +++ b/angular/src/schematics/add/index.ts @@ -37,7 +37,7 @@ function addIonicAngularModuleToAppModule(projectSourceRoot): Rule { }; } -function addIonicStyles(root?: string): Rule { +function addIonicStyles(projectSourceRoot): Rule { return (host: Tree) => { const ionicStyles = [ 'node_modules/@ionic/angular/css/normalize.css', @@ -49,7 +49,7 @@ function addIonicStyles(root?: string): Rule { 'node_modules/@ionic/angular/css/text-alignment.css', 'node_modules/@ionic/angular/css/text-transformation.css', 'node_modules/@ionic/angular/css/flex-utils.css', - `${root}src/theme/variables.css` + `${projectSourceRoot}/theme/variables.css` ].forEach(entry => { addStyle(host, entry); }); @@ -117,9 +117,7 @@ export default function ngAdd(options: IonAddOptions): Rule { `Ionic Add requires a project type of "application".` ); } - const root = (options.root) ? `${options.root}/${options.project}/` : ''; - - const sourcePath = join(project.root as Path, 'src'); + const sourcePath = join(project.root as Path, project.sourceRoot as Path); const rootTemplateSource = apply(url('./files/root'), [ template({ ...options }), move(sourcePath) @@ -130,7 +128,7 @@ export default function ngAdd(options: IonAddOptions): Rule { addIonicAngularToolkitToPackageJson(), addIonicAngularModuleToAppModule(sourcePath), addIonicBuilder(), - addIonicStyles(root), + addIonicStyles(sourcePath), addIonicons(), mergeWith(rootTemplateSource), // install freshly added dependencies From e31aa7bad9cb0fffc38de287a59847c52214c32b Mon Sep 17 00:00:00 2001 From: Eduardo Roth Date: Wed, 22 Jan 2020 00:33:57 -0600 Subject: [PATCH 3/4] chore(): Remove unused var --- angular/src/schematics/add/schema.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/angular/src/schematics/add/schema.d.ts b/angular/src/schematics/add/schema.d.ts index cfa19b842b5..0f8f1b52154 100644 --- a/angular/src/schematics/add/schema.d.ts +++ b/angular/src/schematics/add/schema.d.ts @@ -1,4 +1,3 @@ export interface Schema { project?: string; - root?: string; } From b78e53e6d7118c8a10193231d4ce1ab14c70e39a Mon Sep 17 00:00:00 2001 From: Eduardo Roth Date: Wed, 22 Jan 2020 00:34:13 -0600 Subject: [PATCH 4/4] chore(): Remove unused var --- angular/src/schematics/add/schema.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/angular/src/schematics/add/schema.json b/angular/src/schematics/add/schema.json index def5de7c8cf..936d5cab1fa 100644 --- a/angular/src/schematics/add/schema.json +++ b/angular/src/schematics/add/schema.json @@ -10,10 +10,6 @@ "$default": { "$source": "projectName" } - }, - "root": { - "type": "string", - "description": "The root of the project when it's a multiple application angular project" } }, "required": []