Merge branch 'master' into mstoyanova/ai-assistance

Author: kdinev

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@ Describe the issue.
 
 - Ignite UI CLI version: x.x.x
 - Framework: Angular|React|jQuery|Web Components
-- Project type: ig-ts|igx-ts
+- Project type: igx-ts|igr-ts|js|igc-ts
 
 ### Steps to reproduce  
 

.vscode/launch.json

@@ -88,24 +88,6 @@
 				"--framework=angular"
 			]
 		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Launch New Angular ig-ts",
-			"cwd": "${workspaceRoot}/output",
-			"program": "${workspaceRoot}/packages/cli/bin/execute.js",
-			"console": "externalTerminal",
-			"preLaunchTask": "build",
-			"outFiles": [ "${workspaceRoot}/lib/**/*.js",
-				"${workspaceRoot}/spec/**/*.js" ],
-			"args": [
-				"new",
-				"angular-wrapers-proj",
-				"--framework=angular",
-				"--type=ig-ts",
-				"--template=empty"
-			]
-		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -268,21 +250,6 @@
 				"--name=mycombo"
 			]
 		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Add Combo to Angular ig-ts",
-			"cwd": "${workspaceRoot}/output/angular-wrapers-proj",
-			"program": "${workspaceRoot}/packages/cli/bin/execute.js",
-			"console": "externalTerminal",
-			"preLaunchTask": "build",
-			"outFiles": ["${workspaceFolder}/**/*.js"],
-			"args": [
-				"add",
-				"--template=combo",
-				"--name=mycombo"
-			]
-		},
 		{
 			"type": "node",
 			"request": "launch",

packages/cli/lib/TemplateManager.ts

@@ -1,7 +1,6 @@
 import { IgniteUIForAngularTemplate } from "@igniteui/angular-templates";
 import { BaseTemplateManager, Template, Util } from "@igniteui/cli-core";
 import * as path from "path";
-import { AngularTemplate } from "./templates/AngularTemplate";
 import { IgniteUIForWebComponentsTemplate } from "./templates/IgniteUIForWebComponentsTemplate";
 import { jQueryTemplate } from "./templates/jQueryTemplate";
 import { ReactTemplate } from "./templates/ReactTemplate";
@@ -31,9 +30,6 @@ export class TemplateManager extends BaseTemplateManager {
 				case "react|es6":
 					template = new ReactTemplate(rootPath);
 					break;
-				case "angular|ig-ts":
-					template = new AngularTemplate(rootPath);
-					break;
 				case "angular|igx-ts":
 					template = new IgniteUIForAngularTemplate(rootPath);
 					break;

packages/cli/lib/templates/AngularTemplate.ts

@@ -136,55 +136,6 @@ export class AngularTemplate implements Template {
 			files.push("modules/infragistics.gridexcelexporter.js");
 			ProjectConfig.setConfig(config);
 		}
-
-		// ensure ig-ts resource files registration
-		if (this.projectType === "ig-ts") { this.registerSourceFiles(config, projectPath); }
-	}
-
-	/**
-	 * Register igniteui-angular-wrappers(ig-ts) resources under the project"s angular.json scripts and styles collections,
-	 * so these are picked by Angular"s internal webpack to build and serve
-	 */
-	protected registerSourceFiles(config: Config, projectPath: string) {
-		const fs: IFileSystem = App.container.get(FS_TOKEN);
-		const sourceFiles: string[] = config.project.sourceFiles;
-		const igniteuiSource: string = config.project.igniteuiSource;
-		const themeCSS = "css/themes/infragistics/infragistics.theme.css";
-		const infragisticsCSS = "css/structure/infragistics.css";
-		let workspaceConfigObj;
-		let updateFile = false;
-
-		const workspacePath = path.join(projectPath, "angular.json");
-		if (this.fileSystem.fileExists(workspacePath)) {
-			workspaceConfigObj = JSON.parse(this.fileSystem.readFile(workspacePath));
-			const scripts =
-				workspaceConfigObj.projects[Object.keys(workspaceConfigObj.projects)[0]].architect.build.options.scripts;
-			let styles =
-				workspaceConfigObj.projects[Object.keys(workspaceConfigObj.projects)[0]].architect.build.options.styles;
-
-			if (!styles.find(x => x.input?.includes(themeCSS)) || !styles.find(x => x.input?.includes(infragisticsCSS))) {
-				styles = igniteuiSource === "@infragistics/ignite-ui-full/en/" ?
-					styles.push(
-						{ input: `${"@infragistics/ignite-ui-full/en/" + themeCSS}` },
-						{ input: `${"@infragistics/ignite-ui-full/en/" + infragisticsCSS}` }) :
-					styles.push({ input: `${"ignite-ui/" + themeCSS}` }, { input: `${"ignite-ui/" + infragisticsCSS}` });
-				updateFile = true;
-			}
-
-			for (const fileName of sourceFiles) {
-				if (!scripts.find(x => x.bundleName === fileName)) {
-					scripts.push({
-						bundleName: fileName,
-						input: `${igniteuiSource + "/js/" + fileName}`
-					});
-					updateFile = true;
-				}
-			}
-			if (updateFile) { fs.writeFile(workspacePath, Util.formatAngularJsonOptions(workspaceConfigObj)); }
-		} else {
-			Util.log(`No angular.json file found! May have to manually add igniteui-angular-wrappers styles and scripts
-							(infragistics.core.js, infragistics.lob.js, etc.) to the corresponding angular.json styles and scripts collections`);
-		}
 	}
 
 	protected folderName(pathName: string): string {