@@ -33,7 +33,7 @@ const buildServerBinaryPackage = register("build:server:binary:package", async (
33
33
}
34
34
await buildServerBinaryCopy ( ) ;
35
35
await dependencyNexeBinary ( ) ;
36
- const resp = await runner . execute ( "npm" , [ "run" , "build:nexe" ] ) ;
36
+ const resp = await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build:nexe" ] ) ;
37
37
if ( resp . exitCode !== 0 ) {
38
38
throw new Error ( `Failed to package binary: ${ resp . stderr } ` ) ;
39
39
}
@@ -133,7 +133,7 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
133
133
const buildServerBundle = register ( "build:server:bundle" , async ( runner ) => {
134
134
const cliPath = path . join ( pkgsPath , "server" ) ;
135
135
runner . cwd = cliPath ;
136
- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
136
+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
137
137
} ) ;
138
138
139
139
const buildBootstrapFork = register ( "build:bootstrap-fork" , async ( runner ) => {
@@ -142,7 +142,7 @@ const buildBootstrapFork = register("build:bootstrap-fork", async (runner) => {
142
142
143
143
const vscodePkgPath = path . join ( pkgsPath , "vscode" ) ;
144
144
runner . cwd = vscodePkgPath ;
145
- await runner . execute ( "npm" , [ "run" , "build:bootstrap-fork" ] ) ;
145
+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build:bootstrap-fork" ] ) ;
146
146
} ) ;
147
147
148
148
const buildAppBrowser = register ( "build:app:browser" , async ( runner ) => {
@@ -151,7 +151,7 @@ const buildAppBrowser = register("build:app:browser", async (runner) => {
151
151
const appPath = path . join ( pkgsPath , "app/browser" ) ;
152
152
runner . cwd = appPath ;
153
153
fse . removeSync ( path . join ( appPath , "out" ) ) ;
154
- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
154
+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
155
155
} ) ;
156
156
157
157
const buildWeb = register ( "build:web" , async ( runner ) => {
@@ -161,24 +161,40 @@ const buildWeb = register("build:web", async (runner) => {
161
161
const webPath = path . join ( pkgsPath , "web" ) ;
162
162
runner . cwd = webPath ;
163
163
fse . removeSync ( path . join ( webPath , "out" ) ) ;
164
- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
164
+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
165
165
} ) ;
166
166
167
167
const extDirPath = path . join ( "lib" , "vscode-default-extensions" ) ;
168
168
const copyForDefaultExtensions = register ( "build:copy-vscode" , async ( runner ) => {
169
169
if ( ! fs . existsSync ( defaultExtensionsPath ) ) {
170
170
await ensureClean ( ) ;
171
171
await ensureInstalled ( ) ;
172
- fse . removeSync ( extDirPath ) ;
173
- fse . copySync ( vscodePath , extDirPath ) ;
172
+ await new Promise ( ( resolve , reject ) : void => {
173
+ fse . remove ( extDirPath , ( err ) => {
174
+ if ( err ) {
175
+ return reject ( err ) ;
176
+ }
177
+
178
+ resolve ( ) ;
179
+ } ) ;
180
+ } ) ;
181
+ await new Promise ( ( resolve , reject ) : void => {
182
+ fse . copy ( vscodePath , extDirPath , ( err ) => {
183
+ if ( err ) {
184
+ return reject ( err ) ;
185
+ }
186
+
187
+ resolve ( ) ;
188
+ } ) ;
189
+ } ) ;
174
190
}
175
191
} ) ;
176
192
177
193
const buildDefaultExtensions = register ( "build:default-extensions" , async ( runner ) => {
178
194
if ( ! fs . existsSync ( defaultExtensionsPath ) ) {
179
195
await copyForDefaultExtensions ( ) ;
180
196
runner . cwd = extDirPath ;
181
- const resp = await runner . execute ( "npx" , [ "gulp" , "vscode-linux-x64" ] ) ;
197
+ const resp = await runner . execute ( isWin ? "npx.cmd" : "npx" , [ isWin ? "gulp.cmd" : "gulp" , "vscode-linux-x64" ] ) ;
182
198
if ( resp . exitCode !== 0 ) {
183
199
throw new Error ( `Failed to build default extensions: ${ resp . stderr } ` ) ;
184
200
}
0 commit comments