timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 03:50:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(1.65): update patches (#1001)

Browse Source
This commit is contained in:
Baptiste Augrain
2022-03-04 09:47:45 +01:00
committed by GitHub
parent 1cbc6e55bf
commit 5bd755a9cc
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/custom-gallery.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 657b9c9..9b9b12e 100644
index 1edc76f..4c0bf98 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -70,6 +70,7 @@ export interface IProductConfiguration {
@@ -69,6 +69,7 @@ export interface IProductConfiguration {
readonly extensionsGallery?: {
readonly serviceUrl: string;
@@ -11,7 +11,7 @@ index 657b9c9..9b9b12e 100644
readonly resourceUrlTemplate: string;
readonly controlUrl: string;
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 5e38d35..12bb161 100644
index e22b33e..98cec93 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -4,11 +4,12 @@
@@ -30,7 +30,7 @@ index 5e38d35..12bb161 100644
* @deprecated You MUST use `IProductService` if possible.
@@ -34,6 +35,32 @@ else if (typeof require?.__$__nodeRequire === 'function') {
product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string; };
const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
+ // Merge user-customized product.json
+ try {
@@ -61,7 +61,7 @@ index 5e38d35..12bb161 100644
// Running out of sources
if (env['VSCODE_DEV']) {
Object.assign(product, {
@@ -43,6 +70,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
@@ -44,6 +71,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
});
}