Skip to content

Commit a3bf0ed

Browse files
author
Feiyang Liu
committed
update patches to fix build error
1 parent db61954 commit a3bf0ed

File tree

10 files changed

+40
-24
lines changed

10 files changed

+40
-24
lines changed

package-lock-overrides/sagemaker.series/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock-overrides/web-embedded-with-terminal.series/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock-overrides/web-embedded.series/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock-overrides/web-server.series/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Index: third-party-src/extensions/shared.webpack.config.mjs
2+
===================================================================
3+
--- third-party-src.orig/extensions/shared.webpack.config.mjs
4+
+++ third-party-src/extensions/shared.webpack.config.mjs
5+
@@ -17,6 +17,7 @@ const require = createRequire(import.met
6+
const tsLoaderOptions = {
7+
compilerOptions: {
8+
'sourceMap': true,
9+
+ 'rootDir': '.',
10+
},
11+
onlyCompileBundledFiles: true,
12+
};

patches/sagemaker.series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common/proposed-api.diff
1717
common/build.diff
1818
common/integration.diff
1919
common/replace-gulp-untar.diff
20+
common/fix-ts-rootdir-webpack.diff
2021
web-server/suppress-known-errors-build-integration.diff
2122
web-server/local-storage.diff
2223
web-server/base-path.diff

patches/web-embedded-with-terminal.series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common/proposed-api.diff
1717
common/build.diff
1818
common/integration.diff
1919
common/replace-gulp-untar.diff
20+
common/fix-ts-rootdir-webpack.diff
2021
web-embedded/readd-workbench.diff
2122
web-embedded/suppress-known-errors-build-integration.diff
2223
web-embedded/disable-built-in-walkthroughs-from-c.diff

patches/web-embedded.series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common/proposed-api.diff
1717
common/build.diff
1818
common/integration.diff
1919
common/replace-gulp-untar.diff
20+
common/fix-ts-rootdir-webpack.diff
2021
web-embedded/readd-workbench.diff
2122
web-embedded/suppress-known-errors-build-integration.diff
2223
web-embedded/disable-built-in-walkthroughs-from-c.diff

patches/web-embedded/revise-help-about-modal-content-and-buttons.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Index: third-party-src/src/vs/workbench/browser/parts/dialogs/dialog.web.contrib
1515
} else {
1616
const aboutDialogDetails = createBrowserAboutDialogDetails(this.productService);
1717
- await this.impl.value.about(aboutDialogDetails.title, aboutDialogDetails.details, aboutDialogDetails.detailsToCopy);
18-
+ await this.impl.value.about(aboutDialogDetails.title, aboutDialogDetails.details);
18+
+ await this.impl.value.about(aboutDialogDetails.title, aboutDialogDetails.details, aboutDialogDetails.details);
1919
}
2020
} catch (error) {
2121
result = error;
@@ -28,7 +28,7 @@ Index: third-party-src/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
2828
}
2929

3030
- async about(title: string, details: string, detailsToCopy: string): Promise<void> {
31-
+ async about(title: string, details: string): Promise<void> {
31+
+ async about(title: string, details: string, _detailsToCopy: string): Promise<void> {
3232

3333
- const { button } = await this.doShow(
3434
+ await this.doShow(
@@ -61,7 +61,7 @@ Index: third-party-src/src/vs/platform/dialogs/browser/dialog.ts
6161
import { localize } from '../../../nls.js';
6262
import { IKeybindingService } from '../../keybinding/common/keybinding.js';
6363
import { ResultKind } from '../../keybinding/common/keybindingResolver.js';
64-
@@ -43,24 +42,13 @@ export function createWorkbenchDialogOpt
64+
@@ -43,24 +42,14 @@ export function createWorkbenchDialogOpt
6565
};
6666
}
6767

@@ -90,4 +90,4 @@ Index: third-party-src/src/vs/platform/dialogs/browser/dialog.ts
9090
+ details: details
9191
};
9292
}
93-
-
93+

patches/web-server.series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ common/proposed-api.diff
1717
common/build.diff
1818
common/integration.diff
1919
common/replace-gulp-untar.diff
20+
common/fix-ts-rootdir-webpack.diff
2021
web-server/suppress-known-errors-build-integration.diff
2122
web-server/local-storage.diff
2223
web-server/base-path.diff

0 commit comments

Comments
 (0)