Skip to content

1.4.0 #68

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ sh ./scripts/test.sh --website='http://localhost:9090' -uicl
This will run the OSS unit and integration tests, and the Cypress integration tests for a local Code Editor instance at `localhost:9090`.

## Publishing Releases
To publish a new release using the GitHub Action, push a tag that starts with `v`, e.g. `v1.5.0`. This will trigger an Action to create a tarball and publish it in a release with the tag `v1.5.0`. Currently the Action will require manual approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.
To publish a new release using the GitHub Action, open a new branch the open a PR, the PR should be reviewed and manually approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.
Once PR is approved, push a tag that starts with `v`, e.g. `v1.5.0`. This will trigger an Action to create a tarball and publish it in a release with the tag `v1.5.0`. Currently the Action will require. manually approval from @aws-pangestu, @aws-navinns, or @aws-asolidu.

### Future
We hope to extend this Action to also automatically update the CodeEditor feedstock repository.
Expand Down
26 changes: 0 additions & 26 deletions patches/base-path.diff
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,6 @@ Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench-dev.
Object.keys(self.webPackagePaths).map(function (key, index) {
self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
});
Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.html
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.html
+++ sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.html
@@ -36,7 +36,7 @@
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
<script>
- const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+ const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
Object.keys(self.webPackagePaths).map(function (key, index) {
self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
});
Index: sagemaker-code-editor/vscode/src/vs/code/browser/workbench/workbench.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/code/browser/workbench/workbench.ts
Expand Down Expand Up @@ -146,19 +133,6 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
embedderIdentifier: 'server-distro',
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
...this._productService.extensionsGallery,
@@ -340,8 +345,10 @@ export class WebClientServer {
const values: { [key: string]: string } = {
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
- WORKBENCH_WEB_BASE_URL: this._staticRoute,
- WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
+ WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
+ WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
+ BASE: base,
+ VS_BASE: vscodeBase,
};

if (useTestResolver) {
@@ -443,3 +445,70 @@ export class WebClientServer {
return void res.end(data);
}
Expand Down
35 changes: 0 additions & 35 deletions patches/disable-online-services.diff
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/platform/update/common/update.config.contribution.ts
+++ sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.contribution.ts
@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
'update.mode': {
type: 'string',
enum: ['none', 'manual', 'start', 'default'],
- default: 'default',
+ default: 'none',
scope: ConfigurationScope.APPLICATION,
description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
tags: ['usesOnlineServices'],
@@ -50,7 +50,7 @@ configurationRegistry.registerConfigurat
},
'update.showReleaseNotes': {
Expand All @@ -20,29 +11,3 @@ Index: sagemaker-code-editor/vscode/src/vs/platform/update/common/update.config.
scope: ConfigurationScope.APPLICATION,
description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
tags: ['usesOnlineServices']
Index: sagemaker-code-editor/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ sagemaker-code-editor/vscode/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -147,7 +147,7 @@ registry.registerConfiguration({
'workbench.settings.enableNaturalLanguageSearch': {
'type': 'boolean',
'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
- 'default': true,
+ 'default': false,
'scope': ConfigurationScope.WINDOW,
'tags': ['usesOnlineServices']
},
Index: sagemaker-code-editor/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ sagemaker-code-editor/vscode/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -146,7 +146,7 @@ registry.registerConfiguration({
'workbench.enableExperiments': {
'type': 'boolean',
'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),
- 'default': true,
+ 'default': false,
'scope': ConfigurationScope.APPLICATION,
'restricted': true,
'tags': ['usesOnlineServices']
51 changes: 0 additions & 51 deletions patches/disable-telemetry.diff
Original file line number Diff line number Diff line change
@@ -1,54 +1,3 @@
When pulling a new change from upstream, make sure to replace all .data.microsoft.com with 0.0.0.0
Otherwise the OSS will still ping microsoft, even if the telemetry is set to OFF.
See: https://github.com/VSCodium/vscodium/issues/26

Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetryService.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/platform/telemetry/common/telemetryService.ts
+++ sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/telemetryService.ts
@@ -208,7 +208,7 @@ Registry.as<IConfigurationRegistry>(Exte
'properties': {
[TELEMETRY_SETTING_ID]: {
'type': 'string',
- 'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
+ 'enum': [TelemetryConfiguration.OFF],
'enumDescriptions': [
localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
@@ -216,7 +216,7 @@ Registry.as<IConfigurationRegistry>(Exte
localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
],
'markdownDescription': getTelemetryLevelSettingDescription(),
- 'default': TelemetryConfiguration.ON,
+ 'default': TelemetryConfiguration.OFF,
'restricted': true,
'scope': ConfigurationScope.APPLICATION,
'tags': ['usesOnlineServices', 'telemetry']
Index: sagemaker-code-editor/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ sagemaker-code-editor/vscode/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -288,7 +288,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL
'telemetry.enableCrashReporter': {
'type': 'boolean',
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
- 'default': true,
+ 'default': false,
'tags': ['usesOnlineServices', 'telemetry'],
'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
}
Index: sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
+++ sagemaker-code-editor/vscode/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -18,8 +18,8 @@ export interface IAppInsightsCore {
unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
}

-const endpointUrl = 'https://mobile.events.data.microsoft.com/OneCollector/1.0';
-const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
+const endpointUrl = 'https://0.0.0.0/OneCollector/1.0';
+const endpointHealthUrl = 'https://0.0.0.0/ping';

async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
14 changes: 1 addition & 13 deletions patches/local-storage.diff
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,11 @@ To test install the Vim extension and make sure something that uses file storage
works (history recall for example) and change settings from the UI and on disk
while making sure they appear on the other side.

Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/server/node/webClientServer.ts
+++ sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
@@ -332,6 +332,7 @@ export class WebClientServer {
const workbenchWebConfiguration = {
remoteAuthority,
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+ userDataPath: this._environmentService.userDataPath,
_wrapWebWorkerExtHostInIframe,
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
Index: sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
===================================================================
--- sagemaker-code-editor.orig/vscode/src/vs/workbench/browser/web.api.ts
+++ sagemaker-code-editor/vscode/src/vs/workbench/browser/web.api.ts
@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionO
@@ -298,6 +298,11 @@ export interface IWorkbenchConstructionO
*/
readonly configurationDefaults?: Record<string, any>;

Expand Down
Loading
Loading