Merge branch 'master' into insider

This commit is contained in:
Baptiste Augrain 2023-01-08 10:39:27 +01:00
commit 8474e2eec6
3 changed files with 25 additions and 5 deletions

View file

@ -77,13 +77,15 @@ Or by creating a custom `product.json` at the following location (replace `VSCod
with the content:
- Note: set `cacheUrl` to empty string for every other extension gallery
```jsonc
{
"extensionsGallery": {
"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
"itemUrl": "https://marketplace.visualstudio.com/items",
"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", // set to empty string for every other extension gallery
"controlUrl": "",
"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
"controlUrl": ""
}
}
```

View file

@ -13,9 +13,9 @@
[![codium](https://snapcraft.io//codium/badge.svg)](https://snapcraft.io/codium)
[![codium](https://snapcraft.io//codium/trending.svg?name=0)](https://snapcraft.io/codium)
[![build status (linux)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/linux_build/master?label=build%28linux%29)](https://github.com/VSCodium/vscodium/actions/workflows/linux.yml?query=branch%3Amaster)
[![build status (macos)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/macos_build/master?label=build%28macos%29)](https://github.com/VSCodium/vscodium/actions/workflows/macos.yml?query=branch%3Amaster)
[![build status (windows)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/windows_build/master?label=build%28windows%29)](https://github.com/VSCodium/vscodium/actions/workflows/windows.yml?query=branch%3Amaster)
[![build status (linux)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-linux.yml?branch=master&label=build%28linux%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-linux.yml?query=branch%3Amaster)
[![build status (macos)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-macos.yml?branch=master&label=build%28macOS%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-macos.yml?query=branch%3Amaster)
[![build status (windows)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-windows.yml?branch=master&label=build%28windows%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-windows.yml?query=branch%3Amaster)
</div>

View file

@ -0,0 +1,18 @@
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 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
mangleStream = es.through(function write(data: File) {
- const newContents = newContentsByFileName.get(data.path);
+ const newContents = newContentsByFileName.get(data.path.replace(/\\/g, '/'));
if (newContents !== undefined) {