Fix windows bugs with new glob

Remove ignore code to see if it fixes it Revert "Update to the latest glob" This reverts commit f201757. # Conflicts: # lib/utils/apply-action-sync.js # lib/utils/apply-action.js Revert "Revert "Update to the latest glob"" This reverts commit c3ac7e1. Add posix flag to glob
bcomnes · Oct 25, 2023 · eb7ab6a · eb7ab6a
1 parent 35128d8
commit eb7ab6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/bin/main.js b/bin/main.js
@@ -176,6 +176,7 @@ module.exports = function main (source, outDir, args) {
       }
       return Promise.resolve()
     }).catch(error => {
+      console.error(error)
       console.error(`Failed to copy: ${error.message}.`)
       process.exit(1)
     })

diff --git a/lib/utils/apply-action-sync.js b/lib/utils/apply-action-sync.js
@@ -34,17 +34,18 @@ module.exports = function applyActionSync (pattern, options, action) {
   const globOptions = {
     nodir: !options.includeEmptyDirs,
     follow: Boolean(options.dereference),
+    posix: true,
     ignore: {
       ignored: p => {
         try {
-          return p.relative() ? ig.ignores(p.relative()) : false
+          return p.relativePosix() ? ig.ignores(p.relativePosix()) : false
         } catch (err) {
           console.error(err)
         }
       },
       childrenIgnored: (p) => {
         try {
-          return p.relative() ? ig.ignores(p.relative()) : false
+          return p.relativePosix() ? ig.ignores(p.relativePosix()) : false
         } catch (err) {
           console.error(err)
         }

diff --git a/lib/utils/apply-action.js b/lib/utils/apply-action.js
@@ -35,17 +35,18 @@ module.exports = async function applyAction (pattern, options, action) {
   const globOptions = {
     nodir: !options.includeEmptyDirs,
     follow: Boolean(options.dereference),
+    posix: true,
     ignore: {
       ignored: (p) => {
         try {
-          return p.relative() ? ig.ignores(p.relative()) : false
+          return p.relativePosix() ? ig.ignores(p.relativePosix()) : false
         } catch (err) {
           console.error(err)
         }
       },
       childrenIgnored: (p) => {
         try {
-          return p.relative() ? ig.ignores(p.relative()) : false
+          return p.relativePosix() ? ig.ignores(p.relativePosix()) : false
         } catch (err) {
           console.error(err)
         }