Merge pull request #96 from digipolisantwerp/feature/prod-builds

fix(core) fix styleguide prod build

Author: TriangleJuice

.travis.yml

@@ -18,7 +18,7 @@ script:
   - npm run build
   - npm run examples
   - npm test
-  - ng build --base-href "https://digipolisantwerp.github.io/acpaas-ui_angular/"
+  - ng build --prod --base-href "https://digipolisantwerp.github.io/acpaas-ui_angular/"
 
 deploy:
   provider: pages

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## Unreleased
 
+- `core` fix AOT / Prod builds
+
 ### Fixed
 - `core` Fixed an issue where an unwanted 404 was shown when the styleguide was reloaded on GitHub pages.
 

angular.json

@@ -121,8 +121,8 @@
           },
           "configurations": {
             "examples": {
-              "project": "packages/agenda/ng-package.json",
-              "tsConfig": "packages/agenda/tsconfig.json"
+              "project": "packages/agenda/examples/ng-package.json",
+              "tsConfig": "packages/agenda/examples/tsconfig.json"
             }
           }
         },
@@ -852,4 +852,4 @@
       "typescriptMismatch": false
     }
   }
-}
+}

packages/agenda/examples-todo/ng-package.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../examples/agenda",
+  "deleteDestPath": true
+}

packages/agenda/examples-todo/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "@acpaas-ui/ngx-examples/agenda"
+}

packages/agenda/examples-todo/src/agenda/agenda.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AgendaModule } from '@acpaas-ui/ngx-components/agenda';
+import { CodeSnippetModule } from '@acpaas-ui/ngx-components/code-snippet';
+
+import { Pages } from './pages/index';
+
+@NgModule({
+	imports: [
+		CommonModule,
+		AgendaModule,
+		CodeSnippetModule,
+	],
+	declarations: [
+		Pages,
+	],
+})
+export class AgendaExamplesModule {}

packages/agenda/examples-todo/src/agenda/agenda.routes.ts

@@ -0,0 +1,11 @@
+import { Routes } from '@angular/router';
+
+import { AgendaDemoPageComponent } from './pages/demo/demo.page';
+
+export const AGENDA_EXAMPLES_ROUTES: Routes = [
+	{
+		path: '',
+		component: AgendaDemoPageComponent,
+		pathMatch: 'full',
+	},
+];

packages/agenda/examples-todo/src/agenda/index.ts

@@ -0,0 +1,3 @@
+export { AgendaDemoPageComponent } from './pages/demo/demo.page';
+export { AgendaExamplesModule } from './agenda.module';
+export { AGENDA_EXAMPLES_ROUTES } from './agenda.routes';

packages/agenda/examples-todo/src/agenda/pages/demo/demo.page.html

@@ -0,0 +1,5 @@
+<h1 class="h3 u-margin-bottom">Agenda</h1>
+<div class="u-margin-bottom">
+	<!-- <aui-code-snippet [codeSnippet]="javascript1"></aui-code-snippet> -->
+	T.B.D.
+</div>

packages/agenda/examples-todo/src/agenda/pages/demo/demo.page.ts

@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+
+@Component({
+	templateUrl: './demo.page.html',
+})
+export class AgendaDemoPageComponent {
+	public javascript1 = `import { AgendaModule } from '@acpaas-ui/ngx-components/analytics';
+
+@NgModule({
+	imports: [
+		AgendaModule
+	]
+});
+
+export class AppModule {};`;
+}

packages/agenda/examples-todo/src/agenda/pages/index.ts

@@ -0,0 +1,5 @@
+import { AgendaDemoPageComponent } from './demo/demo.page';
+
+export const Pages = [
+	AgendaDemoPageComponent,
+];

packages/agenda/examples-todo/src/public_api.ts

@@ -0,0 +1 @@
+export * from './agenda/index';

packages/agenda/examples-todo/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../out-tsc/lib",
+    "target": "es2015",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "types": [],
+    "lib": [
+      "dom",
+      "es2015"
+    ]
+  },
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "flatModuleId": "AUTOGENERATED",
+    "flatModuleOutFile": "AUTOGENERATED"
+  }
+}

packages/agenda/src/lib/agenda/services/sorting.service.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 
 import { EventInterface } from '../types/agenda.types';
 import { DateHelperService } from './date-helper.service';
-import { EventMap } from '../classes/event-map.class';
 
 @Injectable()
 export class SortingService {

packages/agenda/tsconfig.lib.json

@@ -22,7 +22,9 @@
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "strictInjectionParameters": true,
+    "flatModuleId": "AUTOGENERATED",
+    "flatModuleOutFile": "AUTOGENERATED"
   },
   "exclude": [
     "src/test.ts",

packages/analytics/examples/package.json

@@ -1,3 +1,3 @@
 {
-  "name": "@acpaas-ui/ngx-examples/agenda"
-}
+  "name": "@acpaas-ui/ngx-examples/analytics"
+}

packages/localstorage/src/lib/localstorage/localstorage.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
-import { WINDOW } from '@acpaas-ui/ngx-components/utils';
+import { WindowModule, WINDOW_PROVIDERS } from '@acpaas-ui/ngx-components/utils';
 
 import {
 	LocalstorageConfig,
@@ -14,10 +14,11 @@ import {
 
 @NgModule({
 	imports: [
+		WindowModule,
 	],
 	providers: [
 		{ provide: LOCALSTORAGE_CONFIG, useValue: DEFAULT_LOCALSTORAGE_CONFIG },
-		{ provide: WINDOW, useValue: window },
+		...WINDOW_PROVIDERS,
 		LocalstorageService,
 	],
 })
@@ -29,13 +30,9 @@ export class LocalstorageModule {
 			ngModule: LocalstorageModule,
 			providers: [
 				{ provide: LOCALSTORAGE_CONFIG, useValue: localstorageConfig },
-				{ provide: WINDOW, useValue: window },
+				...WINDOW_PROVIDERS,
 				LocalstorageService,
 			],
 		};
 	}
-
-	constructor(
-		private localstorageService: LocalstorageService
-	) {}
 }

packages/localstorage/src/lib/localstorage/services/localstorage.service.ts

@@ -4,7 +4,7 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import 'rxjs/add/operator/distinctUntilChanged';
 import 'rxjs/add/operator/map';
 
-import { LOCALSTORAGE_CONFIG, DEFAULT_LOCALSTORAGE_CONFIG } from '../localstorage.conf';
+import { LOCALSTORAGE_CONFIG } from '../localstorage.conf';
 import { Selector, PathSelector, Comparator, LocalstorageConfig } from '../types/localstorage.types';
 import { LocalstorageHelper } from '../localstorage.helper';
 import memoryStorage from '../localstorage.polyfill';

packages/table/examples/package.json

@@ -1,3 +1,3 @@
 {
-  "name": "@acpaas-ui/ngx-examples/utils"
+  "name": "@acpaas-ui/ngx-examples/table"
 }