-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
1,274 additions
and
1,184 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
48 changes: 28 additions & 20 deletions
48
app-editors/vscode/files/0001-remove-playwright-as-it-s-only-used-in-unit-test.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,60 @@ | ||
From b3e25575db29eeed8254cfd7b9b0bd7be6a1641a Mon Sep 17 00:00:00 2001 | ||
From bb0f1c283d270831bd87f9e7e5a52c85822a7364 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:19:33 +0800 | ||
Subject: [PATCH 01/10] remove playwright as it's only used in unit test | ||
Date: Wed, 16 Dec 2020 10:42:39 +0800 | ||
Subject: [PATCH 1/9] remove playwright as it's only used in unit test | ||
|
||
--- | ||
package.json | 1 - | ||
yarn.lock | 16 ---------------- | ||
2 files changed, 17 deletions(-) | ||
package.json | 3 +-- | ||
yarn.lock | 17 ----------------- | ||
2 files changed, 1 insertion(+), 19 deletions(-) | ||
|
||
diff --git a/package.json b/package.json | ||
index 770b44b0c1..5e4264927a 100644 | ||
index f4c487c907..b5c20f315c 100644 | ||
--- a/package.json | ||
+++ b/package.json | ||
@@ -156,7 +156,6 @@ | ||
@@ -160,7 +160,6 @@ | ||
"opn": "^6.0.0", | ||
"optimist": "0.3.5", | ||
"p-all": "^1.0.0", | ||
- "playwright": "1.3.0", | ||
- "playwright": "1.6.2", | ||
"pump": "^1.0.1", | ||
"queue": "3.0.6", | ||
"rcedit": "^1.1.0", | ||
@@ -197,4 +196,4 @@ | ||
"windows-mutex": "0.3.0", | ||
"windows-process-tree": "0.2.4" | ||
} | ||
-} | ||
\ No newline at end of file | ||
+} | ||
diff --git a/yarn.lock b/yarn.lock | ||
index a38db6751b..652ed08da9 100644 | ||
index dd5e3e4eea..26e08de955 100644 | ||
--- a/yarn.lock | ||
+++ b/yarn.lock | ||
@@ -6978,22 +6978,6 @@ pkg-dir@^3.0.0: | ||
@@ -7233,23 +7233,6 @@ pkg-dir@^3.0.0: | ||
dependencies: | ||
find-up "^3.0.0" | ||
|
||
-playwright@1.3.0: | ||
- version "1.3.0" | ||
- resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.3.0.tgz#8c33ed29bc0c7d97f82f8322e99be6d7f0d9ff67" | ||
- integrity sha512-W3mwXv2XNFugbepSZTZxI314WfI1SAjdZBEeGOu8S5KnPz4RSlunUFgXn6496o8lobPmORLcJ9VTSGyiFfGpaw== | ||
-playwright@1.6.2: | ||
- version "1.6.2" | ||
- resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.6.2.tgz#8631aec4d16b081d8ac414637b006099814a69d1" | ||
- integrity sha512-KiMmQuANG4O/ozpwxP8EwBBap0/liS3+wwkGo6nBJ4O4951y4ZsRPR1dqwsMOUD9wjsWf3ER+bAmQH5XmEO4Ig== | ||
- dependencies: | ||
- debug "^4.1.1" | ||
- extract-zip "^2.0.0" | ||
- extract-zip "^2.0.1" | ||
- https-proxy-agent "^5.0.0" | ||
- jpeg-js "^0.4.0" | ||
- mime "^2.4.4" | ||
- jpeg-js "^0.4.2" | ||
- mime "^2.4.6" | ||
- pngjs "^5.0.0" | ||
- progress "^2.0.3" | ||
- proper-lockfile "^4.1.1" | ||
- proxy-from-env "^1.1.0" | ||
- rimraf "^3.0.2" | ||
- ws "^6.1.0" | ||
- ws "^7.3.1" | ||
- | ||
plist@^3.0.1: | ||
version "3.0.1" | ||
resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
From f18f5b5821a0bdce7d7343ff4f37daee10ca6c01 Mon Sep 17 00:00:00 2001 | ||
From 6117da5325b796a5d949d906a8e9e44191b08325 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:20:48 +0800 | ||
Subject: [PATCH 02/10] Don't download prebuilt ffmpeg | ||
Subject: [PATCH 2/9] Don't download prebuilt ffmpeg | ||
|
||
--- | ||
build/gulpfile.vscode.js | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js | ||
index d046aa71ed..0740fc225b 100644 | ||
index 42a9c2b270..676b375802 100644 | ||
--- a/build/gulpfile.vscode.js | ||
+++ b/build/gulpfile.vscode.js | ||
@@ -263,7 +263,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op | ||
@@ -267,7 +267,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op | ||
let result = all | ||
.pipe(util.skipDirectories()) | ||
.pipe(util.fixWin32DirectoryPermissions()) | ||
|
@@ -21,5 +21,5 @@ index d046aa71ed..0740fc225b 100644 | |
|
||
if (platform === 'linux') { | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
27 changes: 0 additions & 27 deletions
27
app-editors/vscode/files/0003-Allow-build-using-nodejs-14.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From c022552769722397ff5e064d20534a3c6e05342e Mon Sep 17 00:00:00 2001 | ||
From 8ffc8b194b45ebdb5d4ae3282dfa37d5e27a137f Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:26:46 +0800 | ||
Subject: [PATCH 04/10] Allow --offline in args | ||
Subject: [PATCH 3/9] Allow --offline in args | ||
|
||
--- | ||
build/npm/postinstall.js | 3 ++- | ||
|
@@ -22,5 +22,5 @@ index 8f8b0019a7..4ae62d6951 100644 | |
console.log(`Installing dependencies in ${location}...`); | ||
console.log(`$ yarn ${args.join(' ')}`); | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
From 2a8899abd1631ff1fe97a8ec1386615449d67c89 Mon Sep 17 00:00:00 2001 | ||
From 652f6a35be1dd7f83f2fd1195e03e1fc2705fd12 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:37:48 +0800 | ||
Subject: [PATCH 05/10] Add install script for Gentoo | ||
Subject: [PATCH 4/9] Add install script for Gentoo | ||
|
||
--- | ||
build/gulpfile.vscode.linux.js | 54 ++++++++++++++++++++++++++++++++++ | ||
1 file changed, 54 insertions(+) | ||
|
||
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js | ||
index 1d8a09e4fe..38c434b499 100644 | ||
index b6732b7fa1..3da0ad90b8 100644 | ||
--- a/build/gulpfile.vscode.linux.js | ||
+++ b/build/gulpfile.vscode.linux.js | ||
@@ -254,6 +254,57 @@ function buildSnapPackage(arch) { | ||
@@ -257,6 +257,57 @@ function buildSnapPackage(arch) { | ||
return shell.task(`cd ${snapBuildPath} && snapcraft`); | ||
} | ||
|
||
|
@@ -69,7 +69,7 @@ index 1d8a09e4fe..38c434b499 100644 | |
const BUILD_TARGETS = [ | ||
{ arch: 'x64' }, | ||
{ arch: 'armhf' }, | ||
@@ -275,4 +326,7 @@ BUILD_TARGETS.forEach(({ arch }) => { | ||
@@ -278,4 +329,7 @@ BUILD_TARGETS.forEach(({ arch }) => { | ||
gulp.task(prepareSnapTask); | ||
const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch))); | ||
gulp.task(buildSnapTask); | ||
|
@@ -78,5 +78,5 @@ index 1d8a09e4fe..38c434b499 100644 | |
+ gulp.task(installGentooTask); | ||
}); | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From c3f37cf7110342d22f833fcb787fc85c1d2e41a0 Mon Sep 17 00:00:00 2001 | ||
From eea0df16ab0d0db1fe1a0c153a92a61cb015cf23 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:40:05 +0800 | ||
Subject: [PATCH 06/10] Run yarn install in offline mode | ||
Subject: [PATCH 5/9] Run yarn install in offline mode | ||
|
||
--- | ||
extensions/css-language-features/package.json | 2 +- | ||
|
@@ -23,7 +23,7 @@ index 29f056e413..a304c0a0a3 100644 | |
}, | ||
"categories": [ | ||
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json | ||
index 204ae49b1c..800e569f3e 100644 | ||
index c2c211ccba..139ea6e9a5 100644 | ||
--- a/extensions/html-language-features/package.json | ||
+++ b/extensions/html-language-features/package.json | ||
@@ -20,7 +20,7 @@ | ||
|
@@ -36,7 +36,7 @@ index 204ae49b1c..800e569f3e 100644 | |
}, | ||
"categories": [ | ||
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json | ||
index db003f0512..d693917465 100644 | ||
index a8e3231a93..6582230bca 100644 | ||
--- a/extensions/json-language-features/package.json | ||
+++ b/extensions/json-language-features/package.json | ||
@@ -20,7 +20,7 @@ | ||
|
@@ -49,5 +49,5 @@ index db003f0512..d693917465 100644 | |
}, | ||
"categories": [ | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
From 232baaa074874e1b9556e6b8710c4eab22b7fbe6 Mon Sep 17 00:00:00 2001 | ||
From b3c19b7de68f65119b705772558ef1a01f229f55 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:41:08 +0800 | ||
Subject: [PATCH 07/10] Don't download bundle marketplace extensions in gulp | ||
Subject: [PATCH 6/9] Don't download bundle marketplace extensions in gulp | ||
|
||
--- | ||
build/gulpfile.extensions.js | 1 - | ||
1 file changed, 1 deletion(-) | ||
|
||
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js | ||
index 6ae72e4cf0..715587eb05 100644 | ||
index c204e84fd8..355c5d3c8f 100644 | ||
--- a/build/gulpfile.extensions.js | ||
+++ b/build/gulpfile.extensions.js | ||
@@ -166,7 +166,6 @@ const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimr | ||
|
@@ -20,5 +20,5 @@ index 6ae72e4cf0..715587eb05 100644 | |
|
||
gulp.task(compileExtensionsBuildTask); | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From dccf6fa0b4bb5c958330a81f871d7b432064f3ee Mon Sep 17 00:00:00 2001 | ||
From f0bd2a481d3f8f166968e50d5087baf30cace7d7 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:42:31 +0800 | ||
Subject: [PATCH 08/10] Don't run `yarn install` for web/remote/test | ||
Subject: [PATCH 7/9] Don't run `yarn install` for web/remote/test | ||
|
||
--- | ||
build/npm/postinstall.js | 10 ---------- | ||
|
@@ -34,5 +34,5 @@ index 4ae62d6951..1f325a59d9 100644 | |
- | ||
-cp.execSync('git config pull.rebase true'); | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
From 102e9db9ca262c2d266b14320c56ddbc572c19bc Mon Sep 17 00:00:00 2001 | ||
From 2ee6a8e1f183838363dc80129ab621d5a9146eb6 Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 09:52:23 +0800 | ||
Subject: [PATCH 09/10] update product.json | ||
Subject: [PATCH 8/9] update product.json | ||
|
||
--- | ||
product.json | 12 ++++++++++++ | ||
1 file changed, 12 insertions(+) | ||
|
||
diff --git a/product.json b/product.json | ||
index ecfb44dd74..fafeaa92c3 100644 | ||
index 207bcf8f51..f604d4ff31 100644 | ||
--- a/product.json | ||
+++ b/product.json | ||
@@ -1,4 +1,16 @@ | ||
|
@@ -29,5 +29,5 @@ index ecfb44dd74..fafeaa92c3 100644 | |
"nameLong": "Code - OSS", | ||
"applicationName": "code-oss", | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
From 9c3e4c1bd8b1de330290f24695f5b9abae488036 Mon Sep 17 00:00:00 2001 | ||
From 26360a75b1b02daff080f9ec16167bc75b742e2c Mon Sep 17 00:00:00 2001 | ||
From: 12101111 <[email protected]> | ||
Date: Fri, 9 Oct 2020 10:13:46 +0800 | ||
Subject: [PATCH 10/10] use github tar ball instead of git | ||
Subject: [PATCH 9/9] use github tar ball instead of git | ||
|
||
--- | ||
extensions/typescript-language-features/package.json | 2 +- | ||
extensions/typescript-language-features/yarn.lock | 4 ++-- | ||
2 files changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json | ||
index 70ed27503c..96c39d0591 100644 | ||
index 2ea05450a0..180675430a 100644 | ||
--- a/extensions/typescript-language-features/package.json | ||
+++ b/extensions/typescript-language-features/package.json | ||
@@ -29,7 +29,7 @@ | ||
|
@@ -38,5 +38,5 @@ index 4ef8f03278..b364c37b3d 100644 | |
unique-filename@^1.1.1: | ||
version "1.1.1" | ||
-- | ||
2.28.0 | ||
2.29.2 | ||
|
Oops, something went wrong.