fix(website): angular 18 fixes

deepkit · Jun 6, 2024 · 4307a5d · 4307a5d
1 parent e193325
commit 4307a5d
Show file tree

Hide file tree

Showing 11 changed files with 3,624 additions and 4,946 deletions.
diff --git a/install-compiler.sh b/install-compiler.sh
@@ -9,3 +9,5 @@ node packages/type-compiler/dist/cjs/install-transformer.js;
 node packages/type-compiler/dist/cjs/install-transformer.js packages/api-console-gui;
 node packages/type-compiler/dist/cjs/install-transformer.js packages/orm-browser-gui;
 node packages/type-compiler/dist/cjs/install-transformer.js packages/framework-debug-gui;
+
+node packages/type-compiler/dist/cjs/install-transformer.js website;
diff --git a/website/package.json b/website/package.json
@@ -19,6 +19,9 @@
     "build": "concurrently npm:app:build npm:ssr:build npm:server:build",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   },
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "private": true,
   "dependencies": {
     "@angular/ssr": "^18.0.1",

diff --git a/website/src/app/components/highlight-code.component.ts b/website/src/app/components/highlight-code.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnInit, signal } from '@angular/core';
 import { highlight, languages } from 'prismjs';
 import { ControllerClient } from '@app/app/client';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 import 'prismjs/components/prism-typescript';
 import 'prismjs/components/prism-jsx';
 import 'prismjs/components/prism-tsx';

diff --git a/website/src/app/pages/documentation/community-question.component.ts b/website/src/app/pages/documentation/community-question.component.ts
@@ -10,7 +10,7 @@ import { ErrorComponent } from '@app/app/components/error.component';
 import { AppTitle } from '@app/app/components/title';
 import { LoadingComponent } from '@app/app/components/loading';
 import { PageResponse } from '@app/app/page-response';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 @Component({
     standalone: true,

diff --git a/website/src/app/pages/documentation/community-questions.component.ts b/website/src/app/pages/documentation/community-questions.component.ts
@@ -4,7 +4,7 @@ import { DatePipe, KeyValuePipe } from '@angular/common';
 import { ControllerClient } from '@app/app/client';
 import { CommunityQuestionListItem, projectMap } from '@app/common/models';
 import { ContentRenderComponent } from '@app/app/components/content-render.component';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 @Component({
     standalone: true,

diff --git a/website/src/app/pages/documentation/example.component.ts b/website/src/app/pages/documentation/example.component.ts
@@ -7,7 +7,7 @@ import { projectMap, UiCodeExample } from '@app/common/models';
 import { LoadingComponent } from '@app/app/components/loading';
 import { ContentRenderComponent } from '@app/app/components/content-render.component';
 import { PageResponse } from '@app/app/page-response';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 
 @Component({

diff --git a/website/src/app/pages/documentation/examples.component.ts b/website/src/app/pages/documentation/examples.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import { ControllerClient } from '@app/app/client';
 import { projectMap, UiCodeExample } from '@app/common/models';
 import { LoadingComponent } from '@app/app/components/loading';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 
 @Component({

diff --git a/website/src/app/pages/documentation/page.component.ts b/website/src/app/pages/documentation/page.component.ts
@@ -8,7 +8,7 @@ import { NgForOf, NgIf, ViewportScroller } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ControllerClient } from '@app/app/client';
 import { PageResponse } from '@app/app/page-response';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 @Component({
     standalone: true,

diff --git a/website/src/app/pages/libraries/library.component.ts b/website/src/app/pages/libraries/library.component.ts
@@ -6,7 +6,7 @@ import { AppDescription, AppTitle } from '@app/app/components/title';
 import { ContentRenderComponent } from '@app/app/components/content-render.component';
 import { LoadingComponent } from '@app/app/components/loading';
 import { PageResponse } from '@app/app/page-response';
-import { waitForInit } from '@app/app/utils.js';
+import { waitForInit } from '@app/app/utils';
 
 @Component({
     standalone: true,

diff --git a/website/src/server/angular.ts b/website/src/server/angular.ts
@@ -33,7 +33,7 @@ export class AngularListener {
         const dir = findParentPath('dist/app/', __dirname);
         if (!dir) throw new Error('Could not find dist/app/server folder');
 
-        const serverModule = (await import(join(dir, 'server/main.server.mjs'))) as {
+        const serverModule = (await import(join(dir, 'server/main.js'))) as {
             CommonEngine: typeof CommonEngine,
             bootstrap: (baseUrl: string) => any,
         };