Revert "Merge changes from vscode disabling mangling"

build/gulpfile.compile.js

@@ -24,12 +24,12 @@ function makeCompileBuildTask(disableMangle) {
 	);
 }
 
-// Local/PR compile, including nls and inline sources in sourcemaps, minification, no mangling
-const compileBuildWithoutManglingTask = task.define('compile-build-without-mangling', makeCompileBuildTask(true));
-gulp.task(compileBuildWithoutManglingTask);
-exports.compileBuildWithoutManglingTask = compileBuildWithoutManglingTask;
+// Full compile, including nls and inline sources in sourcemaps, mangling, minification, for build
+const compileBuildTask = task.define('compile-build', makeCompileBuildTask(false));
+gulp.task(compileBuildTask);
+exports.compileBuildTask = compileBuildTask;
 
-// CI compile, including nls and inline sources in sourcemaps, mangling, minification, for build
-const compileBuildWithManglingTask = task.define('compile-build-with-mangling', makeCompileBuildTask(false));
-gulp.task(compileBuildWithManglingTask);
-exports.compileBuildWithManglingTask = compileBuildWithManglingTask;
+// Full compile for PR ci, e.g no mangling
+const compileBuildTaskPullRequest = task.define('compile-build-pr', makeCompileBuildTask(true));
+gulp.task(compileBuildTaskPullRequest);
+exports.compileBuildTaskPullRequest = compileBuildTaskPullRequest;

build/gulpfile.reh.js

@@ -26,7 +26,7 @@ const gunzip = require('gulp-gunzip');
 const File = require('vinyl');
 const fs = require('fs');
 const glob = require('glob');
-const { compileBuildWithManglingTask } = require('./gulpfile.compile');
+const { compileBuildTask } = require('./gulpfile.compile');
 const { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
 const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 const cp = require('child_process');
@@ -491,7 +491,7 @@ function tweakProductForServerWeb(product) {
 			gulp.task(serverTaskCI);
 
 			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-				compileBuildWithManglingTask,
+				compileBuildTask,
 				cleanExtensionsBuildTask,
 				compileNonNativeExtensionsBuildTask,
 				compileExtensionMediaBuildTask,

build/gulpfile.vscode.js

@@ -30,7 +30,7 @@ const { getProductionDependencies } = require('./lib/dependencies');
 const { config } = require('./lib/electron');
 const createAsar = require('./lib/asar').createAsar;
 const minimist = require('minimist');
-const { compileBuildWithoutManglingTask, compileBuildWithManglingTask } = require('./gulpfile.compile');
+const { compileBuildTask } = require('./gulpfile.compile');
 const { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } = require('./gulpfile.extensions');
 const { promisify } = require('util');
 const glob = promisify(require('glob'));
@@ -166,25 +166,25 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
 ));
 gulp.task(minifyVSCodeTask);
 
-const coreCI = task.define('core-ci', task.series(
-	gulp.task('compile-build-with-mangling'),
+const core = task.define('core-ci', task.series(
+	gulp.task('compile-build'),
 	task.parallel(
 		gulp.task('minify-vscode'),
 		gulp.task('minify-vscode-reh'),
 		gulp.task('minify-vscode-reh-web'),
 	)
 ));
-gulp.task(coreCI);
+gulp.task(core);
 
-const coreCIPR = task.define('core-ci-pr', task.series(
-	gulp.task('compile-build-without-mangling'),
+const corePr = task.define('core-ci-pr', task.series(
+	gulp.task('compile-build-pr'),
 	task.parallel(
 		gulp.task('minify-vscode'),
 		gulp.task('minify-vscode-reh'),
 		gulp.task('minify-vscode-reh-web'),
 	)
 ));
-gulp.task(coreCIPR);
+gulp.task(corePr);
 
 /**
  * Compute checksums for some files.
@@ -502,7 +502,7 @@ BUILD_TARGETS.forEach(buildTarget => {
 		gulp.task(vscodeTaskCI);
 
 		const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-			minified ? compileBuildWithManglingTask : compileBuildWithoutManglingTask,
+			compileBuildTask,
 			cleanExtensionsBuildTask,
 			compileNonNativeExtensionsBuildTask,
 			compileExtensionMediaBuildTask,
@@ -540,7 +540,7 @@ const innoSetupConfig = {
 gulp.task(task.define(
 	'vscode-translations-export',
 	task.series(
-		coreCI,
+		core,
 		compileAllExtensionsBuildTask,
 		function () {
 			const pathToMetadata = './out-build/nls.metadata.json';

build/gulpfile.vscode.web.js

@@ -19,7 +19,7 @@ const filter = require('gulp-filter');
 const { getProductionDependencies } = require('./lib/dependencies');
 const vfs = require('vinyl-fs');
 const packageJson = require('../package.json');
-const { compileBuildWithManglingTask } = require('./gulpfile.compile');
+const { compileBuildTask } = require('./gulpfile.compile');
 const extensions = require('./lib/extensions');
 const VinylFile = require('vinyl');
 
@@ -223,7 +223,7 @@ const dashed = (/** @type {string} */ str) => (str ? `-${str}` : ``);
 	gulp.task(vscodeWebTaskCI);
 
 	const vscodeWebTask = task.define(`vscode-web${dashed(minified)}`, task.series(
-		compileBuildWithManglingTask,
+		compileBuildTask,
 		vscodeWebTaskCI
 	));
 	gulp.task(vscodeWebTask);

package.json

@@ -57,7 +57,7 @@
     "eslint": "node build/eslint",
     "stylelint": "node build/stylelint",
     "playwright-install": "npm exec playwright install",
-    "compile-build": "node ./node_modules/gulp/bin/gulp.js compile-build-with-mangling",
+    "compile-build": "node ./node_modules/gulp/bin/gulp.js compile-build",
     "compile-extensions-build": "node ./node_modules/gulp/bin/gulp.js compile-extensions-build",
     "minify-vscode": "node ./node_modules/gulp/bin/gulp.js minify-vscode",
     "minify-vscode-reh": "node ./node_modules/gulp/bin/gulp.js minify-vscode-reh",