From ceaf9ce37b4a91cf83103ed7fb3cb3824e5c7202 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sat, 7 Jan 2023 14:07:56 +0100 Subject: [PATCH] fix: don't compile build dir and fix patch --- build.sh | 3 --- patches/fix-mangle-windows.patch | 11 ++++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 1e94da9..19d6b31 100755 --- a/build.sh +++ b/build.sh @@ -18,9 +18,6 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then cd vscode || { echo "'vscode' dir not found"; exit 1; } - # compile the `build` directory - yarn --cwd build compile - yarn monaco-compile-check yarn valid-layers-check diff --git a/patches/fix-mangle-windows.patch b/patches/fix-mangle-windows.patch index 1830539..0d0e902 100644 --- a/patches/fix-mangle-windows.patch +++ b/patches/fix-mangle-windows.patch @@ -1,5 +1,14 @@ +diff --git a/build/lib/compilation.js b/build/lib/compilation.js +index f26b7ac..15d930c 100644 +--- a/build/lib/compilation.js ++++ b/build/lib/compilation.js +@@ -109,3 +109,3 @@ function compileTask(src, out, build) { + mangleStream = es.through(function write(data) { +- const newContents = newContentsByFileName.get(data.path); ++ const newContents = newContentsByFileName.get(data.path.replace(/\\/g, '/')); + if (newContents !== undefined) { diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts -index 2cc04d2c977..9029c6231ed 100644 +index 2cc04d2..9029c62 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -128,3 +128,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod