Skip to content

Commit 4b852af

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-7
2 parents 471e9dd + c29c293 commit 4b852af

9 files changed

Lines changed: 45 additions & 25 deletions

File tree

apps/web-app/vite.config.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export default defineConfig({
99
root: __dirname,
1010
test: {
1111
...baseConfig.test,
12+
testTimeout: 10000,
1213
outputFile: {
1314
junit: `${baseConfig.root}/junit/libs/${name}/TESTS-${Date.now()}.xml`,
1415
},

azure-pipelines.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
trigger:
77
- main
88

9+
pr: none
10+
911
pool:
10-
vmImage: 'macOS-latest'
12+
vmImage: 'ubuntu-latest'
1113

1214
steps:
1315
- task: NodeTool@0

eslint.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = [
3333
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
3434
// Override or add rules here
3535
rules: {
36-
'@typescript-eslint/no-explicit-any': 'off',
36+
3737
'@/semi': ['error', 'always'],
3838
'@/no-extra-semi': 'error',
3939
'@/quotes': ['error', 'single', { allowTemplateLiterals: true }],
Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
import '@analogjs/vitest-angular/setup-snapshots';
2+
import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
23

3-
import { provideZonelessChangeDetection, NgModule } from '@angular/core';
4-
import {
5-
BrowserDynamicTestingModule,
6-
platformBrowserDynamicTesting,
7-
} from '@angular/platform-browser-dynamic/testing';
8-
import { getTestBed } from '@angular/core/testing';
9-
10-
@NgModule({
11-
providers: [provideZonelessChangeDetection()],
12-
})
13-
export class ZonelessTestModule {}
14-
15-
if (!(globalThis as any).__testEnvironmentInitialized) {
16-
getTestBed().initTestEnvironment(
17-
[BrowserDynamicTestingModule, ZonelessTestModule],
18-
platformBrowserDynamicTesting(),
19-
);
20-
(globalThis as any).__testEnvironmentInitialized = true;
21-
}
4+
setupTestBed({ zoneless: true });

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"@eslint/js": "10.0.1",
9494
"@nx/angular": "22.5.4",
9595
"@nx/devkit": "22.5.4",
96+
"@nx/esbuild": "22.5.4",
9697
"@nx/eslint": "22.5.4",
9798
"@nx/eslint-plugin": "22.5.4",
9899
"@nx/js": "22.5.4",

pnpm-lock.yaml

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/tsconfig.tools.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"outDir": "../dist/out-tsc/tools",
55
"rootDir": ".",
66
"module": "commonjs",
7+
"moduleResolution": "node",
78
"target": "es5",
89
"types": ["node"]
910
},

tools/update-packages/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
],
1313
"compilerOptions": {
1414
"module": "commonjs",
15+
"moduleResolution": "node",
1516
"esModuleInterop": true
1617
}
1718
}

tsconfig.base.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"rootDir": ".",
55
"sourceMap": true,
66
"declaration": false,
7-
"moduleResolution": "node",
8-
"emitDecoratorMetadata": true,
7+
"moduleResolution": "bundler",
98
"experimentalDecorators": true,
109
"importHelpers": true,
11-
"target": "es2015",
10+
"target": "es2022",
1211
"module": "esnext",
13-
"lib": ["es2020", "dom"],
12+
"lib": ["es2022", "dom"],
13+
"strict": true,
14+
"useDefineForClassFields": false,
1415
"skipLibCheck": true,
1516
"skipDefaultLibCheck": true,
1617
"baseUrl": ".",

0 commit comments

Comments
 (0)