-
Notifications
You must be signed in to change notification settings - Fork 0
/
bootstrap.patch
188 lines (187 loc) · 6.17 KB
/
bootstrap.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
diff --git a/package.json b/package.json
index 38aed1d4f..604c879c2 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.228.0/tarball",
"typescript-simple": "1.0.0",
"update-package-dependencies": "file:./packages/update-package-dependencies",
- "vscode-ripgrep": "^1.2.5",
+ "vscode-ripgrep": "1.5.8",
"welcome": "file:packages/welcome",
"whitespace": "https://www.atom.io/api/packages/whitespace/versions/0.37.7/tarball",
"winreg": "^1.2.1",
diff --git a/script/package.json b/script/package.json
index e7df5f46e..f9c2b2871 100644
--- a/script/package.json
+++ b/script/package.json
@@ -11,7 +11,7 @@
"colors": "1.1.2",
"donna": "1.0.16",
"electron-chromedriver": "^5.0.0",
- "electron-link": "0.4.1",
+ "electron-link": "0.4.2",
"electron-mksnapshot": "^5.0.0",
"electron-packager": "12.2.0",
"@atom/electron-winstaller": "0.0.1",
@@ -23,7 +23,7 @@
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-promise": "^4.1.1",
"eslint-plugin-standard": "^4.0.0",
- "fs-admin": "^0.12.0",
+ "fs-admin": "^0.13.0",
"fs-extra": "0.30.0",
"glob": "7.0.3",
"joanna": "0.0.10",
@@ -31,7 +31,7 @@
"legal-eagle": "0.14.0",
"lodash.startcase": "4.4.0",
"lodash.template": "4.5.0",
- "minidump": "0.9.0",
+ "minidump": "0.19.0",
"mkdirp": "0.5.1",
"normalize-package-data": "2.3.5",
"npm": "6.14.4",
diff --git a/script/lib/generate-startup-snapshot.js b/script/lib/generate-startup-snapshot.js
index a5a3d4c8b..b0b160e05 100644
--- a/script/lib/generate-startup-snapshot.js
+++ b/script/lib/generate-startup-snapshot.js
@@ -271,72 +266,72 @@ module.exports = function(packagedAppPath) {
process.stdout.write('\n');
fs.writeFileSync(snapshotScriptPath, minification.code);
- console.log('Verifying if snapshot can be executed via `mksnapshot`');
- const verifySnapshotScriptPath = path.join(
- CONFIG.repositoryRootPath,
- 'script',
- 'verify-snapshot-script'
- );
- let nodeBundledInElectronPath;
- if (process.platform === 'darwin') {
- nodeBundledInElectronPath = path.join(
- packagedAppPath,
- 'Contents',
- 'MacOS',
- CONFIG.executableName
- );
- } else {
- nodeBundledInElectronPath = path.join(
- packagedAppPath,
- CONFIG.executableName
- );
- }
- childProcess.execFileSync(
- nodeBundledInElectronPath,
- [verifySnapshotScriptPath, snapshotScriptPath],
- { env: Object.assign({}, process.env, { ELECTRON_RUN_AS_NODE: 1 }) }
- );
-
- console.log('Generating startup blob with mksnapshot');
- childProcess.spawnSync(process.execPath, [
- path.join(
- CONFIG.repositoryRootPath,
- 'script',
- 'node_modules',
- 'electron-mksnapshot',
- 'mksnapshot.js'
- ),
- snapshotScriptPath,
- '--output_dir',
- CONFIG.buildOutputPath
- ]);
-
- let startupBlobDestinationPath;
- if (process.platform === 'darwin') {
- startupBlobDestinationPath = `${packagedAppPath}/Contents/Frameworks/Electron Framework.framework/Resources`;
- } else {
- startupBlobDestinationPath = packagedAppPath;
- }
-
- const snapshotBinaries = ['v8_context_snapshot.bin', 'snapshot_blob.bin'];
- for (let snapshotBinary of snapshotBinaries) {
- const destinationPath = path.join(
- startupBlobDestinationPath,
- snapshotBinary
- );
- console.log(`Moving generated startup blob into "${destinationPath}"`);
- try {
- fs.unlinkSync(destinationPath);
- } catch (err) {
- // Doesn't matter if the file doesn't exist already
- if (!err.code || err.code !== 'ENOENT') {
- throw err;
- }
- }
- fs.renameSync(
- path.join(CONFIG.buildOutputPath, snapshotBinary),
- destinationPath
- );
- }
+// console.log('Verifying if snapshot can be executed via `mksnapshot`');
+// const verifySnapshotScriptPath = path.join(
+// CONFIG.repositoryRootPath,
+// 'script',
+// 'verify-snapshot-script'
+// );
+// let nodeBundledInElectronPath;
+// if (process.platform === 'darwin') {
+// nodeBundledInElectronPath = path.join(
+// packagedAppPath,
+// 'Contents',
+// 'MacOS',
+// CONFIG.executableName
+// );
+// } else {
+// nodeBundledInElectronPath = path.join(
+// packagedAppPath,
+// CONFIG.executableName
+// );
+// }
+// childProcess.execFileSync(
+// nodeBundledInElectronPath,
+// [verifySnapshotScriptPath, snapshotScriptPath],
+// { env: Object.assign({}, process.env, { ELECTRON_RUN_AS_NODE: 1 }) }
+// );
+//
+// console.log('Generating startup blob with mksnapshot');
+// childProcess.spawnSync(process.execPath, [
+// path.join(
+// CONFIG.repositoryRootPath,
+// 'script',
+// 'node_modules',
+// 'electron-mksnapshot',
+// 'mksnapshot.js'
+// ),
+// snapshotScriptPath,
+// '--output_dir',
+// CONFIG.buildOutputPath
+// ]);
+//
+// let startupBlobDestinationPath;
+// if (process.platform === 'darwin') {
+// startupBlobDestinationPath = `${packagedAppPath}/Contents/Frameworks/Electron Framework.framework/Resources`;
+// } else {
+// startupBlobDestinationPath = packagedAppPath;
+// }
+//
+// const snapshotBinaries = ['v8_context_snapshot.bin', 'snapshot_blob.bin'];
+// for (let snapshotBinary of snapshotBinaries) {
+// const destinationPath = path.join(
+// startupBlobDestinationPath,
+// snapshotBinary
+// );
+// console.log(`Moving generated startup blob into "${destinationPath}"`);
+// try {
+// fs.unlinkSync(destinationPath);
+// } catch (err) {
+// // Doesn't matter if the file doesn't exist already
+// if (!err.code || err.code !== 'ENOENT') {
+// throw err;
+// }
+// }
+// fs.renameSync(
+// path.join(CONFIG.buildOutputPath, snapshotBinary),
+// destinationPath
+// );
+// }
});
};