chore(website): fix typings + update favicon

Author: marcj

website/package.json

@@ -16,7 +16,7 @@
     "dev:frontend": "rm -rf .angular && concurrently --kill-others \"npm run app:watch\" \"npm run ssr:watch\"",
     "dev": "rm -rf .angular && concurrently --kill-others \"npm run app:watch\" \"npm run ssr:watch\" \"npm run server:watch\"",
     "app": "NODE_OPTIONS=--preserve-symlinks TS_NODE_PROJECT=tsconfig.server.json node -r ts-node/register -r tsconfig-paths/register src/server/app.ts",
-    "build": "rm -r .angular; npm run app:build && npm run ssr:build && npm run server:build",
+    "build": "concurrently npm:app:build npm:ssr:build npm:server:build",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   },
   "private": true,
@@ -41,7 +41,7 @@
     "gray-matter": "^4.0.3",
     "marked": "^9.0.0",
     "ngx-markdown": "^17.1.1",
-    "openai": "^4.8.0",
+    "openai": "^4.24.7",
     "plotly.js-dist-min": "^2.27.0",
     "pybridge": "^1.1.0",
     "rehype-raw": "^4.0.0",

website/src/assets/favicon/android-icon-144x144.png

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

website/src/assets/favicon/android-icon-192x192.png

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

website/src/assets/favicon/android-icon-36x36.png

@@ -5,7 +5,23 @@
     <title>Deepkit Framework</title>
     <base href="/">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" type="image/x-icon" href="favicon.ico">
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/assets/favicon/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/assets/favicon/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/assets/favicon/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/assets/favicon/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/assets/favicon/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/assets/favicon/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/assets/favicon/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/assets/favicon/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/assets/favicon/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png">
+    <link rel="manifest" href="/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/assets/favicon/ms-icon-144x144.png">
 
     <link rel="preload" href="/assets/muli/Muli.woff2" as="font" crossorigin>
     <link rel="preload" href="/assets/muli/Muli-SemiBold.woff2" as="font" crossorigin>

website/src/assets/favicon/android-icon-48x48.png

@@ -1,7 +1,7 @@
 import { HtmlResponse, httpWorkflow, Redirect, RouteConfig } from '@deepkit/http';
 import { join } from 'node:path';
 // @ts-ignore
-import type { CommonEngine, RenderOptions } from '@angular/ssr';
+import type { CommonEngine, CommonEngineRenderOptions } from '@angular/ssr';
 // @ts-ignore
 import type { Router } from '@angular/router';
 import { eventDispatcher } from '@deepkit/event';
@@ -18,7 +18,7 @@ export class AngularListener {
 
     protected router?: Router;
     protected engine?: CommonEngine;
-    protected renderOptions: RenderOptions = {};
+    protected renderOptions: CommonEngineRenderOptions = {};
 
     constructor(
         private logger: Logger,
@@ -33,10 +33,15 @@ export class AngularListener {
         const dir = findParentPath('dist/app/', __dirname);
         if (!dir) throw new Error('Could not find dist/app/server folder');
 
-        const serverModule = (await require(join(dir, 'server/main.js')));
-        this.engine = new serverModule.CommonEngine(() => serverModule.bootstrap(
-            this.server.getWorker().rpcKernel
-        ), []);
+        const serverModule = (await require(join(dir, 'server/main.js'))) as {
+            CommonEngine: typeof CommonEngine,
+            bootstrap: (rpcKernel: any) => any,
+        };
+        this.engine = new serverModule.CommonEngine({
+            //important to pass as function, otherwise we get `RuntimeError: NG0210`
+            bootstrap: () => serverModule.bootstrap(this.server.getWorker().rpcKernel),
+            providers: undefined,
+        });
         const indexHtml = join(join(dir, 'browser'), 'index.html');
         this.renderOptions.documentFilePath = indexHtml;
 
@@ -55,8 +60,10 @@ export class AngularListener {
             if (!response) {
                 const server = await this.getServer();
                 const page = new PageResponseModel();
-                const renderOptions: RenderOptions = {
-                    ...this.renderOptions, url: event.url, providers: [
+                const renderOptions: CommonEngineRenderOptions = {
+                    ...this.renderOptions,
+                    // bootstrap: () =>server.bootstrap(this.server.getWorker().rpcKernel),
+                    url: event.url, providers: [
                         { provide: 'page-response-model', useValue: page }
                         // { provide: RpcWebSocketClient, useValue: new DirectClient(this.server.getWorker().rpcKernel) },
                     ]

website/src/assets/favicon/android-icon-72x72.png

@@ -7,7 +7,7 @@ import { getSystem } from "../questions";
 import { magicSeparator } from "@app/common/models";
 
 class Context {
-    messages: { role: 'system' | 'user' | 'assistant' | 'function', content: string }[] = [];
+    messages: OpenAI.ChatCompletionMessageParam[] = [];
 
     async addSystem(additionalText: string) {
         this.messages.push({ role: 'system', content: await getSystem(additionalText) });

website/src/assets/favicon/android-icon-96x96.png

@@ -28,7 +28,7 @@ ${page}
 My question: ${prompt}
         `;
 
-        const messages: { role: 'system' | 'user' | 'assistant' | 'function', content: string }[] = [
+        const messages: OpenAI.ChatCompletionMessageParam[] = [
             { role: 'system', content: 'You are a documentation chat bot that helps the user to understand a TypeScript framework called Deepkit.' },
             { role: 'user', content: prompt },
         ];

website/src/assets/favicon/apple-icon-114x114.png

@@ -12,7 +12,6 @@ import { Url } from "@app/server/url";
 import { readFile } from "fs/promises";
 import { findParentPath } from "@deepkit/app";
 import { join } from "path";
-import { Chat } from "openai/resources";
 
 export async function getSystem(additionalText: string): Promise<string> {
     const parentPath = findParentPath('src/pages');
@@ -389,7 +388,7 @@ ${message.content}
 
         const additionalText = ''; //todo
 
-        const messages: Chat.ChatCompletionMessageParam[] = [
+        const messages: OpenAI.ChatCompletionMessageParam[] = [
             { role: 'system', content: await getSystem('') },
         ];
 

website/src/assets/favicon/apple-icon-120x120.png

@@ -12,6 +12,7 @@
     "moduleResolution": "node",
     "esModuleInterop": true,
     "preserveSymlinks": true,
+    "skipLibCheck": true,
     "importHelpers": true,
     "target": "ES2022",
     "noPropertyAccessFromIndexSignature": false,

website/src/assets/favicon/apple-icon-144x144.png

@@ -2,8 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/src",
-    "module": "commonjs",
-    "moduleResolution": "node16",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "types": [
       "node"
     ]

website/src/assets/favicon/apple-icon-152x152.png

@@ -18495,7 +18495,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openai@npm:^4.8.0":
+"openai@npm:^4.24.7":
   version: 4.24.7
   resolution: "openai@npm:4.24.7"
   dependencies:
@@ -23588,7 +23588,7 @@ __metadata:
     jest: "npm:^29.7.0"
     marked: "npm:^9.0.0"
     ngx-markdown: "npm:^17.1.1"
-    openai: "npm:^4.8.0"
+    openai: "npm:^4.24.7"
     plotly.js-dist-min: "npm:^2.27.0"
     prismjs: "npm:^1.29.0"
     pybridge: "npm:^1.1.0"