@electron/rebuild 4.0.3 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -6
- package/lib/arch.js +1 -3
- package/lib/arch.js.map +1 -1
- package/lib/cache.js +18 -13
- package/lib/cache.js.map +1 -1
- package/lib/clang-fetcher.js +14 -21
- package/lib/clang-fetcher.js.map +1 -1
- package/lib/cli.js +122 -78
- package/lib/cli.js.map +1 -1
- package/lib/detect-libc.d.ts +8 -0
- package/lib/detect-libc.js +24 -0
- package/lib/detect-libc.js.map +1 -0
- package/lib/electron-locator.js +5 -4
- package/lib/electron-locator.js.map +1 -1
- package/lib/fetcher.d.ts +1 -3
- package/lib/fetcher.js +11 -11
- package/lib/fetcher.js.map +1 -1
- package/lib/module-rebuilder.js +9 -9
- package/lib/module-rebuilder.js.map +1 -1
- package/lib/module-type/index.js +2 -2
- package/lib/module-type/index.js.map +1 -1
- package/lib/module-type/node-gyp/node-gyp.js +16 -13
- package/lib/module-type/node-gyp/node-gyp.js.map +1 -1
- package/lib/module-type/node-gyp/worker.js +1 -1
- package/lib/module-type/node-gyp/worker.js.map +1 -1
- package/lib/module-type/node-pre-gyp.js +2 -2
- package/lib/module-type/node-pre-gyp.js.map +1 -1
- package/lib/module-type/prebuild-install.js +5 -11
- package/lib/module-type/prebuild-install.js.map +1 -1
- package/lib/module-type/prebuildify.js +2 -2
- package/lib/module-type/prebuildify.js.map +1 -1
- package/lib/module-walker.d.ts +1 -1
- package/lib/module-walker.js +6 -6
- package/lib/module-walker.js.map +1 -1
- package/lib/node-api.js +2 -2
- package/lib/node-api.js.map +1 -1
- package/lib/prebuild-shim.js +1 -1
- package/lib/prebuild-shim.js.map +1 -1
- package/lib/read-package-json.js +2 -2
- package/lib/read-package-json.js.map +1 -1
- package/lib/rebuild.d.ts +0 -2
- package/lib/rebuild.js +14 -8
- package/lib/rebuild.js.map +1 -1
- package/lib/search-module.js +1 -1
- package/lib/search-module.js.map +1 -1
- package/lib/sysroot-fetcher.js +6 -7
- package/lib/sysroot-fetcher.js.map +1 -1
- package/lib/types.d.ts +0 -2
- package/package.json +25 -36
- package/lib/promisifiedGracefulFs.d.ts +0 -3
- package/lib/promisifiedGracefulFs.js +0 -9
- package/lib/promisifiedGracefulFs.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-package-json.js","sourceRoot":"","sources":["../src/read-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"read-package-json.js","sourceRoot":"","sources":["../src/read-package-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW,EAAE,IAAI,GAAG,KAAK;IAC7D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CACf,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE;YACnD,QAAQ,EAAE,OAAO;SAClB,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/lib/rebuild.d.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
/// <reference types="node" resolution-mode="require"/>
|
|
3
1
|
import { EventEmitter } from 'node:events';
|
|
4
2
|
import { BuildType, IRebuilder, RebuildMode } from './types.js';
|
|
5
3
|
import { ModuleType } from './module-walker.js';
|
package/lib/rebuild.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import debug from 'debug';
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
|
-
import fs from '
|
|
3
|
+
import fs from 'node:fs';
|
|
4
4
|
import { getAbi } from 'node-abi';
|
|
5
5
|
import os from 'node:os';
|
|
6
6
|
import path from 'node:path';
|
|
@@ -55,6 +55,8 @@ export class Rebuilder {
|
|
|
55
55
|
console.warn('[WARNING]: Electron Rebuild has force enabled and cache enabled, force take precedence and the cache will not be used.');
|
|
56
56
|
this.useCache = false;
|
|
57
57
|
}
|
|
58
|
+
// FIXME: this entire guard is unreachable according to the types
|
|
59
|
+
/* oxlint-disable typescript-eslint(restrict-template-expressions) */
|
|
58
60
|
if (typeof this.electronVersion === 'number') {
|
|
59
61
|
if (`${this.electronVersion}`.split('.').length === 1) {
|
|
60
62
|
this.electronVersion = `${this.electronVersion}.0.0`;
|
|
@@ -63,6 +65,7 @@ export class Rebuilder {
|
|
|
63
65
|
this.electronVersion = `${this.electronVersion}.0`;
|
|
64
66
|
}
|
|
65
67
|
}
|
|
68
|
+
/* oxlint-enable typescript-eslint(restrict-template-expressions) */
|
|
66
69
|
if (typeof this.electronVersion !== 'string') {
|
|
67
70
|
throw new Error(`Expected a string version for electron version, got a "${typeof this.electronVersion}"`);
|
|
68
71
|
}
|
|
@@ -89,12 +92,18 @@ export class Rebuilder {
|
|
|
89
92
|
throw new Error('Expected buildPath to be an absolute path');
|
|
90
93
|
}
|
|
91
94
|
this.lifecycle.emit('start');
|
|
92
|
-
|
|
95
|
+
const candidatePaths = [...(await this.modulesToRebuild()), this.buildPath];
|
|
96
|
+
const nativeModulePaths = candidatePaths.filter((p) => fs.existsSync(path.resolve(p, 'binding.gyp')));
|
|
97
|
+
this.lifecycle.emit('modules-found', nativeModulePaths.map((p) => {
|
|
98
|
+
const name = path.basename(p);
|
|
99
|
+
const parent = path.basename(path.dirname(p));
|
|
100
|
+
return parent !== 'node_modules' ? `${parent}/${name}` : name;
|
|
101
|
+
}));
|
|
102
|
+
for (const modulePath of nativeModulePaths) {
|
|
93
103
|
this.rebuilds.push(() => this.rebuildModuleAt(modulePath));
|
|
94
104
|
}
|
|
95
|
-
this.rebuilds.push(() => this.rebuildModuleAt(this.buildPath));
|
|
96
105
|
if (this.mode !== 'sequential') {
|
|
97
|
-
await Promise.all(this.rebuilds.map(fn => fn()));
|
|
106
|
+
await Promise.all(this.rebuilds.map((fn) => fn()));
|
|
98
107
|
}
|
|
99
108
|
else {
|
|
100
109
|
for (const rebuildFn of this.rebuilds) {
|
|
@@ -110,9 +119,6 @@ export class Rebuilder {
|
|
|
110
119
|
return this.moduleWalker.modulesToRebuild;
|
|
111
120
|
}
|
|
112
121
|
async rebuildModuleAt(modulePath) {
|
|
113
|
-
if (!(fs.existsSync(path.resolve(modulePath, 'binding.gyp')))) {
|
|
114
|
-
return;
|
|
115
|
-
}
|
|
116
122
|
const moduleRebuilder = new ModuleRebuilder(this, modulePath);
|
|
117
123
|
let moduleName = path.basename(modulePath);
|
|
118
124
|
const parentName = path.basename(path.dirname(modulePath));
|
|
@@ -120,7 +126,7 @@ export class Rebuilder {
|
|
|
120
126
|
moduleName = `${parentName}/${moduleName}`;
|
|
121
127
|
}
|
|
122
128
|
this.lifecycle.emit('module-found', moduleName);
|
|
123
|
-
if (!this.force && await moduleRebuilder.alreadyBuiltByRebuild()) {
|
|
129
|
+
if (!this.force && (await moduleRebuilder.alreadyBuiltByRebuild())) {
|
|
124
130
|
d(`skipping: ${moduleName} as it is already built`);
|
|
125
131
|
this.lifecycle.emit('module-done', moduleName);
|
|
126
132
|
this.lifecycle.emit('module-skip', moduleName);
|
package/lib/rebuild.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"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"}
|
package/lib/search-module.js
CHANGED
package/lib/search-module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-module.js","sourceRoot":"","sources":["../src/search-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"search-module.js","sourceRoot":"","sources":["../src/search-module.ts"],"names":[],"mappings":"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"}
|
package/lib/sysroot-fetcher.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { spawn } from '@malept/cross-spawn-promise';
|
|
2
1
|
import crypto from 'node:crypto';
|
|
3
2
|
import debug from 'debug';
|
|
4
|
-
import fs from '
|
|
3
|
+
import fs from 'node:fs';
|
|
5
4
|
import path from 'node:path';
|
|
6
5
|
import { ELECTRON_GYP_DIR } from './constants.js';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
6
|
+
import { fetchUrl } from './fetcher.js';
|
|
7
|
+
import { spawn } from '@malept/cross-spawn-promise';
|
|
9
8
|
const d = debug('electron-rebuild');
|
|
10
9
|
const sysrootArchAliases = {
|
|
11
10
|
x64: 'amd64',
|
|
@@ -19,10 +18,10 @@ export async function downloadLinuxSysroot(electronVersion, targetArch) {
|
|
|
19
18
|
return sysrootDir;
|
|
20
19
|
await fs.promises.mkdir(sysrootDir, { recursive: true });
|
|
21
20
|
const linuxArch = sysrootArchAliases[targetArch] || targetArch;
|
|
22
|
-
const electronSysroots = JSON.parse(await
|
|
21
|
+
const electronSysroots = JSON.parse(await fetchUrl(`https://raw.githubusercontent.com/electron/electron/v${electronVersion}/script/sysroots.json`, 'text'));
|
|
23
22
|
const { Sha1Sum: sha, Tarball: fileName } = electronSysroots[`sid_${linuxArch}`] || electronSysroots[`bullseye_${linuxArch}`];
|
|
24
23
|
const sysrootURL = `${SYSROOT_BASE_URL}/${sha}/${fileName}`;
|
|
25
|
-
const sysrootBuffer = await
|
|
24
|
+
const sysrootBuffer = await fetchUrl(sysrootURL, 'buffer');
|
|
26
25
|
const actualSha = crypto.createHash('SHA1').update(sysrootBuffer).digest('hex');
|
|
27
26
|
d('expected sha:', sha);
|
|
28
27
|
d('actual sha:', actualSha);
|
|
@@ -32,7 +31,7 @@ export async function downloadLinuxSysroot(electronVersion, targetArch) {
|
|
|
32
31
|
const tmpTarFile = path.resolve(ELECTRON_GYP_DIR, `${electronVersion}-${fileName}`);
|
|
33
32
|
if (fs.existsSync(tmpTarFile))
|
|
34
33
|
await fs.promises.rm(tmpTarFile, { recursive: true, force: true });
|
|
35
|
-
await
|
|
34
|
+
await fs.promises.writeFile(tmpTarFile, sysrootBuffer);
|
|
36
35
|
d('decompressing sysroot');
|
|
37
36
|
await spawn('tar', ['-xf', tmpTarFile, '-C', sysrootDir], { stdio: 'ignore' });
|
|
38
37
|
return sysrootDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sysroot-fetcher.js","sourceRoot":"","sources":["../src/sysroot-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sysroot-fetcher.js","sourceRoot":"","sources":["../src/sysroot-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEpD,MAAM,CAAC,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAEpC,MAAM,kBAAkB,GAA2B;IACjD,GAAG,EAAE,OAAO;IACZ,IAAI,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,gBAAgB,GAAG,+CAA+C,CAAC;AAEzE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,eAAuB,EACvB,UAAkB;IAElB,CAAC,CAAC,gCAAgC,EAAE,eAAe,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,eAAe,UAAU,CAAC,CAAC;IAChF,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAAE,OAAO,UAAU,CAAC;IACtE,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzD,MAAM,SAAS,GAAG,kBAAkB,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC;IAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CACjC,MAAM,QAAQ,CACZ,wDAAwD,eAAe,uBAAuB,EAC9F,MAAM,CACP,CACF,CAAC;IAEF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GACvC,gBAAgB,CAAC,OAAO,SAAS,EAAE,CAAC,IAAI,gBAAgB,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,GAAG,gBAAgB,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC5D,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChF,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC5B,IAAI,GAAG,KAAK,SAAS;QACnB,MAAM,IAAI,KAAK,CACb,+CAA+C,eAAe,qCAAqC,CACpG,CAAC;IAEJ,CAAC,CAAC,yBAAyB,CAAC,CAAC;IAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,eAAe,IAAI,QAAQ,EAAE,CAAC,CAAC;IACpF,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAEvD,CAAC,CAAC,uBAAuB,CAAC,CAAC;IAC3B,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE/E,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
package/lib/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electron/rebuild",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.5",
|
|
4
4
|
"description": "Electron supporting package to rebuild native node modules against the currently installed electron",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": "./lib/main.js",
|
|
@@ -8,12 +8,11 @@
|
|
|
8
8
|
"scripts": {
|
|
9
9
|
"build": "tsc",
|
|
10
10
|
"build:docs": "typedoc src/main.ts",
|
|
11
|
-
"coverage": "yarn prewarm-headers &&
|
|
12
|
-
"coverage:report": "nyc report --reporter=text-lcov > coverage.lcov",
|
|
11
|
+
"coverage": "yarn prewarm-headers && yarn spec --coverage",
|
|
13
12
|
"watch": "tsc -w",
|
|
14
|
-
"prepare": "yarn build",
|
|
15
|
-
"lint": "
|
|
16
|
-
"spec": "tsc &&
|
|
13
|
+
"prepare": "husky && yarn build",
|
|
14
|
+
"lint": "oxlint && oxfmt --check",
|
|
15
|
+
"spec": "tsc && vitest run",
|
|
17
16
|
"test": "yarn prewarm-headers && yarn lint && yarn spec",
|
|
18
17
|
"prewarm-headers": "node-gyp install --ensure"
|
|
19
18
|
},
|
|
@@ -48,45 +47,35 @@
|
|
|
48
47
|
"dependencies": {
|
|
49
48
|
"@malept/cross-spawn-promise": "^2.0.0",
|
|
50
49
|
"debug": "^4.1.1",
|
|
51
|
-
"detect-libc": "^2.0.1",
|
|
52
|
-
"got": "^11.7.0",
|
|
53
|
-
"graceful-fs": "^4.2.11",
|
|
54
50
|
"node-abi": "^4.2.0",
|
|
55
51
|
"node-api-version": "^0.2.1",
|
|
56
|
-
"node-gyp": "^
|
|
57
|
-
"
|
|
58
|
-
"read-binary-file-arch": "^1.0.6",
|
|
59
|
-
"semver": "^7.3.5",
|
|
60
|
-
"tar": "^7.5.6",
|
|
61
|
-
"yargs": "^17.0.1"
|
|
52
|
+
"node-gyp": "^12.2.0",
|
|
53
|
+
"read-binary-file-arch": "^1.0.6"
|
|
62
54
|
},
|
|
63
55
|
"devDependencies": {
|
|
64
|
-
"@istanbuljs/nyc-config-typescript": "^1.0.1",
|
|
65
56
|
"@tsconfig/node22": "^22.0.0",
|
|
66
|
-
"@types/chai": "^4.2.12",
|
|
67
|
-
"@types/chai-as-promised": "^7.1.3",
|
|
68
57
|
"@types/debug": "^4.1.5",
|
|
69
|
-
"@types/graceful-fs": "^4.1.9",
|
|
70
|
-
"@types/mocha": "^10.0.10",
|
|
71
58
|
"@types/node": "~22.10.7",
|
|
72
59
|
"@types/node-abi": "^3.0.0",
|
|
73
|
-
"@
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
78
|
-
"
|
|
79
|
-
"
|
|
80
|
-
"
|
|
81
|
-
"
|
|
82
|
-
"
|
|
83
|
-
"nyc": "^15.1.0",
|
|
84
|
-
"tsx": "^4.19.3",
|
|
85
|
-
"typedoc": "~0.25.13",
|
|
86
|
-
"typescript": "~5.4.5"
|
|
60
|
+
"@vitest/coverage-v8": "^4.1.2",
|
|
61
|
+
"electron": "^39.8.5",
|
|
62
|
+
"husky": "^9.1.7",
|
|
63
|
+
"lint-staged": "^16.4.0",
|
|
64
|
+
"oxfmt": "^0.42.0",
|
|
65
|
+
"oxlint": "^1.57.0",
|
|
66
|
+
"oxlint-tsgolint": "^0.18.1",
|
|
67
|
+
"typedoc": "~0.28.0",
|
|
68
|
+
"typescript": "^6.0.2",
|
|
69
|
+
"vitest": "^4.1.2"
|
|
87
70
|
},
|
|
88
|
-
"
|
|
89
|
-
"
|
|
71
|
+
"lint-staged": {
|
|
72
|
+
"*.ts": [
|
|
73
|
+
"oxlint --fix",
|
|
74
|
+
"oxfmt --write"
|
|
75
|
+
]
|
|
76
|
+
},
|
|
77
|
+
"resolutions": {
|
|
78
|
+
"@typescript-eslint/typescript-estree/minimatch": "^9.0.7"
|
|
90
79
|
},
|
|
91
80
|
"packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f",
|
|
92
81
|
"dependenciesMeta": {
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import gracefulFS from 'graceful-fs';
|
|
2
|
-
import { promisify } from 'node:util';
|
|
3
|
-
export const promisifiedGracefulFs = {
|
|
4
|
-
copyFile: promisify(gracefulFS.copyFile),
|
|
5
|
-
readFile: promisify(gracefulFS.readFile),
|
|
6
|
-
readdir: promisify(gracefulFS.readdir),
|
|
7
|
-
writeFile: promisify(gracefulFS.writeFile),
|
|
8
|
-
};
|
|
9
|
-
//# sourceMappingURL=promisifiedGracefulFs.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"promisifiedGracefulFs.js","sourceRoot":"","sources":["../src/promisifiedGracefulFs.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC;IACxC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC;IACxC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC;IACtC,SAAS,EAAE,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC;CAC+C,CAAC"}
|