Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable #2030

Merged
merged 28 commits into from
Jul 9, 2024
Merged

Merge stable #2030

merged 28 commits into from
Jul 9, 2024

Conversation

ef4
Copy link
Contributor

@ef4 ef4 commented Jul 6, 2024

No description provided.

vstefanovic97 and others added 21 commits June 26, 2024 11:20
Add just the necessary files to rollup watch mode
create a smoke test for the widest possible matrix
@ef4 ef4 added the internal label Jul 6, 2024
@patricklx
Copy link
Contributor

patricklx commented Jul 9, 2024

core-resolver fix:

diff --git a/packages/shared-internals/src/paths.ts b/packages/shared-internals/src/paths.ts
index 709e714d..775d349d 100644
--- a/packages/shared-internals/src/paths.ts
+++ b/packages/shared-internals/src/paths.ts
@@ -12,6 +12,11 @@ export function explicitRelative(fromDir: string, toFile: string) {
   if (!isAbsolute(result) && !result.startsWith('.')) {
     result = './' + result;
   }
+  // for windows, this should resolve to the current drive
+  // e.g. D://...
+  if (toFile.startsWith('/')) {
+    result = resolve(toFile);
+  }
   if (isAbsolute(toFile) && result.endsWith(toFile)) {
     // this prevents silly "relative" paths like
     // "../../../../../Users/you/projects/your/stuff" when we could have just

canary-compat-stage2-build-static-with-rules works locally. I saw timeouts though

@mansona
Copy link
Member

mansona commented Jul 9, 2024

I'm merging this even without that last test passing. It looks like the windows box is hanging rather than it being an issue with our test 🫠

@mansona mansona merged commit 5063729 into main Jul 9, 2024
178 of 179 checks passed
@mansona mansona deleted the merge-stable branch July 9, 2024 10:27
@github-actions github-actions bot mentioned this pull request Jul 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants