fix(demo): fix ssr not working with koa

jonathonadams · Sep 4, 2020 · 29ccbb2 · 29ccbb2
1 parent 61ce4a5
commit 29ccbb2
Show file tree

Hide file tree

Showing 64 changed files with 4,343 additions and 5,443 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,7 +6,7 @@
 !angular.json
 !package.json
 !package-lock.json
-!tsconfig.base.json
+!tsconfig.json
 !tsconfig.server.json
 !docker/nginx.conf
 !apps/

diff --git a/angular.json b/angular.json
@@ -1319,12 +1319,12 @@
               "apps/demo/demo-web/src/styles.scss",
               {
                 "input": "styles/theme-default.scss",
-                "lazy": true,
+                "inject": false,
                 "bundleName": "theme-default"
               },
               {
                 "input": "styles/theme-default-dark.scss",
-                "lazy": true,
+                "inject": false,
                 "bundleName": "theme-default-dark"
               }
             ],

diff --git a/apps/demo/demo-web-e2e/tsconfig.json b/apps/demo/demo-web-e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["testcafe", "node"]
   },

diff --git a/apps/demo/demo-web-functions/src/index.ts b/apps/demo/demo-web-functions/src/index.ts
@@ -6,4 +6,4 @@ import { https } from 'firebase-functions';
 // @ts-ignore
 import { app } from './server/main';
 
-export const universal = https.onRequest(app());
+export const universal = https.onRequest(app().callback());
diff --git a/apps/demo/demo-web-functions/tsconfig.json b/apps/demo/demo-web-functions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",

diff --git a/apps/demo/demo-web/server.ts b/apps/demo/demo-web/server.ts
@@ -5,22 +5,20 @@ import { ngKoaEngine } from '@ztp/common/universal-engine';
 import Koa from 'koa';
 // @ts-ignore
 import serve from 'koa-static';
