55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
|
|
index bceda01..174c766 100644
|
|
--- a/src/vs/platform/product/common/product.ts
|
|
+++ b/src/vs/platform/product/common/product.ts
|
|
@@ -6,3 +6,3 @@
|
|
import { FileAccess } from 'vs/base/common/network';
|
|
-import { globals } from 'vs/base/common/platform';
|
|
+import { globals, isWindows } from 'vs/base/common/platform';
|
|
import { env } from 'vs/base/common/process';
|
|
@@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources';
|
|
import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
|
|
+import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
|
|
|
|
@@ -35,2 +36,41 @@ else if (typeof require?.__$__nodeRequire === 'function') {
|
|
|
|
+ // Set user-defined extension gallery
|
|
+ const { serviceUrl, searchUrl, itemUrl, controlUrl, recommendationsUrl } = product.extensionsGallery || {}
|
|
+
|
|
+ Object.assign(product, {
|
|
+ extensionsGallery: {
|
|
+ serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
|
|
+ searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
|
|
+ itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
|
|
+ controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
|
|
+ recommendationsUrl: env['VSCODE_GALLERY_RECOMMENDATIONS_URL'] || recommendationsUrl
|
|
+ }
|
|
+ })
|
|
+
|
|
+ // Merge user-customized product.json
|
|
+ try {
|
|
+ const merge = (...objects: any[]) =>
|
|
+ objects.reduce((result, current) => {
|
|
+ Object.keys(current).forEach((key) => {
|
|
+ if (Array.isArray(result[key]) && Array.isArray(current[key])) {
|
|
+ result[key] = current[key];
|
|
+ } else if (typeof result[key] === 'object' && typeof current[key] === 'object') {
|
|
+ result[key] = merge(result[key], current[key]);
|
|
+ } else {
|
|
+ result[key] = current[key];
|
|
+ }
|
|
+ });
|
|
+
|
|
+ return result;
|
|
+ }, {}) as any;
|
|
+
|
|
+ const userDataPath = getUserDataPath({} as any, product.nameShort);
|
|
+ const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`;
|
|
+
|
|
+ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath, require).fsPath);
|
|
+
|
|
+ product = merge(product, userProduct);
|
|
+ } catch (ex) {
|
|
+ }
|
|
+
|
|
// Running out of sources
|