فهرست منبع

feat(1.97): update patches

Baptiste Augrain 4 ماه پیش
والد
کامیت
7fab58adba
3فایلهای تغییر یافته به همراه24 افزوده شده و 20 حذف شده
  1. 6 6
      patches/ext-from-gh.patch
  2. 6 7
      patches/linux/fix-build.patch
  3. 12 7
      patches/remove-mangle.patch

+ 6 - 6
patches/ext-from-gh.patch

@@ -1,19 +1,19 @@
 diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
-index 1b0adc4..b595123 100644
+index 400ca68..f37060a 100644
 --- a/build/lib/builtInExtensions.js
 +++ b/build/lib/builtInExtensions.js
-@@ -47,5 +47,3 @@ function isUpToDate(extension) {
+@@ -83,5 +83,3 @@ function isUpToDate(extension) {
  function getExtensionDownloadStream(extension) {
 -    const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
 -    return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
--        .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
-+    return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+-        .pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`));
++	return ext.fromGithub(extension).pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`));
  }
 diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
-index fefed43..4ae553e 100644
+index 9b1ec73..1cb3301 100644
 --- a/build/lib/builtInExtensions.ts
 +++ b/build/lib/builtInExtensions.ts
-@@ -72,5 +72,3 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
+@@ -70,5 +70,3 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
  function getExtensionDownloadStream(extension: IExtensionDefinition) {
 -	const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
 -	return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))

+ 6 - 7
patches/linux/fix-build.patch

@@ -19,21 +19,21 @@ index fb0e5a4..412a6cc 100644
 +	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  	gulp.task(buildRpmTask);
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index 80b11b3..0a0ca71 100644
+index 3864955..97c9464 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
-@@ -24,3 +24,3 @@ const product = require("../../product.json");
+@@ -27,3 +27,3 @@ const product = require("../../product.json");
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
  // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:chrome/installer/linux/BUILD.gn;l=64-80
-@@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
      // Add the tunnel binary.
--    files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
-+    // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
+-    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
++    // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
      // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 3163aee..dca1845 100644
+index 46be92e..9958e25 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
 @@ -25,3 +25,3 @@ import product = require('../../product.json');
@@ -46,4 +46,3 @@ index 3163aee..dca1845 100644
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  	// Add the main executable.
-  

+ 12 - 7
patches/remove-mangle.patch

@@ -1,15 +1,15 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 2270e05..1bd7b90 100644
+index 841dbe1..7cf692a 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
-@@ -104,24 +104,3 @@ function compileTask(src, out, build, options = {}) {
+@@ -148,24 +148,3 @@ function compileTask(src, out, build, options = {}) {
          }
 -        // mangle: TypeScript to TypeScript
--        let mangleStream = es.through();
+-        let mangleStream = event_stream_1.default.through();
 -        if (build && !options.disableMangle) {
--            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
+-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
 -            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
--            mangleStream = es.through(async function write(data) {
+-            mangleStream = event_stream_1.default.through(async function write(data) {
 -                const tsNormalPath = ts.normalizePath(data.path);
 -                const newContents = (await newContentsByFileName).get(tsNormalPath);
 -                if (newContents !== undefined) {
@@ -28,10 +28,15 @@ index 2270e05..1bd7b90 100644
 -            .pipe(mangleStream)
              .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index d5da3f1..fa46962 100644
+index 6e1fcab..4e45106 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
-@@ -123,27 +123,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+@@ -18,4 +18,2 @@ import File from 'vinyl';
+ import * as task from './task';
+-import { Mangler } from './mangle/index';
+-import { RawSourceMap } from 'source-map';
+ import { gulpPostcss } from './postcss';
+@@ -138,27 +136,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
  
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();