-// @ts-ignore
-import helmet from 'koa-helmet';
+import { helmet } from '@ztp/server/middleware';
 
 import { AppServerModule } from './src/main.server';
 
 // The Koa app is exported so that it can be used by serverless Functions.
 export function app() {
   const server = new Koa();
-  const distFolder = join(process.cwd(), 'dist/apps/demo/demo-web');
-  // const distFolder = join(process.cwd(), 'dist/browser');
+  const distFolder = join(process.cwd(), 'dist/browser');
   const indexFilename = existsSync(join(distFolder, 'index.original.html'))
     ? 'index.original.html'
     : 'index.html';
   const indexPath = join(distFolder, indexFilename);
 
-  // TODO -> Remove the 'unsafe-inline', limitation of angular at the moment
+  // TODO -> Remove the 'unsafe-inline', limitation of Angular at the moment
   server.use(
     helmet({
       expectCt: { enforce: true },
@@ -45,12 +43,6 @@ export function app() {
             'fonts.googleapis.com',
             'cdnjs.cloudflare.com',
           ],
-          // 'style-src-elem': [
-          //   `'unsafe-inline'`,
-          //   `'self'`,
-          //   'fonts.googleapis.com',
-          //   'cdnjs.cloudflare.com',
-          // ],
           'font-src': ['fonts.gstatic.com'],
         },
       },

diff --git a/apps/demo/demo-web/tsconfig.json b/apps/demo/demo-web/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/apps/server/lambda/tsconfig.json b/apps/server/lambda/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "strictPropertyInitialization": false,
     "module": "commonjs",

diff --git a/apps/todos/todos-web-e2e/tsconfig.json b/apps/todos/todos-web-e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["testcafe", "node"]
   },

diff --git a/apps/todos/todos-web/src/main.ts b/apps/todos/todos-web/src/main.ts
@@ -8,6 +8,8 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic()
-  .bootstrapModule(AppModule)
-  .catch((err) => console.error(err));
+document.addEventListener('DOMContentLoaded', () => {
+  platformBrowserDynamic()
+    .bootstrapModule(AppModule)
+    .catch((err) => console.error(err));
+});
diff --git a/apps/todos/todos-web/tsconfig.json b/apps/todos/todos-web/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/docker/server.Dockerfile b/docker/server.Dockerfile
@@ -85,7 +85,7 @@ RUN mkdir dist
 
 
 # Copy all files required to build the projects
-COPY --chown=node:node angular.json tsconfig.base.json tsconfig.server.json ./
+COPY --chown=node:node angular.json tsconfig.json tsconfig.server.json ./
 
 # Copy all src files
 COPY --chown=node:node apps/$PROJECT_DIRECTORY/ ./apps/$PROJECT_DIRECTORY

diff --git a/libs/common/animations/tsconfig.json b/libs/common/animations/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/auth/components/tsconfig.json b/libs/common/auth/components/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/auth/data-access/tsconfig.json b/libs/common/auth/data-access/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/data-access/tsconfig.json b/libs/common/data-access/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/dynamic-form-material-components/src/lib/fields/input/input.component.html b/libs/common/dynamic-form-material-components/src/lib/fields/input/input.component.html
@@ -2,7 +2,7 @@
   <mat-label>{{ field.label }}</mat-label>
   <input
     matInput
-    [type]="field.inputType"
+    [type]="field.inputType ? field.inputType : 'text'"
     [autocomplete]="field.autocomplete ? field.autocomplete : 'off'"
     [formControlName]="field.name"
   />

diff --git a/libs/common/dynamic-form-material-components/tsconfig.json b/libs/common/dynamic-form-material-components/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/dynamic-form/tsconfig.json b/libs/common/dynamic-form/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/dynamic-module-loading/tsconfig.json b/libs/common/dynamic-module-loading/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/form-builder/tsconfig.json b/libs/common/form-builder/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/grid/tsconfig.json b/libs/common/grid/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/router/tsconfig.json b/libs/common/router/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/side-nav/tsconfig.json b/libs/common/side-nav/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/toolbar-menu/tsconfig.json b/libs/common/toolbar-menu/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/ui/buttons/tsconfig.json b/libs/common/ui/buttons/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/ui/card/tsconfig.json b/libs/common/ui/card/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/ui/layouts/tsconfig.json b/libs/common/ui/layouts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/ui/toolbar/tsconfig.json b/libs/common/ui/toolbar/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/universal-engine/tsconfig.json b/libs/common/universal-engine/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "files": [],
   "include": [],
   "references": [

diff --git a/libs/common/utils/media-query/tsconfig.json b/libs/common/utils/media-query/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/utils/notifications/tsconfig.json b/libs/common/utils/notifications/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/utils/overlay/tsconfig.json b/libs/common/utils/overlay/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/utils/service-worker/tsconfig.json b/libs/common/utils/service-worker/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/utils/storage/tsconfig.json b/libs/common/utils/storage/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/common/utils/theme/tsconfig.json b/libs/common/utils/theme/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/data-access/tsconfig.json b/libs/demo/data-access/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/dynamic-form/tsconfig.json b/libs/demo/dynamic-form/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/examples/tsconfig.json b/libs/demo/examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/feature-shell/tsconfig.json b/libs/demo/feature-shell/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/form-builder/tsconfig.json b/libs/demo/form-builder/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/guides/tsconfig.json b/libs/demo/guides/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/lazy-load-scrolling/tsconfig.json b/libs/demo/lazy-load-scrolling/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/secure-todos/tsconfig.json b/libs/demo/secure-todos/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/start-your-own/tsconfig.json b/libs/demo/start-your-own/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/theming/tsconfig.json b/libs/demo/theming/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/demo/utils/tsconfig.json b/libs/demo/utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jest"]
   },

diff --git a/libs/server/middleware/src/index.ts b/libs/server/middleware/src/index.ts
@@ -1,2 +1,3 @@
 export { setupGlobalMiddleware } from './lib/global.middleware';
 export { errorHandler } from './lib/err-handler';
+export { helmet } from './lib/helmet';