Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .madgerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"detectiveOptions": {
"ts": {
"skipTypeImports": true
}
}
}
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.2.cjs

This file was deleted.

942 changes: 942 additions & 0 deletions .yarn/releases/yarn-4.9.2.cjs

Large diffs are not rendered by default.

26 changes: 15 additions & 11 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs

supportedArchitectures:
os: [linux, darwin]
cpu: [x64, arm64]

packageExtensions:
"@types/node@22.13.1":
dependencies:
undici-types: 6.20.0
"@types/ssh2-sftp-client@9.0.4":
dependencies:
"@types/node": "22.13.1"
"@types/node": 22.13.1
"@types/ssh2@1.15.4":
dependencies:
"@types/node": "22.13.1"
"@types/node@22.13.1":
dependencies:
"undici-types": "6.20.0"
"@types/node": 22.13.1

supportedArchitectures:
cpu:
- x64
- arm64
os:
- linux
- darwin

yarnPath: .yarn/releases/yarn-4.9.2.cjs
73 changes: 0 additions & 73 deletions docs/setup-env-ubundu.md

This file was deleted.

2 changes: 1 addition & 1 deletion examples/rpc-websockets-esm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@deepkit/type-compiler": "^1.0.1",
"typescript": "~5.7.3",
"typescript": "~5.8.3",
"ts-node": "^10.9.1"
}
}
2 changes: 1 addition & 1 deletion examples/rpc-websockets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@deepkit/type-compiler": "^1.0.1",
"typescript": "~5.7.3",
"typescript": "~5.8.3",
"ts-node": "^10.9.1"
}
}
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"docs": "rm -rf docs && node --max-old-space-size=12096 node_modules/.bin/typedoc packages/*/index.ts",
"publish": "lerna publish --no-private patch",
"publish-force": "npm run build && lerna publish --no-private --force-publish",
"check:circular": "madge --extensions ts --warning --circular",
"publish-website": "heroku container:push web && heroku container:release web"
},
"workspaces": [
Expand All @@ -42,14 +43,14 @@
"coveralls": "^3.0.3",
"jest": "^29.2.1",
"lefthook": "^1.5.5",
"lerna": "^7.4.2",
"madge": "^4.0.0",
"lerna": "^8.2.2",
"madge": "^8.0.0",
"prettier": "^3.1.1",
"ts-jest": "^29.0.3",
"ts-node": "^10.9.1",
"ts-node-dev": "^2.0.0",
"typedoc": "^0.23.17",
"typescript": "~5.7.3"
"typescript": "~5.8.3"
},
"engines": {
"node": ">= 20.0.0"
Expand Down Expand Up @@ -95,5 +96,5 @@
"packages/topsort"
]
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.9.2"
}
4 changes: 2 additions & 2 deletions packages/angular-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"build": "echo '{\"type\": \"module\"}' > ./dist/esm/package.json"
},
"peerDependencies": {
"@angular/ssr": "^19.1.6",
"@angular/ssr": "^20.0.3",
"@deepkit/app": "^1.0.1",
"@deepkit/http": "^1.0.1"
},
"devDependencies": {
"@angular/ssr": "^19.1.7",
"@angular/ssr": "^20.0.3",
"@deepkit/app": "^1.0.12",
"@deepkit/http": "^1.0.12"
},
Expand Down
27 changes: 6 additions & 21 deletions packages/angular-ssr/src/angular.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,8 @@
* You should have received a copy of the MIT License along with this program.
*/

import {
AngularNodeAppEngine,
createNodeRequestHandler,
isMainModule,
NodeRequestHandlerFunction,
writeResponseToNodeResponse,
} from '@angular/ssr/node';
import {
HttpKernel,
HttpNotFoundError,
HttpRequest,
HttpResponse,
httpWorkflow,
RouteConfig,
staticOnRoute,
} from '@deepkit/http';
import { AngularNodeAppEngine, createNodeRequestHandler, isMainModule, NodeRequestHandlerFunction, writeResponseToNodeResponse } from '@angular/ssr/node';
import { HttpKernel, HttpNotFoundError, HttpRequest, HttpResponse, httpWorkflow, RouteConfig, staticOnRoute } from '@deepkit/http';
import { eventDispatcher } from '@deepkit/event';
import { createModuleClass } from '@deepkit/app';
import { ApplicationServer } from '@deepkit/framework';
Expand Down Expand Up @@ -68,7 +54,7 @@ class AngularRequestContext {
}

