Skip to content

Commit

Permalink
feat(compiler): update glob and minimatch dependencies (#5436)
Browse files Browse the repository at this point in the history
* feat(compiler): update glob and minimatch dependencies

STENCIL-912

* update renovate
  • Loading branch information
christian-bromann authored Mar 6, 2024
1 parent 15e7a49 commit 37bbd8c
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 105 deletions.
105 changes: 21 additions & 84 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"@types/eslint": "^8.4.6",
"@types/exit": "^0.1.31",
"@types/fs-extra": "^11.0.0",
"@types/glob": "^8.0.0",
"@types/graceful-fs": "^4.1.5",
"@types/jest": "^27.0.3",
"@types/listr": "^0.14.4",
Expand Down Expand Up @@ -96,7 +95,7 @@
"execa": "8.0.1",
"exit": "^0.1.2",
"fs-extra": "^11.0.0",
"glob": "8.1.0",
"glob": "10.3.10",
"graceful-fs": "~4.2.6",
"jest": "^27.4.5",
"jest-cli": "^27.4.5",
Expand All @@ -106,7 +105,7 @@
"magic-string": "^0.30.0",
"merge-source-map": "^1.1.0",
"mime-db": "^1.46.0",
"minimatch": "5.1.6",
"minimatch": "9.0.3",
"node-fetch": "3.3.2",
"open": "^9.0.0",
"open-in-editor": "2.2.0",
Expand Down
3 changes: 0 additions & 3 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
'rollup',
'@rollup/plugin-commonjs',
'@rollup/plugin-node-resolve',
// TODO(STENCIL-912): Upgrade these two dependencies
'glob',
'minimatch',
],
ignorePaths: [
'test/package.json',
Expand Down
2 changes: 1 addition & 1 deletion scripts/bundles/internal-platform-client.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs-extra';
import glob from 'glob';
import { glob } from 'glob';
import { basename, join } from 'path';
import { RollupOptions } from 'rollup';

Expand Down
2 changes: 1 addition & 1 deletion scripts/esbuild/internal-platform-client.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { BuildOptions as ESBuildOptions, Plugin } from 'esbuild';
import { replace } from 'esbuild-plugin-replace';
import fs from 'fs-extra';
import glob from 'glob';
import { glob } from 'glob';
import { join } from 'path';

import { getBanner } from '../utils/banner';
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/build/build-hmr.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isGlob, isOutputTargetWww, normalizePath, sortBy } from '@utils';
import minimatch from 'minimatch';
import { minimatch } from 'minimatch';
import { basename } from 'path';

import type * as d from '../../declarations';
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/output-targets/copy/output-copy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { buildError, isGlob, isOutputTargetCopy, join, normalizePath } from '@utils';
import minimatch from 'minimatch';
import { minimatch } from 'minimatch';

import type * as d from '../../../declarations';
import { canSkipAssetsCopy, getComponentAssetsCopyTasks } from './assets-copy-tasks';
Expand Down
13 changes: 2 additions & 11 deletions src/sys/node/node-copy-tasks.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { buildError, catchError, flatOne, isGlob, normalizePath } from '@utils';
import glob from 'glob';
import { glob } from 'glob';
import path from 'path';

import type * as d from '../../declarations';
Expand Down Expand Up @@ -177,14 +177,5 @@ function shouldIgnore(filePath: string) {
const IGNORE = ['.ds_store', '.gitignore', 'desktop.ini', 'thumbs.db'];

export function asyncGlob(pattern: string, opts: any) {
return new Promise<string[]>((resolve, reject) => {
const g: typeof glob = (glob as any).glob;
g(pattern, opts, (err: any, files: string[]) => {
if (err) {
reject(err);
} else {
resolve(files);
}
});
});
return glob(pattern, opts);
}

0 comments on commit 37bbd8c

Please sign in to comment.