manually apply patches

Author: RobinMalfait

.github/workflows/prepare-release.yml

@@ -119,9 +119,7 @@ jobs:
         run: rustup target add ${{ matrix.target }}
 
       - name: Install dependencies
-        run: |
-          pnpm install --ignore-scripts --filter=!./playgrounds/*
-          pnpm postinstall
+        run: pnpm install --ignore-scripts --filter=!./playgrounds/*
 
       - name: Build release
         run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
@@ -168,7 +166,6 @@ jobs:
             ./rustup-init -y --profile minimal
             source "$HOME/.cargo/env"
             pnpm install --ignore-scripts --filter=!./playgrounds/* || true
-            pnpm postinstall
             echo "~~~~ rustc --version ~~~~"
             rustc --version
             echo "~~~~ node -v ~~~~"

.github/workflows/release-insiders.yml

@@ -118,9 +118,7 @@ jobs:
         run: rustup target add ${{ matrix.target }}
 
       - name: Install dependencies
-        run: |
-          pnpm install --ignore-scripts --filter=!./playgrounds/*
-          pnpm postinstall
+        run: pnpm install --ignore-scripts --filter=!./playgrounds/*
 
       - name: Build release
         run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
@@ -173,7 +171,6 @@ jobs:
             echo "~~~~ pnpm --version ~~~~"
             pnpm --version
             pnpm install --ignore-scripts --filter=!./playgrounds/* || true
-            pnpm postinstall
             pnpm run --filter ${{ env.OXIDE_LOCATION }} build
             strip -x ${{ env.OXIDE_LOCATION }}/*.node
             ls -la ${{ env.OXIDE_LOCATION }}

.github/workflows/release.yml

@@ -118,9 +118,7 @@ jobs:
         run: rustup target add ${{ matrix.target }}
 
       - name: Install dependencies
-        run: |
-          pnpm install --ignore-scripts --filter=!./playgrounds/*
-          pnpm postinstall
+        run: pnpm install --ignore-scripts --filter=!./playgrounds/*
 
       - name: Build release
         run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
@@ -173,7 +171,6 @@ jobs:
             echo "~~~~ pnpm --version ~~~~"
             pnpm --version
             pnpm install --ignore-scripts --filter=!./playgrounds/* || true
-            pnpm postinstall
             pnpm run --filter ${{ env.OXIDE_LOCATION }} build
             strip -x ${{ env.OXIDE_LOCATION }}/*.node
             ls -la ${{ env.OXIDE_LOCATION }}

crates/ignore/src/dir.rs

@@ -496,12 +496,39 @@ impl Ignore {
             Match::None
         };
 
-        m_custom_ignore
-            .or(m_ignore)
-            .or(m_gi)
-            .or(m_gi_exclude)
-            .or(m_global)
-            .or(m_explicit)
+        let order = [
+            // Global gitignore
+            &m_global,
+            // .git/info/exclude
+            &m_gi_exclude,
+            // .gitignore
+            &m_gi,
+            // .ignore
+            &m_ignore,
+            // .customignore
+            &m_custom_ignore,
+            // Manually added ignores
+            &m_explicit,
+        ];
+
+        for (idx, check) in order.into_iter().enumerate() {
+            if check.is_none() {
+                continue;
+            }
+
+            let remaining = &order[idx + 1..];
+            if check.is_ignore() {
+                if remaining.iter().any(|other| other.is_whitelist()) {
+                    continue;
+                }
+            } else if remaining.iter().any(|other| other.is_ignore()) {
+                continue;
+            }
+
+            return check.clone();
+        }
+
+        m_explicit
     }
 
     /// Returns an iterator over parent ignore matchers, including this one.

crates/ignore/src/walk.rs

@@ -16,7 +16,7 @@ use {
 
 use crate::{
     dir::{Ignore, IgnoreBuilder},
-    gitignore::GitignoreBuilder,
+    gitignore::{Gitignore, GitignoreBuilder},
     overrides::Override,
     types::Types,
     Error, PartialErrorBuilder,
@@ -666,6 +666,11 @@ impl WalkBuilder {
         errs.into_error_option()
     }
 
+    /// Add a Gitignore to the builder.
+    pub fn add_gitignore(&mut self, gi: Gitignore) {
+        self.ig_builder.add_ignore(gi);
+    }
+
     /// Add a custom ignore file name
     ///
     /// These ignore files have higher precedence than all other ignore files.

package.json

@@ -44,8 +44,7 @@
     "bench": "vitest bench",
     "version-packages": "node ./scripts/version-packages.mjs",
     "vite": "pnpm run --filter=vite-playground dev",
-    "nextjs": "pnpm run --filter=nextjs-playground dev",
-    "postinstall": "cargo install patch-crate; cargo patch-crate"
+    "nextjs": "pnpm run --filter=nextjs-playground dev"
   },
   "license": "MIT",
   "devDependencies": {