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

fix(ngAdd): fix path for css styles in monorepo (#19904)

Browse Source 
* feat(ng-add): Fix path for css styles in monorepo

* fix(): Changes proposed by SchnWalter

* chore(): Remove unused var

* chore(): Remove unused var
This commit is contained in:
Eduardo Roth
2020-01-23 09:11:29 -06:00
committed by Mike Hartington
parent e613f63590
commit e693169cf0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ function addIonicAngularModuleToAppModule(projectSourceRoot): Rule {
}; };
} }
function addIonicStyles(): Rule { function addIonicStyles(projectSourceRoot): Rule {
return (host: Tree) => { return (host: Tree) => {
const ionicStyles = [ const ionicStyles = [
'node_modules/@ionic/angular/css/normalize.css', '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-alignment.css',
'node_modules/@ionic/angular/css/text-transformation.css', 'node_modules/@ionic/angular/css/text-transformation.css',
'node_modules/@ionic/angular/css/flex-utils.css', 'node_modules/@ionic/angular/css/flex-utils.css',
'src/theme/variables.css' `${projectSourceRoot}/theme/variables.css`
].forEach(entry => { ].forEach(entry => {
addStyle(host, entry); addStyle(host, entry);
}); });
@ -117,8 +117,7 @@ export default function ngAdd(options: IonAddOptions): Rule {
`Ionic Add requires a project type of "application".` `Ionic Add requires a project type of "application".`
); );
} }
const sourcePath = join(project.root as Path, project.sourceRoot as Path);
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)
@ -129,7 +128,7 @@ export default function ngAdd(options: IonAddOptions): Rule {
addIonicAngularToolkitToPackageJson(), addIonicAngularToolkitToPackageJson(),
addIonicAngularModuleToAppModule(sourcePath), addIonicAngularModuleToAppModule(sourcePath),
addIonicBuilder(), addIonicBuilder(),
addIonicStyles(), addIonicStyles(sourcePath),
addIonicons(), addIonicons(),
mergeWith(rootTemplateSource), mergeWith(rootTemplateSource),
// install freshly added dependencies // install freshly added dependencies