fix(schematics): font and materials icons import, provideAnimations provider (#1740)

mddragnev · web-flow · commit 1153d2146474 · 2026-06-26T14:26:58.000+03:00
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
@@ -24,14 +24,14 @@
     "@igniteui/cli-core": "~15.4.0",
     "@schematics/angular": "^22.0.0",
     "minimatch": "^10.0.1",
-    "rxjs": "~7.8.1"
+    "rxjs": "~7.8.1",
+    "typescript": "~5.6.2"
   },
   "devDependencies": {
     "@types/jasmine": "^5.1.4",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^22.5.5",
-    "jasmine": "^5.12.0",
-    "typescript": "~5.6.2"
+    "jasmine": "^5.12.0"
   },
   "ng-update": {
     "migrations": "./src/migrations/migration-collection.json"
diff --git a/packages/ng-schematics/src/cli-config/index_spec.ts b/packages/ng-schematics/src/cli-config/index_spec.ts
@@ -129,6 +129,75 @@ describe("cli-config schematic", () => {
 		expect(headContentsRegex.exec(content)!.pop()).toContain("family=Material+Icons");
 	});
 
+	it("should add Titillium and Material Icons when build options do not have index", async () => {
+		const targetFile = "/src/index.html";
+		const ngJsonWithoutBuildIndex = {
+			projects: {
+				testProj: {
+					root: "",
+					sourceRoot,
+					architect: {
+						build: {
+							options: {
+								main: `${sourceRoot}/main.ts`,
+								polyfills: `${sourceRoot}/polyfills.ts`,
+								scripts: []
+							}
+						},
+						serve: {},
+						test: {}
+					}
+				}
+			},
+			version: 1
+		};
+
+		tree.overwrite("/angular.json", JSON.stringify(ngJsonWithoutBuildIndex));
+		await runner.runSchematic("cli-config", {}, tree);
+
+		const content = tree.readContent(targetFile);
+		const headContentsRegex = /(?:<head>)([\s\S]*)(?:<\/head>)/;
+		expect(headContentsRegex.test(content)).toBeTruthy();
+		expect(headContentsRegex.exec(content)!.pop()).toContain("family=Titillium+Web");
+		expect(headContentsRegex.exec(content)!.pop()).toContain("family=Material+Icons");
+	});
+
+	it("should add Titillium and Material Icons when build index is an object input", async () => {
+		const targetFile = "/src/index.html";
+		const ngJsonWithIndexObject = {
+			projects: {
+				testProj: {
+					root: "",
+					sourceRoot,
+					architect: {
+						build: {
+							options: {
+								main: `${sourceRoot}/main.ts`,
+								polyfills: `${sourceRoot}/polyfills.ts`,
+								scripts: [],
+								index: {
+									input: `${sourceRoot}/index.html`
+								}
+							}
+						},
+						serve: {},
+						test: {}
+					}
+				}
+			},
+			version: 1
+		};
+
+		tree.overwrite("/angular.json", JSON.stringify(ngJsonWithIndexObject));
+		await runner.runSchematic("cli-config", {}, tree);
+
+		const content = tree.readContent(targetFile);
+		const headContentsRegex = /(?:<head>)([\s\S]*)(?:<\/head>)/;
+		expect(headContentsRegex.test(content)).toBeTruthy();
+		expect(headContentsRegex.exec(content)!.pop()).toContain("family=Titillium+Web");
+		expect(headContentsRegex.exec(content)!.pop()).toContain("family=Material+Icons");
+	});
+
 	it("should add the default scss theme correctly", async () => {
 		const targetFile = "/src/styles.scss";
 		tree.create(targetFile, "");
diff --git a/packages/ng-schematics/src/utils/theme-import.ts b/packages/ng-schematics/src/utils/theme-import.ts
@@ -27,7 +27,13 @@ export async function addFontsToIndexHtml(tree: Tree) {
 	const materialIcons = '<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">';
 	const projects = await getProjects(tree);
 	projects.forEach(project => {
-		const targetFile = project.targets.get("build")?.options?.index as string;
+		const indexOptions = project.targets.get("build")?.options?.index as any;
+
+		// newer version of angular.json has index either as string or as object with input property
+		let targetFile = typeof indexOptions === "string" ? indexOptions : indexOptions?.input;
+		if (!targetFile && project.sourceRoot) {
+			targetFile = path.posix.join(project.sourceRoot, "index.html");
+		}
 
 		if (targetFile && tree.exists(targetFile)) {
 			let content = tree.read(targetFile)!.toString();
