fix: remove recommendationsUrl

This commit is contained in:
Baptiste Augrain 2022-12-02 20:31:45 +01:00
parent f781310c69
commit ee8c7f094a
4 changed files with 14 additions and 22 deletions

View file

@ -64,7 +64,6 @@ With the following environment variables:
- `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'` - `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
- `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'` - `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'`
- `VSCODE_GALLERY_CONTROL_URL=''` - `VSCODE_GALLERY_CONTROL_URL=''`
- `VSCODE_GALLERY_RECOMMENDATIONS_URL=''`
Or by creating a custom `product.json` at the following location: Or by creating a custom `product.json` at the following location:
- Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium` - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
@ -80,7 +79,6 @@ with the content:
"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
"itemUrl": "https://marketplace.visualstudio.com/items", "itemUrl": "https://marketplace.visualstudio.com/items",
"controlUrl": "", "controlUrl": "",
"recommendationsUrl": ""
} }
} }
``` ```

View file

@ -1,4 +1,4 @@
{ {
"tag": "1.74.0", "tag": "1.74.0",
"commit": "d0e44be43287acadb13f7c2808332e00fe52568d" "commit": "493a541735b84de36b628750ba716a430669cb7f"
} }

View file

@ -1,5 +1,5 @@
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index ef798fa..35b848b 100644 index ef798fa..5a0550b 100644
--- a/src/vs/platform/product/common/product.ts --- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts
@@ -5,3 +5,4 @@ @@ -5,3 +5,4 @@
@ -12,10 +12,10 @@ index ef798fa..35b848b 100644
import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes'; import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
+import { getUserDataPath } from 'vs/platform/environment/node/userDataPath'; +import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
@@ -29,2 +31,41 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) { @@ -29,2 +31,40 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+ // Set user-defined extension gallery + // Set user-defined extension gallery
+ const { serviceUrl, searchUrl, itemUrl, controlUrl, recommendationsUrl } = product.extensionsGallery || {} + const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {}
+ +
+ Object.assign(product, { + Object.assign(product, {
+ extensionsGallery: { + extensionsGallery: {
@ -23,7 +23,6 @@ index ef798fa..35b848b 100644
+ searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl, + searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
+ itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl, + itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
+ controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl, + controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
+ recommendationsUrl: env['VSCODE_GALLERY_RECOMMENDATIONS_URL'] || recommendationsUrl
+ } + }
+ }) + })
+ +

View file

@ -51,6 +51,7 @@
"testObserver" "testObserver"
], ],
"VisualStudioExptTeam.vscodeintellicode-completions": [ "VisualStudioExptTeam.vscodeintellicode-completions": [
"inlineCompletionsNew",
"inlineCompletionsAdditions" "inlineCompletionsAdditions"
], ],
"ms-vsliveshare.vsliveshare": [ "ms-vsliveshare.vsliveshare": [
@ -69,6 +70,7 @@
"portsAttributes", "portsAttributes",
"findTextInFiles", "findTextInFiles",
"workspaceTrust", "workspaceTrust",
"resolvers",
"tunnels" "tunnels"
], ],
"ms-toolsai.vscode-ai-remote": [ "ms-toolsai.vscode-ai-remote": [
@ -76,8 +78,7 @@
], ],
"ms-python.python": [ "ms-python.python": [
"quickPickSortByLabel", "quickPickSortByLabel",
"testObserver", "testObserver"
"telemetryLogger"
], ],
"ms-dotnettools.dotnet-interactive-vscode": [ "ms-dotnettools.dotnet-interactive-vscode": [
"notebookMessaging" "notebookMessaging"
@ -95,7 +96,6 @@
], ],
"ms-vscode.azure-repos": [ "ms-vscode.azure-repos": [
"extensionRuntime", "extensionRuntime",
"telemetryLogger",
"fileSearchProvider", "fileSearchProvider",
"textSearchProvider" "textSearchProvider"
], ],
@ -112,10 +112,8 @@
"fileSearchProvider", "fileSearchProvider",
"quickPickSortByLabel", "quickPickSortByLabel",
"workspaceTrust", "workspaceTrust",
"scmActionButton",
"scmSelectedProvider", "scmSelectedProvider",
"scmValidation", "scmValidation",
"telemetryLogger",
"textSearchProvider", "textSearchProvider",
"timeline" "timeline"
], ],
@ -132,8 +130,7 @@
"telemetry" "telemetry"
], ],
"ms-vscode.remote-server": [ "ms-vscode.remote-server": [
"resolvers", "resolvers"
"tunnels"
], ],
"ms-vscode.remote-explorer": [ "ms-vscode.remote-explorer": [
"contribViewsRemote", "contribViewsRemote",
@ -151,24 +148,25 @@
"portsAttributes", "portsAttributes",
"findTextInFiles", "findTextInFiles",
"workspaceTrust", "workspaceTrust",
"resolvers",
"tunnels" "tunnels"
], ],
"ms-vscode.lsif-browser": [ "ms-vscode.lsif-browser": [
"documentFiltersExclusive" "documentFiltersExclusive"
], ],
"GitHub.vscode-pull-request-github": [ "GitHub.vscode-pull-request-github": [
"contribCommentThreadAdditionalMenu",
"tokenInformation", "tokenInformation",
"commentsResolvedState", "commentsResolvedState",
"contribShareMenu", "contribShareMenu",
"contribCommentPeekContext", "contribCommentPeekContext",
"treeItemCheckbox", "treeItemCheckbox"
"codiconDecoration"
], ],
"GitHub.copilot": [ "GitHub.copilot": [
"inlineCompletionsNew",
"inlineCompletionsAdditions" "inlineCompletionsAdditions"
], ],
"GitHub.copilot-nightly": [ "GitHub.copilot-nightly": [
"inlineCompletionsNew",
"inlineCompletionsAdditions" "inlineCompletionsAdditions"
], ],
"GitHub.remotehub": [ "GitHub.remotehub": [
@ -184,8 +182,7 @@
"scmSelectedProvider", "scmSelectedProvider",
"scmValidation", "scmValidation",
"textSearchProvider", "textSearchProvider",
"timeline", "timeline"
"telemetryLogger"
], ],
"ms-python.gather": [ "ms-python.gather": [
"notebookCellExecutionState" "notebookCellExecutionState"
@ -213,6 +210,7 @@
"notebookCellExecutionState" "notebookCellExecutionState"
], ],
"ms-vscode.azure-sphere-tools-ui": [ "ms-vscode.azure-sphere-tools-ui": [
"resolvers",
"tunnels" "tunnels"
], ],
"ms-azuretools.vscode-azureappservice": [ "ms-azuretools.vscode-azureappservice": [
@ -223,9 +221,6 @@
], ],
"ms-vscode.cpptools": [ "ms-vscode.cpptools": [
"terminalDataWriteEvent" "terminalDataWriteEvent"
],
"redhat.java": [
"documentPaste"
] ]
}, },
"extensionKind": { "extensionKind": {