From 934d280a9fe4f41aa6804074e7dbaca4c793165d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 2 Aug 2021 22:14:02 -0700 Subject: [PATCH] chore: bump vscode-universal-bundler Fixes https://github.com/microsoft/vscode/issues/115262 --- build/darwin/create-universal-app.js | 4 +-- build/darwin/create-universal-app.ts | 2 +- build/package.json | 3 ++- build/yarn.lock | 40 ++++++++++++---------------- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js index 92609d0e6b1..f517b7d99df 100644 --- a/build/darwin/create-universal-app.js +++ b/build/darwin/create-universal-app.js @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); -const vscode_universal_1 = require("vscode-universal"); +const vscode_universal_bundler_1 = require("vscode-universal-bundler"); const fs = require("fs-extra"); const path = require("path"); const plist = require("plist"); @@ -23,7 +23,7 @@ async function main() { const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName); const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json'); const infoPlistPath = path.resolve(outAppPath, 'Contents', 'Info.plist'); - await (0, vscode_universal_1.makeUniversalApp)({ + await (0, vscode_universal_bundler_1.makeUniversalApp)({ x64AppPath, arm64AppPath, x64AsarPath, diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts index b13e80100e6..3c7b7c637be 100644 --- a/build/darwin/create-universal-app.ts +++ b/build/darwin/create-universal-app.ts @@ -5,7 +5,7 @@ 'use strict'; -import { makeUniversalApp } from 'vscode-universal'; +import { makeUniversalApp } from 'vscode-universal-bundler'; import * as fs from 'fs-extra'; import * as path from 'path'; import * as plist from 'plist'; diff --git a/build/package.json b/build/package.json index a2076fdd017..b4984d35c0f 100644 --- a/build/package.json +++ b/build/package.json @@ -12,6 +12,7 @@ "@types/debounce": "^1.0.0", "@types/eslint": "4.16.1", "@types/fancy-log": "^1.3.0", + "@types/fs-extra": "^9.0.12", "@types/glob": "^7.1.1", "@types/gulp": "^4.0.5", "@types/gulp-concat": "^0.0.32", @@ -59,7 +60,7 @@ "tmp": "^0.2.1", "typescript": "^4.4.0-dev.20210719", "vsce": "1.48.0", - "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58" + "vscode-universal-bundler": "^0.0.1" }, "scripts": { "compile": "tsc -p tsconfig.build.json", diff --git a/build/yarn.lock b/build/yarn.lock index 3de7ad392bf..da77fdd6c19 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -198,7 +198,7 @@ resolved "https://registry.yarnpkg.com/@types/debounce/-/debounce-1.0.0.tgz#417560200331e1bb84d72da85391102c2fcd61b7" integrity sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc= -"@types/debug@^4.1.4", "@types/debug@^4.1.5": +"@types/debug@^4.1.4": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== @@ -238,10 +238,10 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^9.0.6": - version "9.0.6" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab" - integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig== +"@types/fs-extra@^9.0.12": + version "9.0.12" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.12.tgz#9b8f27973df8a7a3920e8461517ebf8a7d4fdfaf" + integrity sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw== dependencies: "@types/node" "*" @@ -391,11 +391,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8" integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ== -"@types/node@^14.14.21": - version "14.14.22" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" - integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== - "@types/p-limit@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@types/p-limit/-/p-limit-2.2.0.tgz#94a608e9b258a6c6156a13d1a14fd720dba70b97" @@ -957,13 +952,20 @@ debug@^2.6.8: dependencies: ms "2.0.0" -debug@^4.1.1, debug@^4.3.1: +debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" +debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -2042,11 +2044,6 @@ typed-rest-client@^0.9.0: tunnel "0.0.4" underscore "1.8.3" -typescript@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" - integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== - typescript@^4.4.0-dev.20210719: version "4.4.0-dev.20210719" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.0-dev.20210719.tgz#e8d559ca3d8ab61cd1ac21a2c64f634664edc05d" @@ -2146,19 +2143,16 @@ vsce@1.48.0: yauzl "^2.3.1" yazl "^2.2.2" -vscode-universal@deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58: - version "0.0.2" - resolved "https://codeload.github.com/deepak1556/universal/tar.gz/61454d96223b774c53cda10f72c2098c0ce02d58" +vscode-universal-bundler@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/vscode-universal-bundler/-/vscode-universal-bundler-0.0.1.tgz#fb2b8a4df33bb683c900329e3904267819b4c4be" + integrity sha512-aDsvfkxgR3ZUEzoBfmDo0VpNUj4DUPaSqfDvydBI0UYsXdoXY7lsDTzRMH0L1p+kZzWbf7sqwuN+KLfnoI/BbA== dependencies: "@malept/cross-spawn-promise" "^1.1.0" - "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.6" - "@types/node" "^14.14.21" asar "^3.0.3" debug "^4.3.1" dir-compare "^2.4.0" fs-extra "^9.0.1" - typescript "^4.1.3" vso-node-api@6.1.2-preview: version "6.1.2-preview"