Merge branch 'master' of https://github.com/rollup/rollup into sync-e…

…37b05c6
rollup · Jan 11, 2024 · 84683f4 · 84683f4 · vercel · Jan 11, 2024
2 parents 627bc37 + e37b05c
commit 84683f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml
@@ -85,7 +85,7 @@ jobs:
 
           # Windows
           - host: windows-latest
-            build: npm run build:napi -- --release
+            build: RUSTFLAGS="-C target-feature=+crt-static" npm run build:napi -- --release
             target: x86_64-pc-windows-msvc
           - host: windows-latest
             build: >-

diff --git a/src/utils/commondir.ts b/src/utils/commondir.ts
@@ -6,12 +6,12 @@ export default function commondir(files: readonly string[]): string {
 	if (files.length === 1) return dirname(files[0]);
 	const commonSegments = files.slice(1).reduce(
 		(commonSegments, file) => {
-			const pathSegements = file.split(/\/+|\\+/);
+			const pathSegments = file.split(/\/+|\\+/);
 			let index;
 			for (
 				index = 0;
-				commonSegments[index] === pathSegements[index] &&
-				index < Math.min(commonSegments.length, pathSegements.length);
+				commonSegments[index] === pathSegments[index] &&
+				index < Math.min(commonSegments.length, pathSegments.length);
 				index++
 			);
 			return commonSegments.slice(0, index);