chore: support es6 and @angular in newly created projects (#30)

* chore: support es6 and @angular in newly created projects

* code review

* Format code

Co-authored-by: Samuel Rodrigues <[email protected]>

Author: scrodrigues

generators/framework/templates/tsconfig.json

@@ -1,23 +1,23 @@
 {
   "compileOnSave": true,
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "system",
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "removeComments": false,
+    "removeComments": true,
     "noImplicitAny": false,
-    "declaration": true,    
+    "declaration": true,
     "forceConsistentCasingInFileNames" : true,
     "allowUnreachableCode" : false,
     "noUnusedLocals": false,
     "noUnusedParameters" : false,
     "noImplicitReturns": true,
     "rootDir": "../../../"    
   },
-   "include": [    
+  "include": [
     "src/**/*.ts"    
-  ]  
+  ]
 }

generators/package/index.ts

@@ -61,12 +61,15 @@ module.exports = class extends HtmlGenerator {
     }
 
     if (fs.existsSync(this.destinationPath(webAppFolder, "node_modules"))) {
-      const excludeFilter = (folder) => { return folder.startsWith("cmf") && ["cmf.taura", "cmf.core", "cmf.core.multicast.client", "cmf.mes", "cmf.polyfill", "cmf.angular", "cmf.instascan", "cmf.core.examples", "cmf.mes.examples"].indexOf(folder) < 0 && !folder.startsWith("cmf.style") };
-      webAppPackages = new Set(fs.readdirSync(this.destinationPath(webAppFolder, "node_modules")).filter(excludeFilter));
+	const excludeFilter = (folder) => { 
+		const inclusionList = folder.startsWith("cmf") && ["cmf.taura", "cmf.core", "cmf.core.multicast.client", "cmf.mes", "cmf.polyfill", "cmf.angular", "cmf.instascan", "cmf.core.examples", "cmf.mes.examples"].indexOf(folder) < 0 && !folder.startsWith("cmf.style");
+		return inclusionList || folder === "@angular"; // let's add the @angular dependency since it's a special case
+	};
+	webAppPackages = new Set(fs.readdirSync(this.destinationPath(webAppFolder, "node_modules")).filter(excludeFilter));
     }
 
     allPackages = (<any>repositoryPackages).union(webAppPackages);
-    const packageNames: {name: string, checked: boolean}[] = Array.from(allPackages).filter((pkg) => !(<string>pkg).startsWith(".")).sort().map((pkg) => {return {name: pkg, checked: pkg === "cmf.lbos" }})
+    const packageNames: {name: string, checked: boolean}[] = Array.from(allPackages).filter((pkg) => !(<string>pkg).startsWith(".")).sort().map((pkg) => {return {name: pkg, checked: (pkg === "cmf.lbos" || pkg === "@angular") }})
     const choices = this._getAppPackageDescriptions(webAppFolder, packageNames);
 
     return this.prompt([{

generators/package/templates/tsconfig.json

@@ -1,26 +1,26 @@
 {
   "compileOnSave": true,
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6", 
     "module": "system",
     "lib": ["es2016", "dom"],
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "removeComments": false,
+    "removeComments": true,
     "noImplicitAny": false,
-    "declaration": true,    
+    "declaration": true,
     "forceConsistentCasingInFileNames" : true,
     "allowUnreachableCode" : false,
     "noUnusedLocals": false,
     "noUnusedParameters" : false,
     "noImplicitReturns": true,
-    "skipLibCheck": true,
+    "skipLibCheck": true,      
     "rootDir": "../../../../"    
   },
-   "include": [    
+  "include": [
     "src/**/*.ts",
     "test/**/*.ts"    
-  ]  
-}
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/generator-html",
-  "version": "7.1.1",
+  "version": "8.0.0-0",
   "description": "CMF HTML GUI Scaffolding",
   "files": [
     "generators/*.js",