@@ -33,7 +33,7 @@ const buildServerBinaryPackage = register("build:server:binary:package", async (
3333 }
3434 await buildServerBinaryCopy ( ) ;
3535 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" ] ) ;
3737 if ( resp . exitCode !== 0 ) {
3838 throw new Error ( `Failed to package binary: ${ resp . stderr } ` ) ;
3939 }
@@ -133,7 +133,7 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
133133const buildServerBundle = register ( "build:server:bundle" , async ( runner ) => {
134134 const cliPath = path . join ( pkgsPath , "server" ) ;
135135 runner . cwd = cliPath ;
136- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
136+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
137137} ) ;
138138
139139const buildBootstrapFork = register ( "build:bootstrap-fork" , async ( runner ) => {
@@ -142,7 +142,7 @@ const buildBootstrapFork = register("build:bootstrap-fork", async (runner) => {
142142
143143 const vscodePkgPath = path . join ( pkgsPath , "vscode" ) ;
144144 runner . cwd = vscodePkgPath ;
145- await runner . execute ( "npm" , [ "run" , "build:bootstrap-fork" ] ) ;
145+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build:bootstrap-fork" ] ) ;
146146} ) ;
147147
148148const buildAppBrowser = register ( "build:app:browser" , async ( runner ) => {
@@ -151,7 +151,7 @@ const buildAppBrowser = register("build:app:browser", async (runner) => {
151151 const appPath = path . join ( pkgsPath , "app/browser" ) ;
152152 runner . cwd = appPath ;
153153 fse . removeSync ( path . join ( appPath , "out" ) ) ;
154- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
154+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
155155} ) ;
156156
157157const buildWeb = register ( "build:web" , async ( runner ) => {
@@ -161,24 +161,40 @@ const buildWeb = register("build:web", async (runner) => {
161161 const webPath = path . join ( pkgsPath , "web" ) ;
162162 runner . cwd = webPath ;
163163 fse . removeSync ( path . join ( webPath , "out" ) ) ;
164- await runner . execute ( "npm" , [ "run" , "build" ] ) ;
164+ await runner . execute ( isWin ? "npm.cmd" : "npm" , [ "run" , "build" ] ) ;
165165} ) ;
166166
167167const extDirPath = path . join ( "lib" , "vscode-default-extensions" ) ;
168168const copyForDefaultExtensions = register ( "build:copy-vscode" , async ( runner ) => {
169169 if ( ! fs . existsSync ( defaultExtensionsPath ) ) {
170170 await ensureClean ( ) ;
171171 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+ } ) ;
174190 }
175191} ) ;
176192
177193const buildDefaultExtensions = register ( "build:default-extensions" , async ( runner ) => {
178194 if ( ! fs . existsSync ( defaultExtensionsPath ) ) {
179195 await copyForDefaultExtensions ( ) ;
180196 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" ] ) ;
182198 if ( resp . exitCode !== 0 ) {
183199 throw new Error ( `Failed to build default extensions: ${ resp . stderr } ` ) ;
184200 }
0 commit comments