File tree Expand file tree Collapse file tree 4 files changed +15
-14
lines changed
Expand file tree Collapse file tree 4 files changed +15
-14
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import {
1010} from './filesystem' ;
1111import * as disk from './disk' ;
1212import { crawl as crawlFilesystem , determineFileType } from './crawlfs' ;
13- import { IOptions } from 'glob' ;
13+ import { IOptions } from './types/ glob' ;
1414
1515/**
1616 * Whether a directory should be excluded from packing due to the `--unpack-dir" option.
Original file line number Diff line number Diff line change 11import { promisify } from 'util' ;
2- import { glob as _glob , IOptions } from 'glob' ;
2+ import { glob as _glob } from 'glob' ;
33
44import fs from './wrapped-fs' ;
55import { Stats } from 'fs' ;
6+ import { IOptions } from './types/glob' ;
67
78const glob = promisify ( _glob ) ;
89
Original file line number Diff line number Diff line change 1+ /**
2+ * TODO(erikian): remove this file once we upgrade to the latest `glob` version.
3+ * https://github.com/electron/asar/pull/332#issuecomment-2435407933
4+ */
5+ declare module 'glob' {
6+ export function glob (
7+ pattern : string ,
8+ options : import ( './glob' ) . IOptions ,
9+ cb : ( err : Error | null , matches : string [ ] ) => void ,
10+ ) : unknown ;
11+ }
Original file line number Diff line number Diff line change 22 * TODO(erikian): remove this file once we upgrade to the latest `glob` version.
33 * https://github.com/electron/asar/pull/332#issuecomment-2435407933
44 */
5-
6- declare module 'glob' {
7- export function glob (
8- pattern : string ,
9- options : IGlobOptions ,
10- cb : ( err : Error | null , matches : string [ ] ) => void ,
11- ) : unknown ;
12-
13- export interface IOptions extends IGlobOptions { }
14- }
15-
165interface IMinimatchOptions {
176 /**
187 * Dump a ton of stuff to stderr.
@@ -135,7 +124,7 @@ interface IMinimatchOptions {
135124 windowsPathsNoEscape ?: boolean ;
136125}
137126
138- export interface IGlobOptions extends IMinimatchOptions {
127+ export interface IOptions extends IMinimatchOptions {
139128 cwd ?: string | undefined ;
140129 root ?: string | undefined ;
141130 dot ?: boolean | undefined ;
You can’t perform that action at this time.
0 commit comments