feat(stark-all): enable resourcesInlining once we have Angular 6 for …

…inlining template in components ISSUES CLOSED: #376
NationalBankBelgium · May 16, 2018 · 9b33ccd · 9b33ccd
1 parent 8ecbda6
commit 9b33ccd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/packages/stark-core/tsconfig-build.json b/packages/stark-core/tsconfig-build.json
@@ -30,6 +30,7 @@
     "allowEmptyCodegenFiles": false,
     "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
+    "enableResourceInlining": true,
     "flatModuleOutFile": "stark-core.js",
     "flatModuleId": "@nationalbankbelgium/stark-core"
   }

diff --git a/packages/stark-core/tsconfig.spec.json b/packages/stark-core/tsconfig.spec.json
@@ -18,6 +18,7 @@
     "preserveWhitespaces": false,
     "allowEmptyCodegenFiles": false,
     "annotateForClosureCompiler": true,
-    "skipTemplateCodegen": true
+    "skipTemplateCodegen": true,
+    "enableResourceInlining": true
   }
 }
diff --git a/packages/stark-ui/src/modules/app-logo/components/app-logo.component.html b/packages/stark-ui/src/modules/app-logo/components/app-logo.component.html
@@ -1,5 +1,3 @@
-<!-- 
-FIXME: the template is inlined in the component.ts file for now until we migrate to NG6
-In NG6, the resource inlining can be automatically done by NGC thanks to the new "enableResourceInlining" option
-see: https://github.com/angular/angular/commit/b5be18f4059dc09ee9a3eb22ebd0b1485262e8fa
--->
+<a (click)="logoClickHandler($event)" href="#">
+	<i></i>
+</a>
diff --git a/packages/stark-ui/src/modules/app-logo/components/app-logo.component.ts b/packages/stark-ui/src/modules/app-logo/components/app-logo.component.ts
@@ -17,11 +17,7 @@ const componentName: string = "stark-app-logo";
 /* tslint:disable:enforce-component-selector max-inline-declarations use-view-encapsulation use-host-property-decorator */
 @Component({
 	selector: componentName,
-	// FIXME: move the inline template to the component.html file and use templateUrl instead once we migrate to NG6
-	template: `
-		<a (click)="logoClickHandler($event)" href="#">
-			<i></i>
-		</a>`,
+	templateUrl: "./app-logo.component.html",
 	encapsulation: ViewEncapsulation.None,
 	host: { class: "stark-app-logo" }
 })

diff --git a/packages/stark-ui/tsconfig-build.json b/packages/stark-ui/tsconfig-build.json
@@ -43,6 +43,7 @@
     "allowEmptyCodegenFiles": false,
     "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
+    "enableResourceInlining": true,
     "flatModuleOutFile": "stark-ui.js",
     "flatModuleId": "@nationalbankbelgium/stark-ui"
   }

diff --git a/packages/stark-ui/tsconfig.spec.json b/packages/stark-ui/tsconfig.spec.json
@@ -18,6 +18,7 @@
     "preserveWhitespaces": false,
     "allowEmptyCodegenFiles": false,
     "annotateForClosureCompiler": true,
-    "skipTemplateCodegen": true
+    "skipTemplateCodegen": true,
+    "enableResourceInlining": true
   }
 }
diff --git a/starter/package.json b/starter/package.json
@@ -119,8 +119,8 @@
     "@angular/platform-server": "6.0.2",
     "@angular/router": "6.0.2",
     "@mdi/angular-material": "2.3.54",
-    "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-a445d6a.tgz",
-    "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-a445d6a.tgz",
+    "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-8ecbda6.tgz",
+    "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-8ecbda6.tgz",
     "@ngrx/store": "5.2.0",
     "@uirouter/visualizer": "6.0.0",
     "core-js": "2.5.6",
@@ -135,8 +135,8 @@
     "web-animations-js": "2.3.1"
   },
   "devDependencies": {
-    "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-a445d6a.tgz",
-    "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-a445d6a.tgz",
+    "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-8ecbda6.tgz",
+    "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-8ecbda6.tgz",
     "@types/core-js": "0.9.46",
     "@types/hammerjs": "2.0.35",
     "@types/node": "6.0.106",