make sure to massage sourcemaps-url, make sure to upload sourcemaps from dist/folders

build/gulpfile.vscode.js

@@ -113,9 +113,9 @@ gulp.task('optimize-index-js', ['optimize-vscode'], () => {
 	fs.writeFileSync(fullpath, newContents);
 });
 
-const baseUrl = `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`;
+const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
-gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', baseUrl));
+gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`));
 
 // Package
 
@@ -241,7 +241,7 @@ function packageTask(platform, arch, opts) {
 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name));
 
 		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			return ext.fromLocal(extension.path)
+			return ext.fromLocal(extension.path, sourceMappingURLBase)
 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 		}));
 
@@ -459,9 +459,10 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 			return f;
 		}));
 
-	const extensions = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });
 
-	return es.merge(vs, extensions)
+	return es.merge(vs, extensionsOut, extensionsDist)
 		.pipe(azure.upload({
 			account: process.env.AZURE_STORAGE_ACCOUNT,
 			key: process.env.AZURE_STORAGE_ACCESS_KEY,
@@ -506,7 +507,7 @@ function getSettingsSearchBuildId(packageJson) {
 		const branch = process.env.BUILD_SOURCEBRANCH;
 		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
 			/\/master$/.test(branch) ? 1 :
-			2; // Some unexpected branch
+				2; // Some unexpected branch
 
 		const out = cp.execSync(`git rev-list HEAD --count`);
 		const count = parseInt(out.toString());

build/lib/extensions.js

@@ -16,11 +16,13 @@ var buffer = require('gulp-buffer');
 var json = require('gulp-json-editor');
 var webpack = require('webpack');
 var webpackGulp = require('webpack-stream');
+var sourcemaps = require("gulp-sourcemaps");
 var fs = require("fs");
 var path = require("path");
 var vsce = require("vsce");
 var File = require("vinyl");
-function fromLocal(extensionPath) {
+var util_1 = require("./util");
+function fromLocal(extensionPath, sourceMappingURLBase) {
     var result = es.through();
     vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn }).then(function (fileNames) {
         var files = fileNames
@@ -52,11 +54,19 @@ function fromLocal(extensionPath) {
                 data.stat = data.stat || {};
                 data.base = extensionPath;
                 this.emit('data', data);
+            }))
+                .pipe(sourcemaps.init())
+                .pipe(Boolean(sourceMappingURLBase) ? util_1.stripSourceMappingURL() : es.through())
+                .pipe(sourcemaps.write('.', {
+                sourceMappingURLPrefix: sourceMappingURLBase && sourceMappingURLBase + "/dist",
+                addComment: !!sourceMappingURLBase,
+                includeContent: !!sourceMappingURLBase,
+                sourceRoot: '../src',
             }));
             es.merge(webpackStream, patchFilesStream)
                 // .pipe(es.through(function (data) {
                 // 	// debug
-                // 	console.log('out', data.path, data.base, data.contents.length);
+                // 	console.log('out', data.path, data.contents.length);
                 // 	this.emit('data', data);
                 // }))
                 .pipe(result);

build/lib/extensions.ts

@@ -16,12 +16,14 @@ const buffer = require('gulp-buffer');
 const json = require('gulp-json-editor');
 const webpack = require('webpack');
 const webpackGulp = require('webpack-stream');
+import * as sourcemaps from 'gulp-sourcemaps';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vsce from 'vsce';
 import * as File from 'vinyl';
+import { stripSourceMappingURL } from './util';
 
-export function fromLocal(extensionPath: string): Stream {
+export function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
 	let result = es.through();
 
 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn }).then(fileNames => {
@@ -58,12 +60,20 @@ export function fromLocal(extensionPath: string): Stream {
 					data.stat = data.stat || {};
 					data.base = extensionPath;
 					this.emit('data', data);
+				}))
+				.pipe(sourcemaps.init())
+				.pipe(Boolean(sourceMappingURLBase) ? stripSourceMappingURL() : es.through())
+				.pipe(sourcemaps.write('.', {
+					sourceMappingURLPrefix: sourceMappingURLBase && `${sourceMappingURLBase}/dist`,
+					addComment: !!sourceMappingURLBase,
+					includeContent: !!sourceMappingURLBase,
+					sourceRoot: '../src',
 				}));
 
 			es.merge(webpackStream, patchFilesStream)
 				// .pipe(es.through(function (data) {
 				// 	// debug
-				// 	console.log('out', data.path, data.base, data.contents.length);
+				// 	console.log('out', data.path, data.contents.length);
 				// 	this.emit('data', data);
 				// }))
 				.pipe(result);