Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

introduce product.overrides.json #179269

Merged
merged 6 commits into from Apr 5, 2023
Merged

introduce product.overrides.json #179269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8fccd8
introduce product.overrides.json
sandy081 Apr 5, 2023
622e9d0
empty overrides
sandy081 Apr 5, 2023
6e99e8a
feedback
sandy081 Apr 5, 2023
4370b66
address feedback
sandy081 Apr 5, 2023
6d83687
remove unnecessary variable
sandy081 Apr 5, 2023
3683c91
do not use path
sandy081 Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -16,3 +16,4 @@ vscode.lsif
vscode.db
/.profile-oss
/cli/target
product.overrides.json
9 changes: 9 additions & 0 deletions src/bootstrap-amd.js
View file
Open in desktop
Expand Up @@ -15,7 +15,16 @@ const nodeRequire = require;
globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => nodeRequire(String(mod)) });

// VSCODE_GLOBALS: package/product.json
/** @type Record<string, any> */
globalThis._VSCODE_PRODUCT_JSON = require('../product.json');
if (process.env['VSCODE_DEV']) {
// Patch product overrides when running out of sources
try {
// @ts-ignore
const overrides = require('../product.overrides.json');
globalThis._VSCODE_PRODUCT_JSON = Object.assign(globalThis._VSCODE_PRODUCT_JSON, overrides);
} catch (error) { /* ignore */ }
}
globalThis._VSCODE_PACKAGE_JSON = require('../package.json');

// @ts-ignore
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap-window.js
View file
Open in desktop
Expand Up @@ -118,6 +118,10 @@
if (!safeProcess.sandboxed) {
// VSCODE_GLOBALS: package/product.json
globalThis._VSCODE_PRODUCT_JSON = (require.__$__nodeRequire ?? require)(configuration.appRoot + '/product.json');
if (process.env['VSCODE_DEV']) {
// Patch product overrides when running out of sources
try { globalThis._VSCODE_PRODUCT_JSON = Object.assign(globalThis._VSCODE_PRODUCT_JSON, (require.__$__nodeRequire ?? require)(configuration.appRoot + '/product.overrides.json')); } catch (error) { /* ignore */ }
}
globalThis._VSCODE_PACKAGE_JSON = (require.__$__nodeRequire ?? require)(configuration.appRoot + '/package.json');
}

Expand Down