Merge pull request #1551 from IgniteUI/dpetev/remove-react-igr-es6

refactor(igr): remove deprecated igr-es6 project type

Author: damyanpetev

.vscode/cSpell.json

@@ -1,13 +1,11 @@
-// cSpell Settings
 {
-    // Version of the setting file.  Always 0.1
-    "version": "0.1",
     // language - current active spelling language
     "language": "en",
     // words - list of words to be always considered correct
     "words": [
+        "igniteui",
         "infragistics",
-				"igniteui"
+        "webcomponents"
     ],
     // flagWords - list of words to be always considered incorrect
     // This is useful for offensive words and common spelling errors.

.vscode/launch.json

@@ -109,21 +109,6 @@
 			"console": "externalTerminal",
 			"preLaunchTask": "build",
 			"outFiles": ["${workspaceFolder}/**/*.js"],
-			"args": [
-				"new",
-				"reactproj",
-				"--framework=react"
-			]
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Launch New React TS ES6",
-			"cwd": "${workspaceRoot}/output",
-			"program": "${workspaceRoot}/packages/cli/bin/execute.js",
-			"console": "externalTerminal",
-			"preLaunchTask": "build",
-			"outFiles": ["${workspaceFolder}/**/*.js"],
 			"args": [
 				"new",
 				"reactproj",

README.md

@@ -101,9 +101,9 @@ ig new "IG Project" --framework=angular --type=igx-ts --template=side-nav
 ```
 #### Generate Ignite UI for React project
 
-To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-es6` as project type:
+To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-ts` as project type:
 ```bash
-ig new "IG Project" --framework=react --type=igr-es6
+ig new "IG Project" --framework=react --type=igr-ts
 ```
 #### Generate Ignite UI for Web Components project
 

packages/cli/README.md

@@ -79,9 +79,9 @@ The `igniteui-cli` makes full use of the component definitions provided by [`ign
 
 #### Generate Ignite UI for React project
 
-To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-es6` as project type:
+To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-ts` as project type:
 ```bash
-ig new "IG Project" --framework=react --type=igr-es6
+ig new "IG Project" --framework=react --type=igr-ts
 ```
 
 #### Adding components

packages/cli/lib/commands/start.ts

@@ -65,7 +65,7 @@ const command: StartCommandType = {
 			cd14: config.project.theme
 		});
 
-		let port = Number(argv.port) || defaultPort;
+		const port = Number(argv.port) || defaultPort;
 		// TODO: consider piping the stdin so that we handle the cp's termination
 		// this may require additional logic to be implemented if the cp asks for input
 		const options: ExecSyncOptions = { stdio: "inherit", killSignal: "SIGINT" };
@@ -82,23 +82,11 @@ const command: StartCommandType = {
 
 				browserSync.init(bsConfig);
 				break;
-			case "react":
-				if (port) {
-					if (projectType === "igr-ts") {
-						execSyncNpmStart(port, options);
-					} else {
-						// https://facebook.github.io/create-react-app/docs/advanced-configuration
-						// react-scripts start "--port=dafaultPort" is not a valid command for all environments.
-						// .env file is included and used by both igr-es6 and es6 now,
-						// to specify the port for all environments (Windows, Mac, etc)
-						process.env.PORT = `${port}`;
-						port = null;
-					}
-				}
-			/* falls through */
 			case "angular":
+			case "react":
 			case "webcomponents":
 				execSyncNpmStart(port, options);
+				break;
 			default:
 				break;
 		}

packages/cli/lib/templates/IgniteUIForReactTemplate.ts

@@ -72,11 +72,6 @@ export class IgniteUIForReactTemplate implements Template {
 			options.parentRoutingModulePath = "src/app/app-routes.tsx";
 		}
 
-		if (this.projectType === "igr-es6") {
-			this.registerJSONRoute(projectPath, name, options.parentRoutingModulePath);
-			return;
-		}
-
 		const routeModulePath: string = options.parentRoutingModulePath;
 
 		if (!(options && options.skipRoute)
@@ -148,27 +143,4 @@ export class IgniteUIForReactTemplate implements Template {
 		const name = Util.nameFromPath(pathName);
 		return Util.lowerDashed(name);
 	}
-
-	protected registerJSONRoute(projectPath: string, name: string, routingModulePath: string) {
-		const configFile = fs.readFileSync(path.join(projectPath, routingModulePath), "utf8");
-		const viewsArr = JSON.parse(configFile);
-		viewsArr.push({
-			componentPath: this.getViewLink(name),
-			path: "/" + this.folderName(Util.nameFromPath(name)),
-			text: this.getToolbarLink(name)
-		});
-
-		fs.writeFileSync(path.join(projectPath, routingModulePath), JSON.stringify(viewsArr, null, 4));
-	}
-
-	protected getViewLink(name: string): string {
-		const filePath = "./views/" + this.folderName(name);
-		return filePath;
-	}
-
-	protected getToolbarLink(name: string): string {
-		name = Util.nameFromPath(name);
-		const toolbarLink = name.replace(/\w\S*/g, txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
-		return toolbarLink;
-	}
 }