Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-23 17:38:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #382 from voideditor/revert-374-main

Browse source 
Revert "Merge changes from vscode disabling mangling"
This commit is contained in:
Andrew Pareles 2025-04-09 07:08:46 -07:00 committed by GitHub
commit 908de32b8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/gulpfile.compile.js
View file

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

4
build/gulpfile.reh.js
View file

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

18
build/gulpfile.vscode.js
View file

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

4
build/gulpfile.vscode.web.js
View file

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

2
package.json
View file

@ -57,7 +57,7 @@
"eslint": "node build/eslint", "eslint": "node build/eslint",
"stylelint": "node build/stylelint", "stylelint": "node build/stylelint",
"playwright-install": "npm exec playwright install", "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", "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": "node ./node_modules/gulp/bin/gulp.js minify-vscode",
"minify-vscode-reh": "node ./node_modules/gulp/bin/gulp.js minify-vscode-reh", "minify-vscode-reh": "node ./node_modules/gulp/bin/gulp.js minify-vscode-reh",