class AngularState {
ngApp: AngularNodeAppEngine = new AngularNodeAppEngine()
ngApp: AngularNodeAppEngine = new AngularNodeAppEngine();
}

class AngularListener {
Expand Down Expand Up @@ -140,7 +126,6 @@ export class RequestHandler {
protected requestContext: AngularRequestContext,
protected http: HttpKernel,
protected server: ApplicationServer,
protected staticListener: AngularStaticListener,
) {
}

Expand All @@ -167,12 +152,12 @@ export class RequestHandler {
}
this.requestContext.serverBaseUrl = `http://${host}`;

if (!this.requestContext.serverBaseUrl) {
if (!this.requestContext.publicBaseUrl) {
if (mainModule) {
this.requestContext.serverBaseUrl = 'http://localhost:8080';
this.requestContext.publicBaseUrl = 'http://localhost:8080';
} else {
//angular dev server
this.requestContext.serverBaseUrl = 'http://localhost:4200';
this.requestContext.publicBaseUrl = 'http://localhost:4200';
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-ssr/tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"path": "../http/tsconfig.esm.json"
}
]
}
}
2 changes: 1 addition & 1 deletion packages/angular-ssr/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
"path": "../http/tsconfig.json"
}
]
}
}
2 changes: 1 addition & 1 deletion packages/api-console-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
"path": "../type/tsconfig.json"
}
]
}
}
10 changes: 3 additions & 7 deletions packages/api-console-gui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"cli": {
"packageManager": "yarn"
},
"projects": {
"api-console-gui": {
"projectType": "application",
Expand Down Expand Up @@ -30,10 +33,6 @@
"src/assets"
],
"styles": [
"../desktop-ui/src/scss/reset.scss",
"../desktop-ui/src/scss/all.scss",
"../desktop-ui/src/scss/icon.scss",
"../ui-library/src/styles/style-code.scss",
"src/styles.scss"
],
"scripts": []
Expand Down Expand Up @@ -95,8 +94,5 @@
}
}
}
},
"cli": {
"analytics": "3aa0b572-3d14-4946-b6c9-04eafb95c2cf"
}
}
3 changes: 2 additions & 1 deletion packages/api-console-gui/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './src/app/api-console.module';
export * from './src/app/routes';
export * from './src/app/provider';
27 changes: 13 additions & 14 deletions packages/api-console-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
"dist"
],
"devDependencies": {
"@angular-devkit/build-angular": "^19.1.6",
"@angular/animations": "^19.1.5",
"@angular/cdk": "^19.1.3",
"@angular/cli": "^19.1.6",
"@angular/common": "^19.1.5",
"@angular/compiler": "^19.1.5",
"@angular/compiler-cli": "^19.1.5",
"@angular/core": "^19.1.5",
"@angular/forms": "19.1.5",
"@angular/platform-browser": "^19.1.5",
"@angular/platform-browser-dynamic": "^19.1.5",
"@angular/router": "^19.1.5",
"@angular-devkit/build-angular": "^20.0.3",
"@angular/animations": "^20.0.4",
"@angular/cdk": "^20.0.3",
"@angular/cli": "^20.0.3",
"@angular/common": "^20.0.4",
"@angular/compiler": "^20.0.4",
"@angular/compiler-cli": "^20.0.4",
"@angular/core": "^20.0.4",
"@angular/forms": "20.0.4",
"@angular/platform-browser": "^20.0.4",
"@angular/platform-browser-dynamic": "^20.0.4",
"@angular/router": "^20.0.4",
"@deepkit/api-console-api": "^1.0.12",
"@deepkit/bson": "^1.0.12",
"@deepkit/core": "^1.0.5",
Expand All @@ -49,7 +49,6 @@
"@deepkit/ui-library": "^1.0.1",
"@types/jasmine": "~4.3.0",
"@types/marked": "^4.0.3",
"hammerjs": "^2.0.8",
"jasmine-core": "~4.5.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
Expand All @@ -62,6 +61,6 @@
"prismjs": "^1.24.1",
"rxjs": "*",
"tslib": "^2.3.0",
"typescript": "~5.7.3"
"typescript": "~5.8.3"
}
}
Loading
Loading