File: 0006-Use-glob-8.patch

package info (click to toggle)
node-browserify 17.0.0%2Bds-8
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 2,424 kB
  • sloc: javascript: 5,646; makefile: 27; sh: 10
file content (91 lines) | stat: -rw-r--r-- 2,790 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org>
Date: Sun, 2 Nov 2025 17:05:54 +0100
Subject: Use glob@8

forwarded: not-needed
---
 bin/args.js  | 34 +++++++++++++++++++---------------
 package.json |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/bin/args.js b/bin/args.js
index 130ace7..6ba3737 100644
--- a/bin/args.js
+++ b/bin/args.js
@@ -5,7 +5,7 @@ var parseShell = require('shell-quote').parse;
 var insertGlobals = require('insert-module-globals');
 var duplexer = require('duplexer2');
 var subarg = require('subarg');
-var glob = require('glob');
+const { glob } = require('glob');
 var Readable = require('readable-stream').Readable;
 var xtend = require('xtend');
 
@@ -124,16 +124,20 @@ module.exports = function (args, opts) {
     [].concat(argv.ignore).filter(Boolean)
         .forEach(function (i) {
             b._pending ++;
-            glob(i, function (err, files) {
-                if (err) return b.emit('error', err);
-                if (files.length === 0) {
-                  b.ignore(i);
-                }
-                else {
-                  files.forEach(function (file) { b.ignore(file) });
-                }
-                if (--b._pending === 0) b.emit('_ready');
-            });
+	    glob(i)
+		.then(files => {
+		    if (files.length === 0) {
+			b.ignore(i);
+		    } else {
+			files.forEach(file => b.ignore(file));
+		    }
+		    if (--b._pending === 0) {
+			b.emit('_ready');
+		    }
+		})
+		.catch(err => {
+		    return b.emit('error', err);
+		})
         })
     ;
     
@@ -142,11 +146,11 @@ module.exports = function (args, opts) {
             b.exclude(u);
             
             b._pending ++;
-            glob(u, function (err, files) {
-                if (err) return b.emit('error', err);
+            glob(u).then(files => {
                 files.forEach(function (file) { b.exclude(file) });
                 if (--b._pending === 0) b.emit('_ready');
-            });
+            })
+            .catch(err => { return b.emit('error', err) });
         })
     ;
 
@@ -166,7 +170,7 @@ module.exports = function (args, opts) {
             }
             else if (/\*/.test(x)) {
                 b.external(x);
-                glob(x, function (err, files) {
+                glob(x).then( files => {
                     files.forEach(function (file) {
                         add(file, {});
                     });
diff --git a/package.json b/package.json
index d92e95f..adf78e0 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "domain-browser": "^1.2.0",
     "duplexer2": "~0.1.2",
     "events": "^3.0.0",
-    "glob": "^7.1.0",
+    "glob": ">=10.0.0",
     "has": "^1.0.0",
     "htmlescape": "^1.1.0",
     "https-browserify": "^1.0.0",