Skip to content

Commit 86b1962

Browse files
authored
fix: chromium license packaging (microsoft#181142)
* Revert "Revert "chore: use chromium license file downloaded from Electron package (microsoft#181106)" (microsoft#181113)" This reverts commit 25fc56b. * chore: bump @vscode/gulp-electron * chore: update distro
1 parent 43e0111 commit 86b1962

File tree

3 files changed

+51
-10
lines changed

3 files changed

+51
-10
lines changed

build/gulpfile.vscode.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
251251
const productJsonStream = gulp.src(['product.json'], { base: '.' })
252252
.pipe(json(productJsonUpdate));
253253

254-
const license = gulp.src(['LICENSES.chromium.html', product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
254+
const license = gulp.src([product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
255255

256256
// TODO the API should be copied to `out` during compile, not here
257257
const api = gulp.src('src/vscode-dts/vscode.d.ts').pipe(rename('out/vscode-dts/vscode.d.ts'));
@@ -336,7 +336,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
336336
.pipe(util.fixWin32DirectoryPermissions())
337337
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
338338
.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
339-
.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
339+
.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
340340

341341
if (platform === 'linux') {
342342
result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.79.0",
4-
"distro": "54f126e6c7f3e817114a498598f554e799ec32ab",
4+
"distro": "cc43e0a4c74e2edb2274319e362e6976beca2f41",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -126,7 +126,7 @@
126126
"@typescript-eslint/eslint-plugin": "^5.57.0",
127127
"@typescript-eslint/experimental-utils": "^5.57.0",
128128
"@typescript-eslint/parser": "^5.57.0",
129-
"@vscode/gulp-electron": "^1.33.0",
129+
"@vscode/gulp-electron": "^1.34.0",
130130
"@vscode/l10n-dev": "0.0.21",
131131
"@vscode/telemetry-extractor": "^1.9.9",
132132
"@vscode/test-web": "^0.0.41",

yarn.lock

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,10 +1240,10 @@
12401240
resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
12411241
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
12421242

1243-
"@vscode/gulp-electron@^1.33.0":
1244-
version "1.33.0"
1245-
resolved "https://registry.yarnpkg.com/@vscode/gulp-electron/-/gulp-electron-1.33.0.tgz#e7b4f95c6e3356c9d28c892d6fa91a47418521d1"
1246-
integrity sha512-YEa7w2APK/wxKoP249r9f4Z18XdrN8McGmTNiLCFfYMPgJJQzFADaphp7i+w03jNDBDpt5pd8sod2z2SMU/7mA==
1243+
"@vscode/gulp-electron@^1.34.0":
1244+
version "1.34.0"
1245+
resolved "https://registry.yarnpkg.com/@vscode/gulp-electron/-/gulp-electron-1.34.0.tgz#59e00502e0a9703d1a0b7184dbd98ffe5125d2f4"
1246+
integrity sha512-zqLmueXYIqwgv0QhDdiDJOQYBYlCKE6Vu9KovMJ1ONZDrgb2CxUdaqxJRnROY18n6XO9RmNWodnplvSWkM+RVQ==
12471247
dependencies:
12481248
"@electron/get" "^2.0.2"
12491249
"@octokit/rest" "^18.0.14"
@@ -1259,7 +1259,7 @@
12591259
rimraf "^2.4.2"
12601260
semver "^4.3.4"
12611261
temp "^0.8.3"
1262-
vinyl "^2.2.0"
1262+
vinyl "^3.0.0"
12631263
vinyl-fs "^3.0.3"
12641264

12651265
@@ -2586,7 +2586,7 @@ clone@^1.0.0:
25862586
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
25872587
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
25882588

2589-
clone@^2.1.1:
2589+
clone@^2.1.1, clone@^2.1.2:
25902590
version "2.1.2"
25912591
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
25922592
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
@@ -4157,6 +4157,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
41574157
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
41584158
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
41594159

4160+
fast-fifo@^1.1.0:
4161+
version "1.2.0"
4162+
resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.2.0.tgz#2ee038da2468e8623066dee96958b0c1763aa55a"
4163+
integrity sha512-NcvQXt7Cky1cNau15FWy64IjuO8X0JijhTBBrJj1YlxlDfRkJXNaK9RFUjwpfDPzMdv7wB38jr53l9tkNLxnWg==
4164+
41604165
fast-glob@^3.2.11, fast-glob@^3.2.5, fast-glob@^3.2.9:
41614166
version "3.2.11"
41624167
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
@@ -8182,6 +8187,11 @@ q@^1.1.2:
81828187
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
81838188
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
81848189

8190+
queue-tick@^1.0.1:
8191+
version "1.0.1"
8192+
resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
8193+
integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
8194+
81858195
81868196
version "3.0.6"
81878197
resolved "https://registry.yarnpkg.com/queue/-/queue-3.0.6.tgz#66c0ffd0a1d9d28045adebda966a2d3946ab9f13"
@@ -8387,6 +8397,11 @@ replace-ext@^1.0.0:
83878397
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
83888398
integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
83898399

8400+
replace-ext@^2.0.0:
8401+
version "2.0.0"
8402+
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
8403+
integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
8404+
83908405
replace-homedir@^1.0.0:
83918406
version "1.0.0"
83928407
resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
@@ -9104,6 +9119,14 @@ streamifier@^0.1.1, streamifier@~0.1.1:
91049119
resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
91059120
integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
91069121

9122+
streamx@^2.12.5:
9123+
version "2.13.2"
9124+
resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.13.2.tgz#9de43569a1cd54980d128673b3c1429b79afff1c"
9125+
integrity sha512-+TWqixPhGDXEG9L/XczSbhfkmwAtGs3BJX5QNU6cvno+pOLKeszByWcnaTu6dg8efsTYqR8ZZuXWHhZfgrxMvA==
9126+
dependencies:
9127+
fast-fifo "^1.1.0"
9128+
queue-tick "^1.0.1"
9129+
91079130
string-width@^1.0.1, string-width@^1.0.2:
91089131
version "1.0.2"
91099132
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9456,6 +9479,13 @@ [email protected]:
94569479
resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.8.tgz#38bd32d49545417a0ea67fb618e646298e1b67cc"
94579480
integrity sha512-0jAAujLmjjGXf9PzrNpjOrr/6CTpSOp8jX80NOHK5nlOTWWpwaZ16EOyrPdHnm2bVfPHvT0/RAD0xyiQHGQvCQ==
94589481

9482+
teex@^1.0.1:
9483+
version "1.0.1"
9484+
resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
9485+
integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
9486+
dependencies:
9487+
streamx "^2.12.5"
9488+
94599489
temp@^0.8.3:
94609490
version "0.8.4"
94619491
resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
@@ -10109,6 +10139,17 @@ vinyl@^2.1.0, vinyl@^2.2.0, vinyl@^2.2.1:
1010910139
remove-trailing-separator "^1.0.1"
1011010140
replace-ext "^1.0.0"
1011110141

10142+
vinyl@^3.0.0:
10143+
version "3.0.0"
10144+
resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
10145+
integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==
10146+
dependencies:
10147+
clone "^2.1.2"
10148+
clone-stats "^1.0.0"
10149+
remove-trailing-separator "^1.1.0"
10150+
replace-ext "^2.0.0"
10151+
teex "^1.0.1"
10152+
1011210153
vinyl@~2.0.1:
1011310154
version "2.0.2"
1011410155
resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"

0 commit comments

Comments
 (0)