mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-19 13:46:03 +10:00
fix: update patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"tag": "1.77.0",
|
"tag": "1.77.0",
|
||||||
"commit": "155cd6db223feb1f8c734ca70e108b9efec7b054"
|
"commit": "2a6bd78f745d3e6330c8ff7db5282dc582e117fd"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||||
index 2c18fde..e1031dd 100644
|
index 3ef5ca1..a634a9f 100644
|
||||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||||
@@ -312,2 +312,8 @@ configurationRegistry.registerConfiguration({
|
@@ -301,2 +301,8 @@ configurationRegistry.registerConfiguration({
|
||||||
},
|
},
|
||||||
+ 'workbench.welcomePage.extraAnnouncements': {
|
+ 'workbench.welcomePage.extraAnnouncements': {
|
||||||
+ scope: ConfigurationScope.MACHINE,
|
+ scope: ConfigurationScope.MACHINE,
|
||||||
@@ -12,10 +12,10 @@ index 2c18fde..e1031dd 100644
|
|||||||
+ },
|
+ },
|
||||||
'workbench.startupEditor': {
|
'workbench.startupEditor': {
|
||||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||||
index 9564618..eb8adfe 100644
|
index 46949b2..174e65f 100644
|
||||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
|
||||||
@@ -116,4 +116,8 @@ type GettingStartedActionEvent = {
|
@@ -118,4 +118,8 @@ type GettingStartedActionEvent = {
|
||||||
type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
|
type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
|
||||||
+type AnnouncementEntry = { id: string, title: string, url: string };
|
+type AnnouncementEntry = { id: string, title: string, url: string };
|
||||||
|
|
||||||
@@ -24,30 +24,26 @@ index 9564618..eb8adfe 100644
|
|||||||
+const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
|
+const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
|
||||||
+
|
+
|
||||||
export class GettingStartedPage extends EditorPane {
|
export class GettingStartedPage extends EditorPane {
|
||||||
@@ -148,2 +152,4 @@ export class GettingStartedPage extends EditorPane {
|
@@ -152,2 +156,4 @@ export class GettingStartedPage extends EditorPane {
|
||||||
private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
|
private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
|
||||||
+ private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
|
+ private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
|
||||||
+ private announcementData?: AnnouncementEntry[];
|
+ private announcementData?: AnnouncementEntry[];
|
||||||
|
private featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
|
||||||
@@ -760,3 +766,2 @@ export class GettingStartedPage extends EditorPane {
|
@@ -804,2 +810,3 @@ export class GettingStartedPage extends EditorPane {
|
||||||
|
|
||||||
-
|
|
||||||
const leftColumn = $('.categories-column.categories-column-left', {},);
|
|
||||||
@@ -767,2 +772,3 @@ export class GettingStartedPage extends EditorPane {
|
|
||||||
const gettingStartedList = this.buildGettingStartedWalkthroughsList();
|
const gettingStartedList = this.buildGettingStartedWalkthroughsList();
|
||||||
+ const announcementList = await this.buildAnnouncementList();
|
+ const announcementList = await this.buildAnnouncementList();
|
||||||
|
|
||||||
@@ -777,3 +783,3 @@ export class GettingStartedPage extends EditorPane {
|
@@ -815,3 +822,3 @@ export class GettingStartedPage extends EditorPane {
|
||||||
this.container.classList.remove('noWalkthroughs');
|
this.container.classList.remove('noWalkthroughs');
|
||||||
- reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
|
- reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
|
||||||
+ reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement());
|
+ reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement());
|
||||||
reset(rightColumn, gettingStartedList.getDomElement());
|
reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
|
||||||
@@ -783,3 +789,3 @@ export class GettingStartedPage extends EditorPane {
|
@@ -820,3 +827,3 @@ export class GettingStartedPage extends EditorPane {
|
||||||
this.container.classList.add('noWalkthroughs');
|
this.container.classList.add('noWalkthroughs');
|
||||||
- reset(leftColumn, startList.getDomElement());
|
- reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
|
||||||
+ reset(leftColumn, startList.getDomElement(), announcementList.getDomElement());
|
+ reset(leftColumn, startList.getDomElement(), announcementList.getDomElement());
|
||||||
reset(rightColumn, recentList.getDomElement());
|
reset(rightColumn, featuredExtensionList.getDomElement());
|
||||||
@@ -930,2 +936,51 @@ export class GettingStartedPage extends EditorPane {
|
@@ -982,2 +989,51 @@ export class GettingStartedPage extends EditorPane {
|
||||||
|
|
||||||
+ private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
|
+ private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
|
||||||
+ const renderAnnouncement = (announcement: AnnouncementEntry) => {
|
+ const renderAnnouncement = (announcement: AnnouncementEntry) => {
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
diff --git a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
diff --git a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
||||||
index 63e7f2d..e9a6b7d 100644
|
index 932a92c..afa3272 100644
|
||||||
--- a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
--- a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
||||||
+++ b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
+++ b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
|
||||||
@@ -13,2 +13,4 @@ import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remot
|
@@ -14,2 +14,4 @@ import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/wor
|
||||||
import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
|
import { RemoteStartEntry } from 'vs/workbench/contrib/remote/browser/remoteStartEntry';
|
||||||
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
|
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||||
+import { localize } from 'vs/nls';
|
+import { localize } from 'vs/nls';
|
||||||
|
|
||||||
@@ -23 +25,13 @@ workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwar
|
@@ -25 +27,13 @@ workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, Life
|
||||||
workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, LifecyclePhase.Eventually);
|
workbenchContributionsRegistry.registerWorkbenchContribution(RemoteStartEntry, LifecyclePhase.Starting);
|
||||||
+
|
+
|
||||||
+CommandsRegistry.registerCommand({
|
+CommandsRegistry.registerCommand({
|
||||||
+ id: 'remote.serverDownloadUrlTemplate',
|
+ id: 'remote.serverDownloadUrlTemplate',
|
||||||
@@ -21,3 +21,4 @@ index 63e7f2d..e9a6b7d 100644
|
|||||||
+ return 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz';
|
+ return 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz';
|
||||||
+ }
|
+ }
|
||||||
+});
|
+});
|
||||||
|
\ No newline at end of file
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
|
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
|
||||||
index cfd735b..d5179ac 100644
|
index 63ddeb2..31d2f35 100644
|
||||||
--- a/build/lib/compilation.js
|
--- a/build/lib/compilation.js
|
||||||
+++ b/build/lib/compilation.js
|
+++ b/build/lib/compilation.js
|
||||||
@@ -21,3 +21,2 @@ const File = require("vinyl");
|
@@ -21,3 +21,2 @@ const File = require("vinyl");
|
||||||
const task = require("./task");
|
const task = require("./task");
|
||||||
-const mangleTypeScript_1 = require("./mangleTypeScript");
|
-const mangleTypeScript_1 = require("./mangleTypeScript");
|
||||||
const watch = require('./watch');
|
const watch = require('./watch');
|
||||||
@@ -104,24 +103,3 @@ function compileTask(src, out, build) {
|
@@ -104,24 +103,3 @@ function compileTask(src, out, build, options = {}) {
|
||||||
}
|
}
|
||||||
- // mangle: TypeScript to TypeScript
|
- // mangle: TypeScript to TypeScript
|
||||||
- let mangleStream = es.through();
|
- let mangleStream = es.through();
|
||||||
- if (build) {
|
- if (build && !options.disableMangle) {
|
||||||
- let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
|
- let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
|
||||||
- const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
|
- const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
|
||||||
- mangleStream = es.through(function write(data) {
|
- mangleStream = es.through(function write(data) {
|
||||||
@@ -32,7 +32,7 @@ index cfd735b..d5179ac 100644
|
|||||||
- .pipe(mangleStream)
|
- .pipe(mangleStream)
|
||||||
.pipe(generator.stream)
|
.pipe(generator.stream)
|
||||||
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
|
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
|
||||||
index 4f890b8..27ea44c 100644
|
index d5cd196..afe16d3 100644
|
||||||
--- a/build/lib/compilation.ts
|
--- a/build/lib/compilation.ts
|
||||||
+++ b/build/lib/compilation.ts
|
+++ b/build/lib/compilation.ts
|
||||||
@@ -19,4 +19,2 @@ import * as File from 'vinyl';
|
@@ -19,4 +19,2 @@ import * as File from 'vinyl';
|
||||||
@@ -40,11 +40,11 @@ index 4f890b8..27ea44c 100644
|
|||||||
-import { Mangler } from './mangleTypeScript';
|
-import { Mangler } from './mangleTypeScript';
|
||||||
-import { RawSourceMap } from 'source-map';
|
-import { RawSourceMap } from 'source-map';
|
||||||
const watch = require('./watch');
|
const watch = require('./watch');
|
||||||
@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
|
@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
|
||||||
|
|
||||||
- // mangle: TypeScript to TypeScript
|
- // mangle: TypeScript to TypeScript
|
||||||
- let mangleStream = es.through();
|
- let mangleStream = es.through();
|
||||||
- if (build) {
|
- if (build && !options.disableMangle) {
|
||||||
- let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
|
- let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
|
||||||
- const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
|
- const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
|
||||||
- mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
|
- mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
|
||||||
|
|||||||
21
product.json
21
product.json
@@ -56,6 +56,7 @@
|
|||||||
],
|
],
|
||||||
"ms-vsliveshare.vsliveshare": [
|
"ms-vsliveshare.vsliveshare": [
|
||||||
"contribMenuBarHome",
|
"contribMenuBarHome",
|
||||||
|
"contribShareMenu",
|
||||||
"diffCommand",
|
"diffCommand",
|
||||||
"documentFiltersExclusive",
|
"documentFiltersExclusive",
|
||||||
"fileSearchProvider",
|
"fileSearchProvider",
|
||||||
@@ -76,6 +77,7 @@
|
|||||||
"resolvers"
|
"resolvers"
|
||||||
],
|
],
|
||||||
"ms-python.python": [
|
"ms-python.python": [
|
||||||
|
"contribEditorContentMenu",
|
||||||
"quickPickSortByLabel",
|
"quickPickSortByLabel",
|
||||||
"testObserver",
|
"testObserver",
|
||||||
"envShellEvent"
|
"envShellEvent"
|
||||||
@@ -100,6 +102,8 @@
|
|||||||
"textSearchProvider"
|
"textSearchProvider"
|
||||||
],
|
],
|
||||||
"ms-vscode.remote-repositories": [
|
"ms-vscode.remote-repositories": [
|
||||||
|
"contribEditorLineNumberMenu",
|
||||||
|
"contribEditorGutterMenu",
|
||||||
"contribEditSessions",
|
"contribEditSessions",
|
||||||
"contribRemoteHelp",
|
"contribRemoteHelp",
|
||||||
"contribMenuBarHome",
|
"contribMenuBarHome",
|
||||||
@@ -133,7 +137,8 @@
|
|||||||
"telemetry"
|
"telemetry"
|
||||||
],
|
],
|
||||||
"ms-vscode.remote-server": [
|
"ms-vscode.remote-server": [
|
||||||
"resolvers"
|
"resolvers",
|
||||||
|
"tunnels"
|
||||||
],
|
],
|
||||||
"ms-vscode.remote-explorer": [
|
"ms-vscode.remote-explorer": [
|
||||||
"contribRemoteHelp",
|
"contribRemoteHelp",
|
||||||
@@ -159,6 +164,8 @@
|
|||||||
"documentFiltersExclusive"
|
"documentFiltersExclusive"
|
||||||
],
|
],
|
||||||
"GitHub.vscode-pull-request-github": [
|
"GitHub.vscode-pull-request-github": [
|
||||||
|
"contribEditorLineNumberMenu",
|
||||||
|
"contribEditorGutterMenu",
|
||||||
"contribCommentThreadAdditionalMenu",
|
"contribCommentThreadAdditionalMenu",
|
||||||
"tokenInformation",
|
"tokenInformation",
|
||||||
"contribShareMenu",
|
"contribShareMenu",
|
||||||
@@ -170,10 +177,12 @@
|
|||||||
"quickDiffProvider"
|
"quickDiffProvider"
|
||||||
],
|
],
|
||||||
"GitHub.copilot": [
|
"GitHub.copilot": [
|
||||||
"inlineCompletionsAdditions"
|
"inlineCompletionsAdditions",
|
||||||
|
"interactive"
|
||||||
],
|
],
|
||||||
"GitHub.copilot-nightly": [
|
"GitHub.copilot-nightly": [
|
||||||
"inlineCompletionsAdditions"
|
"inlineCompletionsAdditions",
|
||||||
|
"interactive"
|
||||||
],
|
],
|
||||||
"GitHub.remotehub": [
|
"GitHub.remotehub": [
|
||||||
"contribRemoteHelp",
|
"contribRemoteHelp",
|
||||||
@@ -210,7 +219,8 @@
|
|||||||
"notebookKernelSource",
|
"notebookKernelSource",
|
||||||
"interactiveWindow",
|
"interactiveWindow",
|
||||||
"notebookControllerAffinityHidden",
|
"notebookControllerAffinityHidden",
|
||||||
"contribNotebookStaticPreloads"
|
"contribNotebookStaticPreloads",
|
||||||
|
"quickPickItemTooltip"
|
||||||
],
|
],
|
||||||
"dbaeumer.vscode-eslint": [
|
"dbaeumer.vscode-eslint": [
|
||||||
"notebookCellExecutionState"
|
"notebookCellExecutionState"
|
||||||
@@ -230,6 +240,9 @@
|
|||||||
"redhat.java": [
|
"redhat.java": [
|
||||||
"documentPaste"
|
"documentPaste"
|
||||||
],
|
],
|
||||||
|
"ms-dotnettools.visual-studio-green": [
|
||||||
|
"inlineCompletionsAdditions"
|
||||||
|
],
|
||||||
"jeanp413.open-remote-ssh": [
|
"jeanp413.open-remote-ssh": [
|
||||||
"resolvers",
|
"resolvers",
|
||||||
"tunnels",
|
"tunnels",
|
||||||
|
|||||||
Reference in New Issue
Block a user