Skip to content

fix(ng-add): Fix path for css styles in monorepo #19904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 23, 2020
Merged

fix(ng-add): Fix path for css styles in monorepo #19904

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a24c37a
feat(ng-add): Fix path for css styles in monorepo
eduardoRoth Nov 13, 2019
1f43ce2
fix(): Changes proposed by SchnWalter
eduardoRoth Jan 22, 2020
e31aa7b
chore(): Remove unused var
eduardoRoth Jan 22, 2020
b78e53e
chore(): Remove unused var
eduardoRoth Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions angular/src/schematics/add/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function addIonicAngularModuleToAppModule(projectSourceRoot): Rule {
};
}

function addIonicStyles(): Rule {
function addIonicStyles(projectSourceRoot): Rule {
return (host: Tree) => {
const ionicStyles = [
'node_modules/@ionic/angular/css/normalize.css',
Expand All @@ -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'
`${projectSourceRoot}/theme/variables.css`
].forEach(entry => {
addStyle(host, entry);
});
Expand Down Expand Up @@ -117,8 +117,7 @@ export default function ngAdd(options: IonAddOptions): Rule {
`Ionic Add requires a project type of "application".`
);
}

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)
Expand All @@ -129,7 +128,7 @@ export default function ngAdd(options: IonAddOptions): Rule {
addIonicAngularToolkitToPackageJson(),
addIonicAngularModuleToAppModule(sourcePath),
addIonicBuilder(),
addIonicStyles(),
addIonicStyles(sourcePath),
addIonicons(),
mergeWith(rootTemplateSource),
// install freshly added dependencies
Expand Down