From 4b4cfe4f7412649c8486c8b1e891a198ac7bafea Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 31 Jan 2023 14:33:29 +0100 Subject: [PATCH] fix: reduce mangle to minimum --- insider.json | 2 +- patch.sh | 4 ++++ patches/helper/settings.patch | 23 +++++++++++++++++++++++ patches/remove-mangle.patch | 29 +++++++++++++++-------------- product.json | 14 ++++++-------- 5 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 patches/helper/settings.patch diff --git a/insider.json b/insider.json index f7da1cb..4449bbf 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.75.0", - "commit": "b229eb5fa2ecadb8a5238ccb9f6f49f7ccba9d2b" + "commit": "0615c4f98b07b51d3be6a357e22afec119490c5a" } diff --git a/patch.sh b/patch.sh index 37b37a4..e94b820 100755 --- a/patch.sh +++ b/patch.sh @@ -15,8 +15,12 @@ if [[ -f "${FILE}" ]]; then git apply --reject "${FILE}" fi +git apply --reject "../patches/helper/settings.patch" + read -p "Press any key when the conflict have been resolved..." -n1 -s +git restore .vscode/settings.json + git add . git diff --staged -U1 > "${FILE}" diff --git a/patches/helper/settings.patch b/patches/helper/settings.patch new file mode 100644 index 0000000..6aea6f1 --- /dev/null +++ b/patches/helper/settings.patch @@ -0,0 +1,23 @@ +diff --git a/.vscode/settings.json b/.vscode/settings.json +index 7ae8bce..724b9ad 100644 +--- a/.vscode/settings.json ++++ b/.vscode/settings.json +@@ -9,5 +9,5 @@ + "cli/target": true, +- "build/**/*.js": { +- "when": "$(basename).ts" +- } ++ // "build/**/*.js": { ++ // "when": "$(basename).ts" ++ // } + }, +@@ -81,3 +81,3 @@ + "gulp.autoDetect": "off", +- "files.insertFinalNewline": true, ++ // "files.insertFinalNewline": true, + "[plaintext]": { +@@ -91,3 +91,3 @@ + "editor.defaultFormatter": "vscode.typescript-language-features", +- "editor.formatOnSave": true ++ // "editor.formatOnSave": true + }, diff --git a/patches/remove-mangle.patch b/patches/remove-mangle.patch index 181067a..416c20d 100644 --- a/patches/remove-mangle.patch +++ b/patches/remove-mangle.patch @@ -1,8 +1,12 @@ diff --git a/build/lib/compilation.js b/build/lib/compilation.js -index 8449e98..86a082c 100644 +index 71bc9fb..238a3b9 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js -@@ -104,24 +104,3 @@ function compileTask(src, out, build) { +@@ -20,3 +20,2 @@ const File = require("vinyl"); + const task = require("./task"); +-const mangleTypeScript_1 = require("./mangleTypeScript"); + const watch = require('./watch'); +@@ -103,23 +102,3 @@ function compileTask(src, out, build) { } - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); @@ -10,8 +14,7 @@ index 8449e98..86a082c 100644 - let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(); - mangleStream = es.through(function write(data) { -- const tsNormalPath = ts.normalizePath(data.path); -- const newContents = newContentsByFileName.get(tsNormalPath); +- const newContents = newContentsByFileName.get(data.path); - if (newContents !== undefined) { - data.contents = Buffer.from(newContents.out); - data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); @@ -27,16 +30,16 @@ index 8449e98..86a082c 100644 return srcPipe - .pipe(mangleStream) .pipe(generator.stream) -@@ -283,2 +262,2 @@ exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () = - }); --//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":"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"} -\ No newline at end of file -+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":"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"} diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts -index 8e2f7bf..93b8cc9 100644 +index 8e0f19a..27ea44c 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts -@@ -123,26 +123,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod +@@ -19,4 +19,2 @@ import * as File from 'vinyl'; + import * as task from './task'; +-import { Mangler } from './mangleTypeScript'; +-import { RawSourceMap } from 'source-map'; + const watch = require('./watch'); +@@ -123,24 +121,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); @@ -44,9 +47,7 @@ index 8e2f7bf..93b8cc9 100644 - let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(); - mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) { -- type TypeScriptExt = typeof ts & { normalizePath(path: string): string }; -- const tsNormalPath = (ts).normalizePath(data.path); -- const newContents = newContentsByFileName.get(tsNormalPath); +- const newContents = newContentsByFileName.get(data.path); - if (newContents !== undefined) { - data.contents = Buffer.from(newContents.out); - data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); diff --git a/product.json b/product.json index 9d8f098..f1c6c94 100644 --- a/product.json +++ b/product.json @@ -48,7 +48,8 @@ ], "extensionEnabledApiProposals": { "ms-vscode.vscode-selfhost-test-provider": [ - "testObserver" + "testObserver", + "testContinuousRun" ], "VisualStudioExptTeam.vscodeintellicode-completions": [ "inlineCompletionsAdditions" @@ -76,8 +77,7 @@ ], "ms-python.python": [ "quickPickSortByLabel", - "testObserver", - "telemetryLogger" + "testObserver" ], "ms-dotnettools.dotnet-interactive-vscode": [ "notebookMessaging" @@ -95,7 +95,6 @@ ], "ms-vscode.azure-repos": [ "extensionRuntime", - "telemetryLogger", "fileSearchProvider", "textSearchProvider" ], @@ -115,7 +114,6 @@ "scmActionButton", "scmSelectedProvider", "scmValidation", - "telemetryLogger", "textSearchProvider", "timeline" ], @@ -169,7 +167,8 @@ "treeItemCheckbox", "codiconDecoration", "diffCommand", - "contribCommentEditorActionsMenu" + "contribCommentEditorActionsMenu", + "quickDiffProvider" ], "GitHub.copilot": [ "inlineCompletionsAdditions" @@ -190,8 +189,7 @@ "scmSelectedProvider", "scmValidation", "textSearchProvider", - "timeline", - "telemetryLogger" + "timeline" ], "ms-python.gather": [ "notebookCellExecutionState"