Revert "ensure uploading source maps happens *after* they have been created"

jrieken · jrieken · commit 4962417ffc23 · 2018-08-14T14:23:35.000+02:00
This reverts commit c93fe0d.
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
@@ -451,7 +451,7 @@ gulp.task('vscode-translations-import', function () {
 
 // Sourcemaps
 
-gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min'/*here to ensure webpack has happened*/, 'minify-vscode'], () => {
+gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' })
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
@@ -36,7 +36,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {
         // and merge its output with the files stream. also rewrite the package.json
         // file to a new entry point
         if (fs.existsSync(path.join(extensionPath, 'extension.webpack.config.js'))) {
-            console.log("Using Webpack for \"" + extensionPath + "\"");
             var packageJsonFilter = filter('package.json', { restore: true });
             var patchFilesStream = filesStream
                 .pipe(packageJsonFilter)
@@ -68,7 +67,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {
                             fs.mkdirSync(path.dirname(data.path));
                         }
                         fs.writeFileSync(data.path, data.contents);
-                        console.log("Webpack source maps saved as \"" + data.path + "\"");
                     }
                 }
                 this.emit('data', data);
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
@@ -40,8 +40,6 @@ export function fromLocal(extensionPath: string, sourceMappingURLBase?: string):
 		// and merge its output with the files stream. also rewrite the package.json
 		// file to a new entry point
 		if (fs.existsSync(path.join(extensionPath, 'extension.webpack.config.js'))) {
-			console.log(`Using Webpack for "${extensionPath}"`);
-
 			const packageJsonFilter = filter('package.json', { restore: true });
 
 			const patchFilesStream = filesStream
@@ -76,7 +74,6 @@ export function fromLocal(extensionPath: string, sourceMappingURLBase?: string):
 								fs.mkdirSync(path.dirname(data.path));
 							}
 							fs.writeFileSync(data.path, data.contents);
-							console.log(`Webpack source maps saved as "${data.path}"`);
 						}
 					}
 					this.emit('data', data);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {`
`36`	`36`	`// and merge its output with the files stream. also rewrite the package.json`
`37`	`37`	`// file to a new entry point`
`38`	`38`	`if (fs.existsSync(path.join(extensionPath, 'extension.webpack.config.js'))) {`
`39`		`- console.log("Using Webpack for \"" + extensionPath + "\"");`
`40`	`39`	`var packageJsonFilter = filter('package.json', { restore: true });`
`41`	`40`	`var patchFilesStream = filesStream`
`42`	`41`	`.pipe(packageJsonFilter)`
`@@ -68,7 +67,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {`
`68`	`67`	`fs.mkdirSync(path.dirname(data.path));`
`69`	`68`	`}`
`70`	`69`	`fs.writeFileSync(data.path, data.contents);`
`71`		`- console.log("Webpack source maps saved as \"" + data.path + "\"");`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`	`this.emit('data', data);`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ export function fromLocal(extensionPath: string, sourceMappingURLBase?: string):`
`40`	`40`	`// and merge its output with the files stream. also rewrite the package.json`
`41`	`41`	`// file to a new entry point`
`42`	`42`	`if (fs.existsSync(path.join(extensionPath, 'extension.webpack.config.js'))) {`
`43`		- console.log(`Using Webpack for "${extensionPath}"`);
`44`		`-`
`45`	`43`	`const packageJsonFilter = filter('package.json', { restore: true });`
`46`	`44`
`47`	`45`	`const patchFilesStream = filesStream`
`@@ -76,7 +74,6 @@ export function fromLocal(extensionPath: string, sourceMappingURLBase?: string):`
`76`	`74`	`fs.mkdirSync(path.dirname(data.path));`
`77`	`75`	`}`
`78`	`76`	`fs.writeFileSync(data.path, data.contents);`
`79`		- console.log(`Webpack source maps saved as "${data.path}"`);
`80`	`77`	`}`
`81`	`78`	`}`
`82`	`79`	`this.emit('data', data);`