Merge branch 'main' into erikarowland/add-framework-slug-to-framework-settings

erikareads · web-flow · commit c7dd17bbd79a · 2025-01-30T10:11:58.000-08:00
diff --git a/.changeset/itchy-pumpkins-leave.md b/.changeset/itchy-pumpkins-leave.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/lucky-seahorses-approve.md b/.changeset/lucky-seahorses-approve.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/cli/test/unit/commands/build/index.test.ts b/packages/cli/test/unit/commands/build/index.test.ts
@@ -16,7 +16,10 @@ vi.setConfig({ testTimeout: 6 * 60 * 1000 });
 const fixture = (name: string) =>
   join(__dirname, '../../../fixtures/unit/commands/build', name);
 
-describe('build', () => {
+const flakey =
+  process.platform === 'win32' && process.version.startsWith('v22');
+
+describe.skipIf(flakey)('build', () => {
   beforeEach(() => {
     delete process.env.__VERCEL_BUILD_RUNNING;
   });
diff --git a/packages/remix/test/integration-legacy.test.ts b/packages/remix/test/integration-legacy.test.ts
@@ -10,8 +10,16 @@ vi.setConfig({ testTimeout: 12 * 60 * 1000 });
 
 const fixturesPath = join(__dirname, 'fixtures-legacy');
 
+const skipped: string[] = [
+  // PLACE TEST FIXTURE NAMES HERE TO SKIP THEM
+  '04-with-npm9-linked',
+];
+
 // eslint-disable-next-line no-restricted-syntax
 for (const fixture of fs.readdirSync(fixturesPath)) {
+  if (skipped.includes(fixture)) {
+    continue;
+  }
   // eslint-disable-next-line no-loop-func
   it(`should build ${fixture}`, async () => {
     await expect(
diff --git a/utils/chunk-tests.js b/utils/chunk-tests.js
@@ -160,39 +160,29 @@ async function getChunkedTests() {
         } = runnerOptions;
 
         const sortedTestPaths = testPaths.sort((a, b) => a.localeCompare(b));
-        return (
-          intoChunks(min, max, sortedTestPaths)
-            .flatMap((chunk, chunkNumber, allChunks) => {
-              return nodeVersions.flatMap(nodeVersion => {
-                return runners.map(runner => {
-                  return {
-                    runner,
-                    packagePath,
-                    packageName,
-                    scriptName,
-                    testScript,
-                    nodeVersion,
-                    testPaths: chunk.map(testFile =>
-                      path.relative(
-                        path.join(__dirname, '../', packagePath),
-                        testFile
-                      )
-                    ),
-                    chunkNumber: chunkNumber + 1,
-                    allChunksLength: allChunks.length,
-                  };
-                });
+        return intoChunks(min, max, sortedTestPaths).flatMap(
+          (chunk, chunkNumber, allChunks) => {
+            return nodeVersions.flatMap(nodeVersion => {
+              return runners.map(runner => {
+                return {
+                  runner,
+                  packagePath,
+                  packageName,
+                  scriptName,
+                  testScript,
+                  nodeVersion,
+                  testPaths: chunk.map(testFile =>
+                    path.relative(
+                      path.join(__dirname, '../', packagePath),
+                      testFile
+                    )
+                  ),
+                  chunkNumber: chunkNumber + 1,
+                  allChunksLength: allChunks.length,
+                };
               });
-            })
-            // Skipping vitest-unit on windows with Node 22
-            .filter(chunk => {
-              const flakeyTest =
-                chunk.nodeVersion === '22' &&
-                chunk.runner === 'windows-latest' &&
-                chunk.scriptName === 'vitest-unit' &&
-                chunk.packagePath === 'packages/cli';
-              return !flakeyTest;
-            })
+            });
+          }
         );
       });
     }
