@@ -111,30 +111,30 @@ gulp.task('checkNativeDependencies', done => {
111111gulp . task ( 'check-datascience-dependencies' ,  ( )  =>  checkDatascienceDependencies ( ) ) ; 
112112
113113gulp . task ( 'compile-webviews' ,  async  ( )  =>  { 
114-  await  spawnAsync ( 'npx ' ,  [ '-n ' ,  '--max_old_space_size=9096 ' ,  'webpack ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  { ' BUNDLE_INDEX''0' } ) ; 
115-  await  spawnAsync ( 'npx ' ,  [ '-n ' ,  '--max_old_space_size=9096 ' ,  'webpack ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  { ' BUNDLE_INDEX''1' } ) ; 
116-  await  spawnAsync ( 'npx ' ,  [ '-n ' ,  '--max_old_space_size=9096 ' ,  'webpack ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  { ' BUNDLE_INDEX''2' } ) ; 
117-  await  spawnAsync ( 'npx ' ,  [ '-n ' ,  '--max_old_space_size=9096 ' ,  'webpack ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  { ' BUNDLE_INDEX''3' } ) ; 
114+  await  spawnAsync ( 'npm ' ,  [ 'run ' ,  'webpack ' ,  '-- ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''0'   } ) ; 
115+  await  spawnAsync ( 'npm ' ,  [ 'run ' ,  'webpack ' ,  '-- ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''1'   } ) ; 
116+  await  spawnAsync ( 'npm ' ,  [ 'run ' ,  'webpack ' ,  '-- ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''2'   } ) ; 
117+  await  spawnAsync ( 'npm ' ,  [ 'run ' ,  'webpack ' ,  '-- ' ,  '--config' ,  './build/webpack/webpack.config.js' ,  '--mode' ,  'production' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''3'   } ) ; 
118118} ) ; 
119119
120120gulp . task ( 'webpack' ,  async  ( )  =>  { 
121121 // Build node_modules and DS stuff. 
122122 // Unwrap the array used to build each webpack. 
123-  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  { ' BUNDLE_INDEX''0' } ) ; 
124-  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  { ' BUNDLE_INDEX''1' } ) ; 
125-  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  { ' BUNDLE_INDEX''2' } ) ; 
126-  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  { ' BUNDLE_INDEX''3' } ) ; 
127-  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  { ' BUNDLE_INDEX''4' } ) ; 
123+  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''0'   } ) ; 
124+  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''1'   } ) ; 
125+  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''2'   } ) ; 
126+  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''3'   } ) ; 
127+  await  buildWebPack ( 'production' ,  [ '--config' ,  './build/webpack/webpack.config.js' ] ,  {   'NODE_OPTIONS' :  '--max_old_space_size=9096' ,   ' BUNDLE_INDEX''4'   } ) ; 
128128 // Run both in parallel, for faster process on CI. 
129129 // Yes, console would print output from both, that's ok, we have a faster CI. 
130130 // If things fail, we can run locally separately. 
131131 if  ( isCI )  { 
132-  const  buildExtension  =  buildWebPack ( 'extension' ,  [ '--config' ,  './build/webpack/webpack.extension.config.js' ] ) ; 
133-  const  buildDebugAdapter  =  buildWebPack ( 'debugAdapter' ,  [ '--config' ,  './build/webpack/webpack.debugadapter.config.js' ] ) ; 
132+  const  buildExtension  =  buildWebPack ( 'extension' ,  [ '--config' ,  './build/webpack/webpack.extension.config.js' ] ,   {   'NODE_OPTIONS' :  '--max_old_space_size=9096'   } ) ; 
133+  const  buildDebugAdapter  =  buildWebPack ( 'debugAdapter' ,  [ '--config' ,  './build/webpack/webpack.debugadapter.config.js' ] ,   {   'NODE_OPTIONS' :  '--max_old_space_size=9096'   } ) ; 
134134 await  Promise . all ( [ buildExtension ,  buildDebugAdapter ] ) ; 
135135 }  else  { 
136-  await  buildWebPack ( 'extension' ,  [ '--config' ,  './build/webpack/webpack.extension.config.js' ] ) ; 
137-  await  buildWebPack ( 'debugAdapter' ,  [ '--config' ,  './build/webpack/webpack.debugadapter.config.js' ] ) ; 
136+  await  buildWebPack ( 'extension' ,  [ '--config' ,  './build/webpack/webpack.extension.config.js' ] ,   {   'NODE_OPTIONS' :  '--max_old_space_size=9096'   } ) ; 
137+  await  buildWebPack ( 'debugAdapter' ,  [ '--config' ,  './build/webpack/webpack.debugadapter.config.js' ] ,   {   'NODE_OPTIONS' :  '--max_old_space_size=9096'   } ) ; 
138138 } 
139139} ) ; 
140140
@@ -173,7 +173,7 @@ async function updateBuildNumber(args) {
173173async  function  buildWebPack ( webpackConfigName ,  args ,  env )  { 
174174 // Remember to perform a case insensitive search. 
175175 const  allowedWarnings  =  getAllowedWarningsForWebPack ( webpackConfigName ) . map ( item  =>  item . toLowerCase ( ) ) ; 
176-  const  stdOut  =  await  spawnAsync ( 'npx ' ,  [ '-n ' ,  '--max_old_space_size=9096 ' ,  'webpack ' ,  ...args ,  ...[ '--mode' ,  'production' ] ] ,  env ) ; 
176+  const  stdOut  =  await  spawnAsync ( 'npm ' ,  [ 'run ' ,  'webpack ' ,  '-- ' ,  ...args ,  ...[ '--mode' ,  'production' ] ] ,  env ) ; 
177177 const  stdOutLines  =  stdOut 
178178 . split ( os . EOL ) 
179179 . map ( item  =>  item . trim ( ) ) 
@@ -335,7 +335,7 @@ gulp.task('uploadReleaseExtension', () => uploadExtension(`ms-python-${process.e
335335
336336function  spawnAsync ( command ,  args ,  env )  { 
337337 env  =  env  ||  { } ; 
338-  env  =  { ...process . env ,  ...env } ; 
338+  env  =  {   ...process . env ,  ...env   } ; 
339339 return  new  Promise ( ( resolve ,  reject )  =>  { 
340340 let  stdOut  =  '' ; 
341341 const  proc  =  spawn ( command ,  args ,  {  cwd : __dirname ,  env } ) ; 
0 commit comments