From f86cdff02ca3dea83a598a86e2d5c88ed3b34bcc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 22 Mar 2023 14:09:03 +0100 Subject: [PATCH 1/3] upgrade esbuild, remove watch option from options --- code/lib/builder-manager/package.json | 2 +- code/lib/builder-manager/src/index.ts | 3 +- code/lib/core-common/package.json | 4 +- code/package.json | 6 +- code/yarn.lock | 473 ++++++++++++++------------ 5 files changed, 265 insertions(+), 223 deletions(-) diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index de945e69749b..4a8a48714882 100644 --- a/code/lib/builder-manager/package.json +++ b/code/lib/builder-manager/package.json @@ -52,7 +52,7 @@ "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", "browser-assert": "^1.2.1", "ejs": "^3.1.8", - "esbuild": "^0.16.4", + "esbuild": "^0.17.0", "esbuild-plugin-alias": "^0.2.1", "express": "^4.17.3", "find-cache-dir": "^3.0.0", diff --git a/code/lib/builder-manager/src/index.ts b/code/lib/builder-manager/src/index.ts index c1f30a5229ab..7760d37342ee 100644 --- a/code/lib/builder-manager/src/index.ts +++ b/code/lib/builder-manager/src/index.ts @@ -147,7 +147,6 @@ const starter: StarterFunction = async function* starterGeneratorFn({ compilation = await instance({ ...config, - watch: true, }); yield; @@ -223,11 +222,11 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime, const coreDirOrigin = join(dirname(require.resolve('@storybook/manager/package.json')), 'dist'); const coreDirTarget = join(options.outputDir, `sb-manager`); + // TODO: this doesn't watch, we should change this to use the esbuild watch API: https://esbuild.github.io/api/#watch compilation = await instance({ ...config, minify: true, - watch: false, }); yield; diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index 247a3d52a9f7..4c6fbc2bf611 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -48,8 +48,8 @@ "@types/node": "^16.0.0", "@types/pretty-hrtime": "^1.0.0", "chalk": "^4.1.0", - "esbuild": "^0.16.4", - "esbuild-register": "^3.3.3", + "esbuild": "^0.17.0", + "esbuild-register": "^3.4.0", "file-system-cache": "^2.0.0", "find-up": "^5.0.0", "fs-extra": "^11.1.0", diff --git a/code/package.json b/code/package.json index 6f2c09837374..96149f19198a 100644 --- a/code/package.json +++ b/code/package.json @@ -81,7 +81,7 @@ "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/experimental-utils": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", - "esbuild": "^0.16.4", + "esbuild": "^0.17.0", "eslint": "^8.28.0", "playwright": "1.31.1", "serialize-javascript": "^3.1.0" @@ -219,8 +219,8 @@ "concurrently": "^5.3.0", "cross-env": "^7.0.3", "danger": "^10.6.2", - "esbuild": "^0.16.4", - "esbuild-loader": "^2.19.0", + "esbuild": "^0.17.0", + "esbuild-loader": "^3.0.0", "esbuild-plugin-alias": "^0.2.1", "eslint": "^8.28.0", "eslint-import-resolver-typescript": "^3.5.2", diff --git a/code/yarn.lock b/code/yarn.lock index ddbf6a509b3e..7fe426a9317f 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -2061,7 +2061,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.21.0 resolution: "@babel/runtime@npm:7.21.0" dependencies: @@ -2444,156 +2444,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-arm64@npm:0.16.17" +"@esbuild/android-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-arm64@npm:0.17.12" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-arm@npm:0.16.17" +"@esbuild/android-arm@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-arm@npm:0.17.12" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-x64@npm:0.16.17" +"@esbuild/android-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-x64@npm:0.17.12" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/darwin-arm64@npm:0.16.17" +"@esbuild/darwin-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/darwin-arm64@npm:0.17.12" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/darwin-x64@npm:0.16.17" +"@esbuild/darwin-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/darwin-x64@npm:0.17.12" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/freebsd-arm64@npm:0.16.17" +"@esbuild/freebsd-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/freebsd-arm64@npm:0.17.12" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/freebsd-x64@npm:0.16.17" +"@esbuild/freebsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/freebsd-x64@npm:0.17.12" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-arm64@npm:0.16.17" +"@esbuild/linux-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-arm64@npm:0.17.12" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-arm@npm:0.16.17" +"@esbuild/linux-arm@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-arm@npm:0.17.12" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-ia32@npm:0.16.17" +"@esbuild/linux-ia32@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-ia32@npm:0.17.12" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-loong64@npm:0.16.17" +"@esbuild/linux-loong64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-loong64@npm:0.17.12" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-mips64el@npm:0.16.17" +"@esbuild/linux-mips64el@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-mips64el@npm:0.17.12" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-ppc64@npm:0.16.17" +"@esbuild/linux-ppc64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-ppc64@npm:0.17.12" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-riscv64@npm:0.16.17" +"@esbuild/linux-riscv64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-riscv64@npm:0.17.12" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-s390x@npm:0.16.17" +"@esbuild/linux-s390x@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-s390x@npm:0.17.12" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-x64@npm:0.16.17" +"@esbuild/linux-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-x64@npm:0.17.12" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/netbsd-x64@npm:0.16.17" +"@esbuild/netbsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/netbsd-x64@npm:0.17.12" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/openbsd-x64@npm:0.16.17" +"@esbuild/openbsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/openbsd-x64@npm:0.17.12" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/sunos-x64@npm:0.16.17" +"@esbuild/sunos-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/sunos-x64@npm:0.17.12" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-arm64@npm:0.16.17" +"@esbuild/win32-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-arm64@npm:0.17.12" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-ia32@npm:0.16.17" +"@esbuild/win32-ia32@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-ia32@npm:0.17.12" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-x64@npm:0.16.17" +"@esbuild/win32-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-x64@npm:0.17.12" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -3619,10 +3619,10 @@ __metadata: languageName: node linkType: hard -"@lit-labs/ssr-dom-shim@npm:^1.0.0": - version: 1.0.0 - resolution: "@lit-labs/ssr-dom-shim@npm:1.0.0" - checksum: 7829bf644a5e49599bfb8d9a8ae13ef77abc5e6122675adf7abdb190407bc109bca797fe80667ff5313a209480d4eac24a6efc2ac2eddc1fdf6f26391e2c1c61 +"@lit-labs/ssr-dom-shim@npm:^1.0.0, @lit-labs/ssr-dom-shim@npm:^1.1.0": + version: 1.1.0 + resolution: "@lit-labs/ssr-dom-shim@npm:1.1.0" + checksum: 8187448c730e280dbe1766dae47a9b2fba4e075294e381cff915f7c7370b10f780487cd3ab100d4d25d4d897adbd7a329f49b26493cf8ad43d1872052b576c59 languageName: node linkType: hard @@ -3928,19 +3928,18 @@ __metadata: linkType: hard "@npmcli/git@npm:^4.0.0": - version: 4.0.3 - resolution: "@npmcli/git@npm:4.0.3" + version: 4.0.4 + resolution: "@npmcli/git@npm:4.0.4" dependencies: "@npmcli/promise-spawn": ^6.0.0 lru-cache: ^7.4.4 - mkdirp: ^1.0.4 npm-pick-manifest: ^8.0.0 proc-log: ^3.0.0 promise-inflight: ^1.0.1 promise-retry: ^2.0.1 semver: ^7.3.5 which: ^3.0.0 - checksum: 6786ce44e7e97d41ae1fb5c522ad8e55fa491f7229b31a9c1a92e922a5590ec00a4a733537bca00d3096bf87c145d2f3b69ddf68037a293844eef1c864d2553d + checksum: 42a2a600c380adf141b6fe01a41ebbaab4c0f5541af58a79e66d7c62acca08ec1f5a9f0a636e3c63dad47000c4a80496b912f18a3af58f1a40624f283ef3fd00 languageName: node linkType: hard @@ -4173,8 +4172,8 @@ __metadata: linkType: hard "@nrwl/nx-cloud@npm:^15.0.2": - version: 15.2.3 - resolution: "@nrwl/nx-cloud@npm:15.2.3" + version: 15.2.4 + resolution: "@nrwl/nx-cloud@npm:15.2.4" dependencies: axios: ^0.21.2 chalk: 4.1.0 @@ -4186,7 +4185,7 @@ __metadata: yargs-parser: ">=21.0.1" bin: nx-cloud: bin/nx-cloud.js - checksum: c3cc6a227b7729f20261020824d61da25c0c22f59fc305cc727a782cbf812c2d074d819a1aed9606928ee9c10d57cd4f333240640282394d6a0ea5d9e6f1c1fa + checksum: a3cd051e4ae48a55056624826d11ff08e618654210c954fa76b49100b8de1c1048097c8168f79f5b0802ebebe253a0cb7061c0202d696442f48954cffd0d51a7 languageName: node linkType: hard @@ -5683,7 +5682,7 @@ __metadata: "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 browser-assert: ^1.2.1 ejs: ^3.1.8 - esbuild: ^0.16.4 + esbuild: ^0.17.0 esbuild-plugin-alias: ^0.2.1 express: ^4.17.3 find-cache-dir: ^3.0.0 @@ -6007,8 +6006,8 @@ __metadata: "@types/picomatch": ^2.3.0 "@types/pretty-hrtime": ^1.0.0 chalk: ^4.1.0 - esbuild: ^0.16.4 - esbuild-register: ^3.3.3 + esbuild: ^0.17.0 + esbuild-register: ^3.4.0 file-system-cache: ^2.0.0 find-up: ^5.0.0 fs-extra: ^11.1.0 @@ -7079,8 +7078,8 @@ __metadata: concurrently: ^5.3.0 cross-env: ^7.0.3 danger: ^10.6.2 - esbuild: ^0.16.4 - esbuild-loader: ^2.19.0 + esbuild: ^0.17.0 + esbuild-loader: ^3.0.0 esbuild-plugin-alias: ^0.2.1 eslint: ^8.28.0 eslint-import-resolver-typescript: ^3.5.2 @@ -7578,90 +7577,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-darwin-arm64@npm:1.3.41" +"@swc/core-darwin-arm64@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-darwin-arm64@npm:1.3.42" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-darwin-x64@npm:1.3.41" +"@swc/core-darwin-x64@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-darwin-x64@npm:1.3.42" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.41" +"@swc/core-linux-arm-gnueabihf@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.42" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.41" +"@swc/core-linux-arm64-gnu@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-linux-arm64-gnu@npm:1.3.42" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.41" +"@swc/core-linux-arm64-musl@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-linux-arm64-musl@npm:1.3.42" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.41" +"@swc/core-linux-x64-gnu@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-linux-x64-gnu@npm:1.3.42" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-linux-x64-musl@npm:1.3.41" +"@swc/core-linux-x64-musl@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-linux-x64-musl@npm:1.3.42" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.41" +"@swc/core-win32-arm64-msvc@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-win32-arm64-msvc@npm:1.3.42" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.41" +"@swc/core-win32-ia32-msvc@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-win32-ia32-msvc@npm:1.3.42" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.41": - version: 1.3.41 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.41" +"@swc/core-win32-x64-msvc@npm:1.3.42": + version: 1.3.42 + resolution: "@swc/core-win32-x64-msvc@npm:1.3.42" conditions: os=win32 & cpu=x64 languageName: node linkType: hard "@swc/core@npm:^1.3.23": - version: 1.3.41 - resolution: "@swc/core@npm:1.3.41" - dependencies: - "@swc/core-darwin-arm64": 1.3.41 - "@swc/core-darwin-x64": 1.3.41 - "@swc/core-linux-arm-gnueabihf": 1.3.41 - "@swc/core-linux-arm64-gnu": 1.3.41 - "@swc/core-linux-arm64-musl": 1.3.41 - "@swc/core-linux-x64-gnu": 1.3.41 - "@swc/core-linux-x64-musl": 1.3.41 - "@swc/core-win32-arm64-msvc": 1.3.41 - "@swc/core-win32-ia32-msvc": 1.3.41 - "@swc/core-win32-x64-msvc": 1.3.41 + version: 1.3.42 + resolution: "@swc/core@npm:1.3.42" + dependencies: + "@swc/core-darwin-arm64": 1.3.42 + "@swc/core-darwin-x64": 1.3.42 + "@swc/core-linux-arm-gnueabihf": 1.3.42 + "@swc/core-linux-arm64-gnu": 1.3.42 + "@swc/core-linux-arm64-musl": 1.3.42 + "@swc/core-linux-x64-gnu": 1.3.42 + "@swc/core-linux-x64-musl": 1.3.42 + "@swc/core-win32-arm64-msvc": 1.3.42 + "@swc/core-win32-ia32-msvc": 1.3.42 + "@swc/core-win32-x64-msvc": 1.3.42 dependenciesMeta: "@swc/core-darwin-arm64": optional: true @@ -7683,7 +7682,7 @@ __metadata: optional: true "@swc/core-win32-x64-msvc": optional: true - checksum: 76a0d93428b72017e076abf827b6e959e32749972510a41040519e00ecd5d5c8459800b9b73c768e67575b0bc3be19d88fc9b5901ade89d919ba9f1b5f2b6278 + checksum: 26e0aa2acc11ff3abebbd3725a21d2ac634062a87adc9bfe79c789763eb4c6fedd545a0577032945a9a3035b4de33edab5f98b4fdfef74c0c5c562e48fb74eb0 languageName: node linkType: hard @@ -7823,12 +7822,12 @@ __metadata: languageName: node linkType: hard -"@tufjs/models@npm:1.0.0": - version: 1.0.0 - resolution: "@tufjs/models@npm:1.0.0" +"@tufjs/models@npm:1.0.1": + version: 1.0.1 + resolution: "@tufjs/models@npm:1.0.1" dependencies: - minimatch: ^6.1.0 - checksum: 9500eab7b3aa69fed1443db6634dca2e84b655f7c5c2d21f92d2421a9bf3bd194f8fedbcd1b537c1cd62ab4ca04219a2b12f1402d7b69db3a6ff22552ac6163a + minimatch: ^7.4.2 + checksum: f9b7f0d06f54dfc27dd6d492674c11d87c38239714ad6edf2a845770cf5f1f0f4921ef6974041a8aeb1923a50598639579498ed5130e1e43bcefa8015b41e7da languageName: node linkType: hard @@ -11453,7 +11452,7 @@ __metadata: languageName: node linkType: hard -"cacache@npm:17.0.4, cacache@npm:^17.0.0": +"cacache@npm:17.0.4": version: 17.0.4 resolution: "cacache@npm:17.0.4" dependencies: @@ -11526,6 +11525,27 @@ __metadata: languageName: node linkType: hard +"cacache@npm:^17.0.0": + version: 17.0.5 + resolution: "cacache@npm:17.0.5" + dependencies: + "@npmcli/fs": ^3.1.0 + fs-minipass: ^3.0.0 + glob: ^9.3.1 + lru-cache: ^7.7.1 + minipass: ^4.0.0 + minipass-collect: ^1.0.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.4 + p-map: ^4.0.0 + promise-inflight: ^1.0.1 + ssri: ^10.0.0 + tar: ^6.1.11 + unique-filename: ^3.0.0 + checksum: e8a91ee6123e8e289545db101a9ba73c3385afdb49a596be790ce17340cfe08258434f26c3ff28b9cd1dad168f4bf0b0582f0b22dd6ba656f2ffc90a5be12663 + languageName: node + linkType: hard + "cache-base@npm:^1.0.1": version: 1.0.1 resolution: "cache-base@npm:1.0.1" @@ -13768,9 +13788,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.284": - version: 1.4.334 - resolution: "electron-to-chromium@npm:1.4.334" - checksum: 2d1e4a6b26508f3c4622a0cab5dfc16102d1d561417e2ad4f0ad0bf4c618fe6c17072e54b0a48a0e05688fe177b6ae2f6df50764e5922547046e8fb7aff87100 + version: 1.4.335 + resolution: "electron-to-chromium@npm:1.4.335" + checksum: d0ff0c169a268f979ab1680be31993a2a3f5c35473c636bd76bf9f0d7e6650b059b16739be8cbe37d688c3923d537d0439a64275e71a4b3e0004c270c5b5f2d0 languageName: node linkType: hard @@ -14339,19 +14359,17 @@ __metadata: languageName: node linkType: hard -"esbuild-loader@npm:^2.19.0": - version: 2.21.0 - resolution: "esbuild-loader@npm:2.21.0" +"esbuild-loader@npm:^3.0.0": + version: 3.0.1 + resolution: "esbuild-loader@npm:3.0.1" dependencies: - esbuild: ^0.16.17 - joycon: ^3.0.1 - json5: ^2.2.0 - loader-utils: ^2.0.0 - tapable: ^2.2.0 + esbuild: ^0.17.6 + get-tsconfig: ^4.4.0 + loader-utils: ^2.0.4 webpack-sources: ^1.4.3 peerDependencies: webpack: ^4.40.0 || ^5.0.0 - checksum: 459687e7cf5353433483e607ccca4357046a6698144df82ac63e69bd77f683e374de3b463b8b6e7ac94d79f27992d45f60885bbc9c347bca7da61c5a3fa3c66b + checksum: 3cb70d1b039c4b16772ab6fd97ea57ea67b3d3c896b615a9d81633e65c105461c1f2b770644d66c8a6c9b2d256c0687687ee2fcf836a2cf63176f0a0c8b82f3d languageName: node linkType: hard @@ -14362,7 +14380,7 @@ __metadata: languageName: node linkType: hard -"esbuild-register@npm:^3.3.3": +"esbuild-register@npm:^3.4.0": version: 3.4.2 resolution: "esbuild-register@npm:3.4.2" dependencies: @@ -14391,32 +14409,32 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.16.4": - version: 0.16.17 - resolution: "esbuild@npm:0.16.17" - dependencies: - "@esbuild/android-arm": 0.16.17 - "@esbuild/android-arm64": 0.16.17 - "@esbuild/android-x64": 0.16.17 - "@esbuild/darwin-arm64": 0.16.17 - "@esbuild/darwin-x64": 0.16.17 - "@esbuild/freebsd-arm64": 0.16.17 - "@esbuild/freebsd-x64": 0.16.17 - "@esbuild/linux-arm": 0.16.17 - "@esbuild/linux-arm64": 0.16.17 - "@esbuild/linux-ia32": 0.16.17 - "@esbuild/linux-loong64": 0.16.17 - "@esbuild/linux-mips64el": 0.16.17 - "@esbuild/linux-ppc64": 0.16.17 - "@esbuild/linux-riscv64": 0.16.17 - "@esbuild/linux-s390x": 0.16.17 - "@esbuild/linux-x64": 0.16.17 - "@esbuild/netbsd-x64": 0.16.17 - "@esbuild/openbsd-x64": 0.16.17 - "@esbuild/sunos-x64": 0.16.17 - "@esbuild/win32-arm64": 0.16.17 - "@esbuild/win32-ia32": 0.16.17 - "@esbuild/win32-x64": 0.16.17 +"esbuild@npm:^0.17.0": + version: 0.17.12 + resolution: "esbuild@npm:0.17.12" + dependencies: + "@esbuild/android-arm": 0.17.12 + "@esbuild/android-arm64": 0.17.12 + "@esbuild/android-x64": 0.17.12 + "@esbuild/darwin-arm64": 0.17.12 + "@esbuild/darwin-x64": 0.17.12 + "@esbuild/freebsd-arm64": 0.17.12 + "@esbuild/freebsd-x64": 0.17.12 + "@esbuild/linux-arm": 0.17.12 + "@esbuild/linux-arm64": 0.17.12 + "@esbuild/linux-ia32": 0.17.12 + "@esbuild/linux-loong64": 0.17.12 + "@esbuild/linux-mips64el": 0.17.12 + "@esbuild/linux-ppc64": 0.17.12 + "@esbuild/linux-riscv64": 0.17.12 + "@esbuild/linux-s390x": 0.17.12 + "@esbuild/linux-x64": 0.17.12 + "@esbuild/netbsd-x64": 0.17.12 + "@esbuild/openbsd-x64": 0.17.12 + "@esbuild/sunos-x64": 0.17.12 + "@esbuild/win32-arm64": 0.17.12 + "@esbuild/win32-ia32": 0.17.12 + "@esbuild/win32-x64": 0.17.12 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -14464,7 +14482,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: c2aaef0d2369349b2ef40c0115c2d2030ed7d7341cc91d26af3e243218ecec972f8f1243d5ce8e9a4c80b29439b89dff44c658e57c696d3b07e9074a77878b49 + checksum: bd7fc358470dd0dd3d63031d406ddc757f2d68d96fe652e447f62ed61c8f5e01ef065a6a346b48cd3ee25f2fc95b610091d70b1646c5e17afadfc9a63ffb8c02 languageName: node linkType: hard @@ -16319,7 +16337,7 @@ __metadata: languageName: node linkType: hard -"get-tsconfig@npm:^4.2.0": +"get-tsconfig@npm:^4.2.0, get-tsconfig@npm:^4.4.0": version: 4.4.0 resolution: "get-tsconfig@npm:4.4.0" checksum: 671cdf7a72bdf43d235de5f70247824d3d6fb9ecf26b0e528e25132b66981463a4c5892118a9e77f613d07d539f52e351a5581c9b7f8c1330e5b647ce8b98ac5 @@ -16568,6 +16586,18 @@ __metadata: languageName: node linkType: hard +"glob@npm:^9.3.0, glob@npm:^9.3.1": + version: 9.3.1 + resolution: "glob@npm:9.3.1" + dependencies: + fs.realpath: ^1.0.0 + minimatch: ^7.4.1 + minipass: ^4.2.4 + path-scurry: ^1.6.1 + checksum: ec0f941634400ba3a8de5421228b8956cd2d06ebcbabddcde3bc8cff222ad7db1072661b63fa3ab933734507d3637187a82ef30f02e9440a19d6e793feb49f80 + languageName: node + linkType: hard + "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -17605,11 +17635,11 @@ __metadata: linkType: hard "ignore-walk@npm:^6.0.0": - version: 6.0.1 - resolution: "ignore-walk@npm:6.0.1" + version: 6.0.2 + resolution: "ignore-walk@npm:6.0.2" dependencies: - minimatch: ^6.1.6 - checksum: 48949c131779d032b0b45aa97bf9e14df04225ab8ca5a69f1adf875767fa7fec86d503c6a11c87b52dc23bd696ab5c3b352dd4289ee0df3be1705b71b52c0949 + minimatch: ^7.4.2 + checksum: aa510785eec78dc4f4754e5be043bd131c774f3a9264e240da04f5490be091c90395eac61f66236f42583458dc816828ed978a61123f33e7f5eb5d7865647431 languageName: node linkType: hard @@ -19421,13 +19451,6 @@ __metadata: languageName: node linkType: hard -"joycon@npm:^3.0.1": - version: 3.1.1 - resolution: "joycon@npm:3.1.1" - checksum: 131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae - languageName: node - linkType: hard - "jquery@npm:^3.5.1": version: 3.6.4 resolution: "jquery@npm:3.6.4" @@ -19436,9 +19459,9 @@ __metadata: linkType: hard "js-sdsl@npm:^4.1.4": - version: 4.3.0 - resolution: "js-sdsl@npm:4.3.0" - checksum: cd3c342d08ed646d271bc59e5da12d732fee4a6fa32a30f6552d66cdf5c744b1fc5b61cddaff80702c1c6bb92add3b17ce0b6ff8a2cc7f9188df4065183aa7fb + version: 4.4.0 + resolution: "js-sdsl@npm:4.4.0" + checksum: 1eabe718867d293771074b5a14a82a115727b3d4abc9524fb9b0cb74293f447b90fe27bb74eb712b6400aeb7b869631c0a67d3347670cf22d067e77caeeb2f33 languageName: node linkType: hard @@ -19741,7 +19764,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.0.0, json5@npm:^2.1.0, json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.1, json5@npm:^2.2.2": +"json5@npm:^2.0.0, json5@npm:^2.1.0, json5@npm:^2.1.2, json5@npm:^2.2.1, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -20299,21 +20322,22 @@ __metadata: linkType: hard "lit-element@npm:^3.2.0": - version: 3.2.2 - resolution: "lit-element@npm:3.2.2" + version: 3.3.0 + resolution: "lit-element@npm:3.3.0" dependencies: + "@lit-labs/ssr-dom-shim": ^1.1.0 "@lit/reactive-element": ^1.3.0 - lit-html: ^2.2.0 - checksum: 516897ef91838a77bbf80473ff05e4f39e768c383786910acd44717510e71d1a582435fdbae28ae54bd6f62c613917bbeb9a30aacd020a75270ea897b24c1cf8 + lit-html: ^2.7.0 + checksum: 1428ed1a75f5898e727a7453fbd06554eeac8e783eef353d56d69cb2cda899d3988d72b742e99c553b83b0ffe209b568d5ad73b78655fc1fa733c5a9989b86aa languageName: node linkType: hard -"lit-html@npm:^2.2.0, lit-html@npm:^2.3.0": - version: 2.6.1 - resolution: "lit-html@npm:2.6.1" +"lit-html@npm:^2.3.0, lit-html@npm:^2.7.0": + version: 2.7.0 + resolution: "lit-html@npm:2.7.0" dependencies: "@types/trusted-types": ^2.0.2 - checksum: df5d137e9c7956b6e639e9eeed13050b201895bb69683713135526e67d526c01f74276fb0083daf69135903288ef497febdb3b8613b5080336e4fa29e5f5f063 + checksum: c75f75a111378b56c8a07bbdd2d8324487eb144935d3b799fcfec48ed668764e0c6ceca4fad580ec125ff4742487ec8805bd8e38ad6cc745f5df85a61e46f5b5 languageName: node linkType: hard @@ -20745,7 +20769,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.14.1, lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1": version: 7.18.3 resolution: "lru-cache@npm:7.18.3" checksum: b3a452b491433db885beed95041eb104c157ef7794b9c9b4d647be503be91769d11206bb573849a16b4cc0d03cbd15ffd22df7960997788b74c1d399ac7a4fed @@ -21994,7 +22018,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^6.1.0, minimatch@npm:^6.1.6": +"minimatch@npm:^6.1.6": version: 6.2.0 resolution: "minimatch@npm:6.2.0" dependencies: @@ -22003,6 +22027,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^7.4.1, minimatch@npm:^7.4.2": + version: 7.4.2 + resolution: "minimatch@npm:7.4.2" + dependencies: + brace-expansion: ^2.0.1 + checksum: 6deed7078b84934179cec0cc0b46d27b76f995deda7f5d1833f376d8e4c062f4df08f4d979899109b4304fae975b0ebd877aa2a8a94b70ad76d640bf44c070e2 + languageName: node + linkType: hard + "minimist-options@npm:4.1.0": version: 4.1.0 resolution: "minimist-options@npm:4.1.0" @@ -22121,7 +22154,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^4.0.0": +"minipass@npm:^4.0.0, minipass@npm:^4.0.2, minipass@npm:^4.2.4": version: 4.2.5 resolution: "minipass@npm:4.2.5" checksum: 98ef3a4f0e7cbb2a152139069fd48eca331296948946c69fd569eee24d875e1dbbe989609b561b9ff8ecdc3438f46ed6c287efd150facd7d374a8fd6ba689d02 @@ -22778,11 +22811,11 @@ __metadata: linkType: hard "npm-install-checks@npm:^6.0.0": - version: 6.0.0 - resolution: "npm-install-checks@npm:6.0.0" + version: 6.1.0 + resolution: "npm-install-checks@npm:6.1.0" dependencies: semver: ^7.1.1 - checksum: 6cac8854ba8927b7b46ef996bfcb0561048b7d4c377b1a7d133d5d324cc9a8c1727cff15fa3bf5039f197553e7ce45196f174c37cf8173582a21fa8dea928664 + checksum: a8354280109359be50cb32de6e3ba23bfeb78086438da7c664d124c44d0e9045ebc23fe258c26782f07e7f948453b8f94cb27b6239b6c79168c0fda402cc605b languageName: node linkType: hard @@ -23979,6 +24012,16 @@ __metadata: languageName: node linkType: hard +"path-scurry@npm:^1.6.1": + version: 1.6.2 + resolution: "path-scurry@npm:1.6.2" + dependencies: + lru-cache: ^7.14.1 + minipass: ^4.0.2 + checksum: bb2acfa16101b1be9cc02f31a450fceabae7943b098b8511722934bd96d8faedba1ecb851cb3959c2bd93abc4710af63cb7b7a2f39a70bba55eb409269893797 + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -25458,15 +25501,15 @@ __metadata: linkType: hard "react-textarea-autosize@npm:^8.3.0": - version: 8.4.0 - resolution: "react-textarea-autosize@npm:8.4.0" + version: 8.4.1 + resolution: "react-textarea-autosize@npm:8.4.1" dependencies: - "@babel/runtime": ^7.10.2 + "@babel/runtime": ^7.20.13 use-composed-ref: ^1.3.0 use-latest: ^1.2.1 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: cef5cc06e353c50db19689f4c61260572fea6a48a4b3d7600a1e0b69f20b33b5899db15f272c402c649c999d76834ad11de63f0053c1edab5ae72b05661e22c8 + checksum: 76d77ccfaf6515daba0b6e711bb1930dfc3f01494a71a0fc0f76b686af6847f071837eb3b2ae066cfa51dfcb223f8fc9d951971e1e87ef86bbf018bbfb25ce0d languageName: node linkType: hard @@ -25540,14 +25583,14 @@ __metadata: linkType: hard "read-package-json@npm:^6.0.0": - version: 6.0.0 - resolution: "read-package-json@npm:6.0.0" + version: 6.0.1 + resolution: "read-package-json@npm:6.0.1" dependencies: - glob: ^8.0.1 + glob: ^9.3.0 json-parse-even-better-errors: ^3.0.0 normalize-package-data: ^5.0.0 npm-normalize-package-bin: ^3.0.0 - checksum: c3137d1c5574df1d89d30470ca0546fd2167c1da78b5b1b77a936d64b937a49e6966a100fdd34281a7030d83b42774751e7c32126493d2beee016a23588a00e2 + checksum: 2e5fecce76a2d47ed4d413d16c63278d41ff6d2b7eaff53b20405285d3b4733d20adbe388c766a8ded464cc57c70c57791110e3741d2c6d5d25b63fcbef7bca7 languageName: node linkType: hard @@ -29025,12 +29068,12 @@ __metadata: linkType: hard "tuf-js@npm:^1.0.0": - version: 1.1.1 - resolution: "tuf-js@npm:1.1.1" + version: 1.1.2 + resolution: "tuf-js@npm:1.1.2" dependencies: - "@tufjs/models": 1.0.0 + "@tufjs/models": 1.0.1 make-fetch-happen: ^11.0.1 - checksum: ca2b9d085aadee856cfde743015d7d89377161a2417d7f3b29298ef3754a86b25e0a9927375cd4fd9b64ab059cc13b3026d893f205f9ed1b229f1f4ed123eb4c + checksum: ea071f223730f8a743fbc2f1852d1c5b1a55a83162701a43051a812f27a923f745098555d7f44fad7cea4c2810eff2f4f73dd5c67d7d708ebaabeb51c23c51bb languageName: node linkType: hard From 122ac2ec2a742015c47ff90f23f6272257cff592 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 22 Mar 2023 14:29:44 +0100 Subject: [PATCH 2/3] remove removed stop api --- code/lib/builder-manager/src/index.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/lib/builder-manager/src/index.ts b/code/lib/builder-manager/src/index.ts index 7760d37342ee..32252d385f71 100644 --- a/code/lib/builder-manager/src/index.ts +++ b/code/lib/builder-manager/src/index.ts @@ -280,15 +280,6 @@ export const bail: ManagerBuilder['bail'] = async () => { // } } - - if (compilation && compilation.stop) { - try { - compilation.stop(); - logger.warn('Force closed manager build'); - } catch (err) { - logger.warn('Unable to close manager build!'); - } - } }; export const start = async (options: BuilderStartOptions) => { From d8012da1092f4a164f2f3ab4c74383020df378d9 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 22 Mar 2023 14:50:58 +0100 Subject: [PATCH 3/3] add extra optimizeDeps entry --- code/lib/builder-vite/src/optimizeDeps.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/code/lib/builder-vite/src/optimizeDeps.ts b/code/lib/builder-vite/src/optimizeDeps.ts index 36df1a58041f..644d8e9c0aff 100644 --- a/code/lib/builder-vite/src/optimizeDeps.ts +++ b/code/lib/builder-vite/src/optimizeDeps.ts @@ -12,6 +12,7 @@ const INCLUDE_CANDIDATES = [ '@mdx-js/react', '@storybook/addon-docs > acorn-jsx', '@storybook/addon-docs', + '@storybook/addon-essentials/docs/mdx-react-shim', '@storybook/channel-postmessage', '@storybook/channel-websocket', '@storybook/client-api',