From a1ec838aac5069420f107227b59824cdd6b214ce Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 4 Oct 2024 21:53:45 +0200 Subject: [PATCH] esm - remove hardcoded `--esm` for `code-web` (#230538) * esm - remove hardcoded `--esm` for `code-web` * update depds --- package-lock.json | 54 ++++++++++++++++++++++++++------------------- package.json | 2 +- scripts/code-web.js | 1 - 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index b85a9c700de..46499429a29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,7 +81,7 @@ "@vscode/telemetry-extractor": "^1.10.2", "@vscode/test-cli": "^0.0.6", "@vscode/test-electron": "^2.4.0", - "@vscode/test-web": "^0.0.60", + "@vscode/test-web": "^0.0.62", "@vscode/v8-heap-parser": "^0.1.0", "@vscode/vscode-perf": "^0.0.14", "@webgpu/types": "^0.1.44", @@ -1458,14 +1458,15 @@ } }, "node_modules/@koa/router": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.0.0.tgz", - "integrity": "sha512-P278xb5IoLtDn2inRsCzJVKGxt5RkjOivwxGbniMO1sI8bft1/Dr93UsRP5aByT8C74x8zqxDYyPXrQwRKIhjg==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.1.0.tgz", + "integrity": "sha512-mNVu1nvkpSd8Q8gMebGbCkDWJ51ODetrFvLKYusej+V0ByD4btqHYnPIzTBLXnQMVUlm/oxVwqmWBY3zQfZilw==", "dev": true, + "license": "MIT", "dependencies": { "http-errors": "^2.0.0", "koa-compose": "^4.1.0", - "path-to-regexp": "^6.2.2" + "path-to-regexp": "^6.3.0" }, "engines": { "node": ">= 18" @@ -1719,13 +1720,14 @@ } }, "node_modules/@playwright/browser-chromium": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.47.0.tgz", - "integrity": "sha512-uMsRSflfEX1zDYdghRhUaLMnyoKqcVquOjo4cbIlqCpgNulDbRF7k9lUAWgobgIbefFz96a4v9/Fae+ngOuBHQ==", + "version": "1.47.2", + "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.47.2.tgz", + "integrity": "sha512-tsk9bLcGzIu4k4xI2ixlwDrdJhMqCalUCsSj7TRI8VuvK7cLiJIa5SR0dprKbX+wkku/JMR4EN6g9DMHvfna+Q==", "dev": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.47.0" + "playwright-core": "1.47.2" }, "engines": { "node": ">=18" @@ -2878,14 +2880,15 @@ } }, "node_modules/@vscode/test-web": { - "version": "0.0.60", - "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.60.tgz", - "integrity": "sha512-U3Eif3GZEfmtFJFTRl5IZUxlqDocslvpHCoW4uz407F9YINc2ujJPB0QG+9ZtjjowZDzFJlg60J44RqmnlA0cg==", + "version": "0.0.62", + "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.62.tgz", + "integrity": "sha512-Ypug5PvhPOPFbuHVilai7t23tm3Wm5geIpC2DB09Gy9o0jZCduramiSdPf+YN7yhkFy1usFYtN3Eaks1XoBrOQ==", "dev": true, + "license": "MIT", "dependencies": { "@koa/cors": "^5.0.0", - "@koa/router": "^13.0.0", - "@playwright/browser-chromium": "^1.47.0", + "@koa/router": "^13.1.0", + "@playwright/browser-chromium": "^1.47.2", "glob": "^11.0.0", "gunzip-maybe": "^1.4.2", "http-proxy-agent": "^7.0.2", @@ -2895,7 +2898,7 @@ "koa-mount": "^4.0.0", "koa-static": "^5.0.0", "minimist": "^1.2.8", - "playwright": "^1.47.0", + "playwright": "^1.47.2", "tar-fs": "^3.0.6", "vscode-uri": "^3.0.8" }, @@ -3006,12 +3009,13 @@ } }, "node_modules/@vscode/test-web/node_modules/playwright": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.0.tgz", - "integrity": "sha512-jOWiRq2pdNAX/mwLiwFYnPHpEZ4rM+fRSQpRHwEwZlP2PUANvL3+aJOF/bvISMhFD30rqMxUB4RJx9aQbfh4Ww==", + "version": "1.47.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.2.tgz", + "integrity": "sha512-nx1cLMmQWqmA3UsnjaaokyoUpdVaaDhJhMoxX2qj3McpjnsqFHs516QAKYhqHAgOP+oCFTEOCOAaD1RgD/RQfA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.47.0" + "playwright-core": "1.47.2" }, "bin": { "playwright": "cli.js" @@ -9806,6 +9810,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -13524,7 +13529,8 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", @@ -13727,10 +13733,11 @@ } }, "node_modules/playwright-core": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.0.tgz", - "integrity": "sha512-1DyHT8OqkcfCkYUD9zzUTfg7EfTd+6a8MkD/NWOvjo0u/SCNd5YmY/lJwFvUZOxJbWNds+ei7ic2+R/cRz/PDg==", + "version": "1.47.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.2.tgz", + "integrity": "sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, @@ -16224,6 +16231,7 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } diff --git a/package.json b/package.json index 6f959c0b7cd..a3b31f3a931 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "@vscode/telemetry-extractor": "^1.10.2", "@vscode/test-cli": "^0.0.6", "@vscode/test-electron": "^2.4.0", - "@vscode/test-web": "^0.0.60", + "@vscode/test-web": "^0.0.62", "@vscode/v8-heap-parser": "^0.1.0", "@vscode/vscode-perf": "^0.0.14", "@webgpu/types": "^0.1.44", diff --git a/scripts/code-web.js b/scripts/code-web.js index f05c934cadf..467f147d027 100644 --- a/scripts/code-web.js +++ b/scripts/code-web.js @@ -74,7 +74,6 @@ async function main() { openSystemBrowser = true; } - serverArgs.push('--esm'); // TODO@esm this should be the default serverArgs.push('--sourcesPath', APP_ROOT); serverArgs.push(...process.argv.slice(2).filter(v => !v.startsWith('--playground') && v !== '--no-playground'));