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 {
10
10
} from './filesystem' ;
11
11
import * as disk from './disk' ;
12
12
import { crawl as crawlFilesystem , determineFileType } from './crawlfs' ;
13
- import { IOptions } from 'glob' ;
13
+ import { IOptions } from './types/ glob' ;
14
14
15
15
/**
16
16
* Whether a directory should be excluded from packing due to the `--unpack-dir" option.
Original file line number Diff line number Diff line change 1
1
import { promisify } from 'util' ;
2
- import { glob as _glob , IOptions } from 'glob' ;
2
+ import { glob as _glob } from 'glob' ;
3
3
4
4
import fs from './wrapped-fs' ;
5
5
import { Stats } from 'fs' ;
6
+ import { IOptions } from './types/glob' ;
6
7
7
8
const glob = promisify ( _glob ) ;
8
9
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 2
2
* TODO(erikian): remove this file once we upgrade to the latest `glob` version.
3
3
* https://github.com/electron/asar/pull/332#issuecomment-2435407933
4
4
*/
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
-
16
5
interface IMinimatchOptions {
17
6
/**
18
7
* Dump a ton of stuff to stderr.
@@ -135,7 +124,7 @@ interface IMinimatchOptions {
135
124
windowsPathsNoEscape ?: boolean ;
136
125
}
137
126
138
- export interface IGlobOptions extends IMinimatchOptions {
127
+ export interface IOptions extends IMinimatchOptions {
139
128
cwd ?: string | undefined ;
140
129
root ?: string | undefined ;
141
130
dot ?: boolean | undefined ;
You can’t perform that action at this time.
0 commit comments