WHAT IFFFFFFF THOUGH

jkrems · jkrems · commit f4ab9c2e84ac · 2025-06-27T09:36:51.000-07:00
diff --git a/packages/angular/ssr/package.json b/packages/angular/ssr/package.json
@@ -35,7 +35,8 @@
     "@angular/platform-browser": "20.1.0-next.3",
     "@angular/platform-server": "20.1.0-next.3",
     "@angular/router": "20.1.0-next.3",
-    "@schematics/angular": "workspace:*"
+    "@schematics/angular": "workspace:*",
+    "vitest": "3.2.4"
   },
   "sideEffects": false,
   "schematics": "./schematics/collection.json",
diff --git a/packages/angular/ssr/test/utils/promise_spec.ts b/packages/angular/ssr/test/utils/promise_spec.ts
@@ -9,16 +9,36 @@
 import { setTimeout } from 'node:timers/promises';
 import { promiseWithAbort } from '../../src/utils/promise';
 
+function expectRejectedWithError(promise: Promise<any>) {
+  if (typeof expectAsync === 'function') {
+    return expectAsync(promise).toBeRejectedWithError();
+  } else {
+    // @ts-expect-error
+    return expect(promise).rejects.toThrowError();
+  }
+}
+
+function expectResolved(promise: Promise<any>) {
+  if (typeof expectAsync === 'function') {
+    return expectAsync(promise).toBeResolved();
+  } else {
+    // @ts-expect-error
+    return expect(promise).resolves;
+  }
+}
+
 describe('promiseWithAbort', () => {
   it('should reject with an AbortError when the signal is aborted', async () => {
     const abortController = new AbortController();
     const promise = promiseWithAbort(setTimeout(500), abortController.signal, 'Test operation');
 
+    console.error('queueMicrotask to abort the signal');
     queueMicrotask(() => {
       abortController.abort('Test reason');
     });
 
-    await expectAsync(promise).toBeRejectedWithError();
+    console.error('expectAsync to be rejected with AbortError');
+    await expectRejectedWithError(promise);
   });
 
   it('should not reject if the signal is not aborted', async () => {
@@ -31,6 +51,6 @@ describe('promiseWithAbort', () => {
     // Wait briefly to ensure no rejection occurs
     await setTimeout(20);
 
-    await expectAsync(promise).toBeResolved();
+    await expectResolved(promise);
   });
 });
diff --git a/packages/angular/ssr/vitest.config.ts b/packages/angular/ssr/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    include: ['**/*_spec.ts'],
+    globals: true,
+  },
+});
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
@@ -30,6 +30,7 @@
     "@angular/compiler": "20.1.0-next.3",
     "@angular/compiler-cli": "20.1.0-next.3",
     "typescript": "5.8.3",
+    "vitest": "3.2.4",
     "webpack": "5.99.9"
   }
 }
diff --git a/packages/ngtools/webpack/vitest.config.ts b/packages/ngtools/webpack/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    include: ['**/*_spec.ts'],
+    globals: true,
+  },
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/vitest_test.bzl b/tools/vitest_test.bzl
@@ -0,0 +1,20 @@
+def _vitest_test_impl(ctx):
+    pass
+
+_vitest_test = rule()
+
+def vitest_test(data = [], args = [], **kwargs):
+    # Create relative path to root, from current package dir. Necessary as
+    # we change the `chdir` below to the package directory.
+    relative_to_root = "/".join([".."] * len(native.package_name().split("/")))
+
+    _vitest_test(
+        node_modules = "//:node_modules",
+        chdir = native.package_name(),
+        args = [
+            # Escape so that the `js_binary` launcher triggers Bash expansion.
+            "'**/*+(.|_)spec.js'",
+        ] + args,
+        data = data + ["//:node_modules/vitest"],
+        **kwargs
+    )

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`"@angular/compiler": "20.1.0-next.3",`
`31`	`31`	`"@angular/compiler-cli": "20.1.0-next.3",`
`32`	`32`	`"typescript": "5.8.3",`
	`33`	`+ "vitest": "3.2.4",`
`33`	`34`	`"webpack": "5.99.9"`
`34`	`35`	`}`
`35`	`36`	`}`