Merge pull request #19325 from atom/ns/notify-asar-exclude

Exclude @atom/notify binary from the ASAR bundle
This commit is contained in:
Jason Rudolph 2019-05-13 17:38:14 -04:00 committed by GitHub
commit da8b1a1a42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions

6
package-lock.json generated
View File

@ -456,9 +456,9 @@
}
},
"@atom/notify": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@atom/notify/-/notify-1.2.1.tgz",
"integrity": "sha512-d1mZlBmPrYbk/SS1q0+gq/I9lG58a+PZ5y9vKBNuWzbgVaDPhpYBJyiO4glr80UbTxCQ/KW8AAD+rY517P8TfA=="
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@atom/notify/-/notify-1.3.2.tgz",
"integrity": "sha512-EGCDK33j4mstsdbpHXmSVOsi27uzFGWv+9CFctiMQy8rPD5DVOWuLLkES+74nsiFgzlkEbR1ahgQghpnjPzB1Q=="
},
"@atom/nsfw": {
"version": "1.0.22",

View File

@ -14,7 +14,7 @@
"license": "MIT",
"electronVersion": "2.0.18",
"dependencies": {
"@atom/notify": "1.2.1",
"@atom/notify": "1.3.2",
"@atom/nsfw": "1.0.22",
"@atom/source-map-support": "^0.3.4",
"@atom/watcher": "1.3.1",

View File

@ -112,6 +112,7 @@ function buildAsarUnpackGlobExpression () {
path.join('**', 'node_modules', 'dugite', 'git', '**'),
path.join('**', 'node_modules', 'github', 'bin', '**'),
path.join('**', 'node_modules', 'vscode-ripgrep', 'bin', '**'),
path.join('**', 'node_modules', '@atom', 'notify', 'bin', '**'),
path.join('**', 'resources', 'atom.png')
]

View File

@ -586,7 +586,8 @@ class PathWatcherManager {
if (this.useExperimentalWatcher()) {
if (!this.notifyWatcher) {
const options = {
onError: (error) => {
transformBinPath: (binPath) => binPath.replace(/\bapp\.asar\b/, 'app.asar.unpacked'),
onError: error => {
throw new Error(`Error watching file system: ${error}`)
}
}