diff --git a/angular/src/schematics/add/index.ts b/angular/src/schematics/add/index.ts index a2465e29e7..2d0de24367 100644 --- a/angular/src/schematics/add/index.ts +++ b/angular/src/schematics/add/index.ts @@ -40,20 +40,23 @@ function addIonicAngularModuleToAppModule(projectSourceRoot: Path): Rule { function addIonicStyles(projectName: string, projectSourceRoot: Path): Rule { return (host: Tree) => { const ionicStyles = [ + 'node_modules/@ionic/angular/css/core.css', 'node_modules/@ionic/angular/css/normalize.css', 'node_modules/@ionic/angular/css/structure.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/float-elements.css', 'node_modules/@ionic/angular/css/text-alignment.css', 'node_modules/@ionic/angular/css/text-transformation.css', 'node_modules/@ionic/angular/css/flex-utils.css', `${projectSourceRoot}/theme/variables.css` - ].forEach(entry => { + ] + + ionicStyles.forEach(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', output: './svg' }; - addAsset(host, projectName, ioniconsGlob); + addAsset(host, projectName, 'build', ioniconsGlob); + addAsset(host, projectName, 'test', ioniconsGlob); return host; }; } diff --git a/angular/src/schematics/utils/config.ts b/angular/src/schematics/utils/config.ts index 39f0576431..dc2f1881b2 100644 --- a/angular/src/schematics/utils/config.ts +++ b/angular/src/schematics/utils/config.ts @@ -62,10 +62,10 @@ export function addStyle(host: Tree, projectName: string, stylePath: string) { 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 appConfig = getAngularAppConfig(config, projectName); - appConfig.architect.build.options.assets.push(asset); + appConfig.architect[architect].options.assets.push(asset); writeConfig(host, config); }