mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor: allow embedder overriding of internal FS calls (#17906) (#18183)

Browse source
This commit is contained in:
Shelley Vohr 2019-05-07 06:44:32 -07:00 committed by John Kleinschmidt
parent 91e3421525
commit cfb6e847a0
7 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -12,7 +12,7 @@ vars = {
'chromium_version': 'chromium_version':
'84c40395c741fa24ccbd9fc2c5828e2e97472952', '84c40395c741fa24ccbd9fc2c5828e2e97472952',
'node_version': 'node_version':
'696d8fb66d6f65fc82869d390e0d2078970b1eb4', 'a86a4a160dc520c61a602c949a32a1bc4c0fc633',
'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b', 'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
'pyyaml_version': '3.12', 'pyyaml_version': '3.12',

11
lib/common/asar.js
View file

@ -13,6 +13,9 @@
process.type !== 'renderer' process.type !== 'renderer'
const isAsarDisabled = () => process.noAsar || envNoAsar const isAsarDisabled = () => process.noAsar || envNoAsar
const internalBinding = process.internalBinding
delete process.internalBinding
/** /**
* @param {!Function} functionToCall * @param {!Function} functionToCall
* @param {!Array|undefined} args * @param {!Array|undefined} args
@ -669,8 +672,8 @@
return files return files
} }
const { internalModuleReadJSON } = process.binding('fs') const { internalModuleReadJSON } = internalBinding('fs')
process.binding('fs').internalModuleReadJSON = pathArgument => { internalBinding('fs').internalModuleReadJSON = pathArgument => {
const { isAsar, asarPath, filePath } = splitPath(pathArgument) const { isAsar, asarPath, filePath } = splitPath(pathArgument)
if (!isAsar) return internalModuleReadJSON(pathArgument) if (!isAsar) return internalModuleReadJSON(pathArgument)
@ -694,8 +697,8 @@
return buffer.toString('utf8') return buffer.toString('utf8')
} }
const { internalModuleStat } = process.binding('fs') const { internalModuleStat } = internalBinding('fs')
process.binding('fs').internalModuleStat = pathArgument => { internalBinding('fs').internalModuleStat = pathArgument => {
const { isAsar, asarPath, filePath } = splitPath(pathArgument) const { isAsar, asarPath, filePath } = splitPath(pathArgument)
if (!isAsar) return internalModuleStat(pathArgument) if (!isAsar) return internalModuleStat(pathArgument)

BIN
spec/fixtures/api/electron-main-module/app.asar vendored Normal file
View file

Binary file not shown.

8
spec/fixtures/api/electron-main-module/app/index.js vendored Normal file
View file

@ -0,0 +1,8 @@
try {
require('some-module')
} catch (err) {
console.error(err)
process.exit(1)
}
process.exit(0)

1
spec/fixtures/api/electron-main-module/app/node_modules/some-module/main2.js generated vendored Normal file
View file

@ -0,0 +1 @@
// Nothing to do here

4
spec/fixtures/api/electron-main-module/app/node_modules/some-module/package.json generated vendored Normal file
View file

@ -0,0 +1,4 @@
{
"name": "some-module",
"main": "./main2.js"
}

5
spec/node-spec.js
View file

@ -578,4 +578,9 @@ describe('node feature', () => {
.that.is.a('string') .that.is.a('string')
.and.matches(/^\d+\.\d+\.\d+\.\d+$/) .and.matches(/^\d+\.\d+\.\d+\.\d+$/)
}) })
it('can find a module using a package.json main field', () => {
const result = ChildProcess.spawnSync(remote.process.execPath, [path.resolve(fixtures, 'api', 'electron-main-module', 'app.asar')])
expect(result.status).to.equal(0)
})
}) })