Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"printWidth": 100,
"singleQuote": true,
"sortPackageJson": false,
"ignorePatterns": [
"node_modules",
"dist",
".angular",
"pnpm-lock.yaml",
"extension/ui",
"docs/privacy-policy.html"
]
}
6 changes: 0 additions & 6 deletions .prettierignore

This file was deleted.

12 changes: 0 additions & 12 deletions .prettierrc

This file was deleted.

2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
"recommendations": ["angular.ng-template", "oxc.oxc-vscode"]
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.defaultFormatter": "oxc.oxc-vscode",
"editor.formatOnSave": true
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"test": "ng test",
"test:devtools": "vitest run --root packages/ng-devtools",
"typecheck": "tsc -p tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit && tsc -p app/tsconfig.json --noEmit && tsc -p packages/ng-devtools",
"format": "prettier --write .",
"format:check": "prettier --check .",
"format": "oxfmt",
"format:check": "oxfmt --check",
"serve:ssr:angular-devtools": "node dist/angular-devtools/server/server.mjs",
"devtools:dev": "vite --config app/vite.config.ts",
"devtools:build": "vite build --config app/vite.config.ts",
Expand Down Expand Up @@ -59,7 +59,7 @@
"@types/express": "^5.0.1",
"@types/node": "^24.0.0",
"jsdom": "^28.0.0",
"prettier": "^3.8.1",
"oxfmt": "0.71.0",
"typescript": "~6.0.2",
"vite": "^8.3.0",
"vitest": "^4.0.8"
Expand Down
9 changes: 8 additions & 1 deletion packages/ng-devtools/src/forms-read.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
type AnyRecord = Record<string, any>;

export type ErrorSource =
'parse' | 'own' | 'tree' | 'async' | 'submission' | 'schema' | 'directive' | 'manual';
| 'parse'
| 'own'
| 'tree'
| 'async'
| 'submission'
| 'schema'
| 'directive'
| 'manual';

export interface ErrorOrigin {
source: ErrorSource;
Expand Down
3 changes: 2 additions & 1 deletion packages/ng-devtools/src/overlay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ export async function initOverlay(options: { baseURL?: string | string[] } = {})
lastRouterPayload = payload;
lastRouterPushAt = Date.now();
const answer = (await my.rpc.call('push-router', report)) as
{ hasConfig?: boolean } | undefined;
| { hasConfig?: boolean }
| undefined;
if (answer?.hasConfig === false) sentGeneration = -1;
else if (report['config']) sentGeneration = configTracker.generation;
} catch {
Expand Down
7 changes: 6 additions & 1 deletion packages/ng-devtools/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ export interface RouterSnapshot {
}

export type NavigationOutcome =
'pending' | 'succeeded' | 'redirected' | 'cancelled' | 'failed' | 'skipped';
| 'pending'
| 'succeeded'
| 'redirected'
| 'cancelled'
| 'failed'
| 'skipped';

export interface GuardRun {
guard: string;
Expand Down
Loading
Loading