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

fix(schematics): update ngAdd schematic (#22858)

Browse Source 
* fix(schematics): update ngAdd schematic
Closes https://github.com/ionic-team/angular-toolkit/issues/415
Closes https://github.com/ionic-team/angular-toolkit/issues/419

* Update angular/src/schematics/utils/config.ts

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>

* Update angular/src/schematics/add/index.ts

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
This commit is contained in:
Mike Hartington
2021-02-02 16:44:33 -05:00
committed by GitHub
parent b6b2d34fd4
commit 487349f02a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,17 +40,20 @@ function addIonicAngularModuleToAppModule(projectSourceRoot: Path): Rule {
function addIonicStyles(projectName: string, projectSourceRoot: Path): Rule { function addIonicStyles(projectName: string, projectSourceRoot: Path): Rule {
return (host: Tree) => { return (host: Tree) => {
const ionicStyles = [ const ionicStyles = [
'node_modules/@ionic/angular/css/core.css',
'node_modules/@ionic/angular/css/normalize.css', 'node_modules/@ionic/angular/css/normalize.css',
'node_modules/@ionic/angular/css/structure.css', 'node_modules/@ionic/angular/css/structure.css',
'node_modules/@ionic/angular/css/typography.css', 'node_modules/@ionic/angular/css/typography.css',
'node_modules/@ionic/angular/css/core.css', 'node_modules/@ionic/angular/css/display.css',
'node_modules/@ionic/angular/css/padding.css', 'node_modules/@ionic/angular/css/padding.css',
'node_modules/@ionic/angular/css/float-elements.css', 'node_modules/@ionic/angular/css/float-elements.css',
'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',
`${projectSourceRoot}/theme/variables.css` `${projectSourceRoot}/theme/variables.css`
].forEach(entry => { ]
ionicStyles.forEach(entry => {
addStyle(host, projectName, entry); addStyle(host, projectName, entry);
}); });
return host; return host;
@ -64,7 +67,8 @@ function addIonicons(projectName: string): Rule {
input: 'node_modules/ionicons/dist/ionicons/svg', input: 'node_modules/ionicons/dist/ionicons/svg',
output: './svg' output: './svg'
}; };
addAsset(host, projectName, ioniconsGlob); addAsset(host, projectName, 'build', ioniconsGlob);
addAsset(host, projectName, 'test', ioniconsGlob);
return host; return host;
}; };
} }

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

@ -62,10 +62,10 @@ export function addStyle(host: Tree, projectName: string, stylePath: string) {
writeConfig(host, config); writeConfig(host, config);
} }
export function addAsset(host: Tree, projectName: string, asset: string | {glob: string; input: string; output: string}) { export function addAsset(host: Tree, projectName: string, architect: string, asset: string | {glob: string; input: string; output: string}) {
const config = readConfig(host); const config = readConfig(host);
const appConfig = getAngularAppConfig(config, projectName); const appConfig = getAngularAppConfig(config, projectName);
appConfig.architect.build.options.assets.push(asset); appConfig.architect[architect].options.assets.push(asset);
writeConfig(host, config); writeConfig(host, config);
} }