[Pkg-javascript-commits] [Git][js-team/node-rimraf][master] Port to glob10

[Bastien Roucariès (@rouca)]

Bastien Roucariès pushed to branch master at Debian JavaScript Maintainers / node-rimraf


Commits:
0d5b2a3a by Bastien Roucariès at 2025-11-21T14:28:55+01:00
Port to glob10

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/0003-Port-to-glob-8.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+node-rimraf (3.0.2-5) unstable; urgency=medium
+
+  * Team upload
+  * Port to glob at 10
+
+ -- Bastien Roucariès <rouca at debian.org>  Fri, 21 Nov 2025 14:16:41 +0100
+
 node-rimraf (3.0.2-4) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.deb
 Uploaders: Jérémy Lal <kapouer at melix.org>
 Build-Depends: debhelper-compat (= 13)
  , dh-sequence-nodejs
- , node-glob (>= 8.0.0~) <!nocheck>
+ , node-glob (>= 10.0.0~) <!nocheck>
  , node-mkdirp <!nocheck>
  , node-tap <!nocheck>
 Standards-Version: 4.7.2
@@ -17,7 +17,7 @@ Testsuite: autopkgtest-pkg-nodejs
 Package: node-rimraf
 Architecture: all
 Depends: ${misc:Depends}
- , node-glob (>= 8.0.0~)
+ , node-glob (>= 10.0.0~)
  , nodejs:any
 Recommends: node-graceful-fs
 Provides: ${nodejs:Provides}


=====================================
debian/patches/0003-Port-to-glob-8.patch
=====================================
@@ -4,12 +4,13 @@ Subject: Port to glob at 8
 
 forwarded: not-needed
 ---
- package.json |  2 +-
- rimraf.js    | 10 ++++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
+ package.json            |  2 +-
+ rimraf.js               | 10 ++--------
+ types-rimraf/index.d.ts |  2 +-
+ 3 files changed, 4 insertions(+), 10 deletions(-)
 
 diff --git a/package.json b/package.json
-index 1bf8d5e..da84d70 100644
+index 1bf8d5e..c2f7200 100644
 --- a/package.json
 +++ b/package.json
 @@ -14,7 +14,7 @@
@@ -17,37 +18,48 @@ index 1bf8d5e..da84d70 100644
    "bin": "./bin.js",
    "dependencies": {
 -    "glob": "^7.1.3"
-+    "glob": ">=8.0.0"
++    "glob": ">=10.0.0"
    },
    "files": [
      "LICENSE",
 diff --git a/rimraf.js b/rimraf.js
-index 34da417..d6d254a 100644
+index 34da417..53f5f4d 100644
 --- a/rimraf.js
 +++ b/rimraf.js
-@@ -2,8 +2,11 @@ const assert = require("assert")
+@@ -1,12 +1,7 @@
+ const assert = require("assert")
  const path = require("path")
  const fs = require("fs")
- let glob = undefined
-+let globversion = undefined
- try {
-   glob = require("glob")
-+  const { version } = require('glob/package.json');
-+  globversion = version
- } catch (_err) {
-   // treat glob as optional.
- }
-@@ -109,8 +112,11 @@ const rimraf = (p, options, cb) => {
+-let glob = undefined
+-try {
+-  glob = require("glob")
+-} catch (_err) {
+-  // treat glob as optional.
+-}
++const { glob } = require("glob")
+ 
+ const defaultGlobOpts = {
+   nosort: true,
+@@ -109,8 +104,7 @@ const rimraf = (p, options, cb) => {
    options.lstat(p, (er, stat) => {
      if (!er)
        return afterGlob(null, [p])
 -
 -    glob(p, options.glob, afterGlob)
-+    if (parseInt(globversion.split('.')[0], 10) < 9) {
-+         glob(p, options.glob, afterGlob);
-+    } else {
-+        glob(p, options.glob).then(files => afterGlob(null, files)).catch(err => afterGlob(err, null));
-+    }
++    glob(p, options.glob).then(files => afterGlob(null, files)).catch(err => afterGlob(err, null));
    })
  
  }
+diff --git a/types-rimraf/index.d.ts b/types-rimraf/index.d.ts
+index 116121f..6a3404d 100644
+--- a/types-rimraf/index.d.ts
++++ b/types-rimraf/index.d.ts
+@@ -30,7 +30,7 @@ declare namespace rimraf {
+         emfileWait?: number;
+         /** @default false */
+         disableGlob?: boolean;
+-        glob?: glob.IOptions | false;
++        glob?: glob.GlobOptions | false;
+ 
+         unlink?: typeof fs.unlink;
+         chmod?: typeof fs.chmod;



View it on GitLab: https://salsa.debian.org/js-team/node-rimraf/-/commit/0d5b2a3a23c5152316e17f662648495e81bdb003

-- 
View it on GitLab: https://salsa.debian.org/js-team/node-rimraf/-/commit/0d5b2a3a23c5152316e17f662648495e81bdb003
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-javascript-commits/attachments/20251121/89149bf1/attachment-0001.htm>