Skip to content

refactor(cli): replace glob with tinyglobby and remediate dependency audit chains #2414

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.

Sign up for GitHub

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

Open
ignatremizov wants to merge 2 commits into
base: main
Choose a base branch
from
+451 −820
Open

refactor(cli): replace glob with tinyglobby and remediate dependency audit chains #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2dc69b
refactor(cli): replace glob with tinyglobby and modernize editorconfi…
ignatremizov Feb 21, 2026
dd44794
chore(dev-deps): remediate remaining npm audit findings for dev toolc…
ignatremizov Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions js/src/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*jshint strict:false */
/*jshint esversion: 6 */

const { globSync } = require('glob');
const { globSync, isDynamicPattern } = require('tinyglobby');

var debug = process.env.DEBUG_JSBEAUTIFY || process.env.JSBEAUTIFY_DEBUG ? function() {
console.error.apply(console, arguments);
Expand All @@ -43,8 +43,7 @@ var debug = process.env.DEBUG_JSBEAUTIFY || process.env.JSBEAUTIFY_DEBUG ? funct
var fs = require('fs'),
cc = require('config-chain'),
beautify = require('../index'),
nopt = require('nopt'),
glob = require("glob");
nopt = require('nopt');

nopt.invalidHandler = function(key, val) {
throw new Error(key + " was invalid with value \"" + val + "\"");
Expand All @@ -69,7 +68,7 @@ nopt.typeDefs.brace_style = {
nopt.typeDefs.glob = {
type: "glob",
validate: function(data, key, val) {
if (typeof val === 'string' && glob.hasMagic(val)) {
if (typeof val === 'string' && isDynamicPattern(val)) {
// Preserve value if it contains glob magic
data[key] = val;
return true;
Expand Down Expand Up @@ -633,14 +632,16 @@ function checkFiles(parsed) {
}

var foundFiles = [];
var isGlob = glob.hasMagic(f);
var isGlob = isDynamicPattern(f);

// Input was a glob
if (isGlob) {
hadGlob = true;
foundFiles = globSync(f, {
absolute: true,
ignore: ['**/node_modules/**', '**/.git/**']
ignore: ['**/node_modules/**', '**/.git/**'],
// Keep directory matches to preserve the previous `glob` behavior.
onlyFiles: false
});
} else {
// Input was not a glob, add it to an array so we are able to handle it in the same loop below
Expand Down Expand Up @@ -710,4 +711,4 @@ function logToStdout(str, config) {
if (typeof config.quiet === "undefined" || !config.quiet) {
console.log(str);
}
}
}
Loading