From 256e2c78c196608f54d3ac522c5855106e2f93dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:37:25 +0800 Subject: [PATCH] Update dependency esbuild to v0.16.4 (#13972) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- .../esbuild-plugins/primitive-define.mjs | 2 +- .../esbuild-plugins/strip-node-protocol.mjs | 4 +- scripts/build/esbuild-plugins/umd.mjs | 9 +- yarn.lock | 404 +++++++++--------- 5 files changed, 212 insertions(+), 209 deletions(-) diff --git a/package.json b/package.json index a1dc11893..7070d9fb2 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "cross-env": "7.0.3", "cspell": "6.17.0", "enquirer": "2.3.6", - "esbuild": "0.15.18", + "esbuild": "0.16.4", "esbuild-visualizer": "0.4.0", "eslint": "8.29.0", "eslint-config-prettier": "8.5.0", diff --git a/scripts/build/esbuild-plugins/primitive-define.mjs b/scripts/build/esbuild-plugins/primitive-define.mjs index 41e447440..103b05a0c 100644 --- a/scripts/build/esbuild-plugins/primitive-define.mjs +++ b/scripts/build/esbuild-plugins/primitive-define.mjs @@ -6,7 +6,7 @@ function stringify(value) { throw Object.assign(new TypeError("value not allowed"), { value }); } - return JSON.stringify(value); + return value === undefined ? "undefined" : JSON.stringify(value); } /* diff --git a/scripts/build/esbuild-plugins/strip-node-protocol.mjs b/scripts/build/esbuild-plugins/strip-node-protocol.mjs index e4c35cf60..4fcf6a7b9 100644 --- a/scripts/build/esbuild-plugins/strip-node-protocol.mjs +++ b/scripts/build/esbuild-plugins/strip-node-protocol.mjs @@ -2,8 +2,8 @@ export default function esbuildPluginStripNodeProtocol() { return { name: "strip-node-protocol", setup(build) { - build.onResolve({ filter: /^node:/ }, ({ path }) => - build.resolve(path.slice(5)) + build.onResolve({ filter: /^node:/ }, ({ path, kind }) => + build.resolve(path.slice(5), { kind }) ); }, }; diff --git a/scripts/build/esbuild-plugins/umd.mjs b/scripts/build/esbuild-plugins/umd.mjs index 0d090b6de..212709af9 100644 --- a/scripts/build/esbuild-plugins/umd.mjs +++ b/scripts/build/esbuild-plugins/umd.mjs @@ -2,11 +2,11 @@ import fs from "node:fs"; import camelCase from "camelcase"; import { outdent } from "outdent"; +const PLACEHOLDER = "__PLACEHOLDER__"; function getUmdWrapper({ name, interopDefault = false }, build) { const path = name.split("."); const { minify } = build.initialOptions; const temporaryName = minify ? "m" : camelCase(name); - const placeholder = "/*! bundled code !*/"; let globalObjectText = []; for (let index = 0; index < path.length; index++) { @@ -46,7 +46,7 @@ function getUmdWrapper({ name, interopDefault = false }, build) { ${globalObjectText.trimStart()} = interopModuleDefault(factory); } })(function() { - "use strict";${placeholder} + "use strict";${PLACEHOLDER} }); `; @@ -54,9 +54,12 @@ function getUmdWrapper({ name, interopDefault = false }, build) { wrapper = build.esbuild .transformSync(wrapper, { loader: "js", minify }) .code.trim(); + if (!wrapper.includes(PLACEHOLDER)) { + throw new Error("Unexpected code"); + } } - const [intro, outro] = wrapper.split(placeholder); + const [intro, outro] = wrapper.split(PLACEHOLDER); return { name: temporaryName, diff --git a/yarn.lock b/yarn.lock index 4328d308d..becd50b17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -830,20 +830,160 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.15.18": - version: 0.15.18 - resolution: "@esbuild/android-arm@npm:0.15.18" +"@esbuild/android-arm64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/android-arm64@npm:0.16.4" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/android-arm@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/android-arm@npm:0.16.4" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.15.18": - version: 0.15.18 - resolution: "@esbuild/linux-loong64@npm:0.15.18" +"@esbuild/android-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/android-x64@npm:0.16.4" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/darwin-arm64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/darwin-arm64@npm:0.16.4" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/darwin-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/darwin-x64@npm:0.16.4" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/freebsd-arm64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/freebsd-arm64@npm:0.16.4" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/freebsd-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/freebsd-x64@npm:0.16.4" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/linux-arm64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-arm64@npm:0.16.4" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/linux-arm@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-arm@npm:0.16.4" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-ia32@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-ia32@npm:0.16.4" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-loong64@npm:0.16.4" conditions: os=linux & cpu=loong64 languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-mips64el@npm:0.16.4" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"@esbuild/linux-ppc64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-ppc64@npm:0.16.4" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/linux-riscv64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-riscv64@npm:0.16.4" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"@esbuild/linux-s390x@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-s390x@npm:0.16.4" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"@esbuild/linux-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/linux-x64@npm:0.16.4" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/netbsd-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/netbsd-x64@npm:0.16.4" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/openbsd-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/openbsd-x64@npm:0.16.4" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/sunos-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/sunos-x64@npm:0.16.4" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/win32-arm64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/win32-arm64@npm:0.16.4" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/win32-ia32@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/win32-ia32@npm:0.16.4" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/win32-x64@npm:0.16.4": + version: 0.16.4 + resolution: "@esbuild/win32-x64@npm:0.16.4" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.1.0": version: 4.1.2 resolution: "@eslint-community/eslint-utils@npm:4.1.2" @@ -3075,125 +3215,6 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-android-64@npm:0.15.18" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - -"esbuild-android-arm64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-android-arm64@npm:0.15.18" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-darwin-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-darwin-64@npm:0.15.18" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"esbuild-darwin-arm64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-darwin-arm64@npm:0.15.18" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-freebsd-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-freebsd-64@npm:0.15.18" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-freebsd-arm64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-freebsd-arm64@npm:0.15.18" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-32@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-32@npm:0.15.18" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-linux-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-64@npm:0.15.18" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"esbuild-linux-arm64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-arm64@npm:0.15.18" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-arm@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-arm@npm:0.15.18" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"esbuild-linux-mips64le@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-mips64le@npm:0.15.18" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - -"esbuild-linux-ppc64le@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-ppc64le@npm:0.15.18" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - -"esbuild-linux-riscv64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-riscv64@npm:0.15.18" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"esbuild-linux-s390x@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-linux-s390x@npm:0.15.18" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - -"esbuild-netbsd-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-netbsd-64@npm:0.15.18" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-openbsd-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-openbsd-64@npm:0.15.18" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-sunos-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-sunos-64@npm:0.15.18" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - "esbuild-visualizer@npm:0.4.0": version: 0.4.0 resolution: "esbuild-visualizer@npm:0.4.0" @@ -3206,101 +3227,80 @@ __metadata: languageName: node linkType: hard -"esbuild-windows-32@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-windows-32@npm:0.15.18" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-windows-64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-windows-64@npm:0.15.18" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"esbuild-windows-arm64@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild-windows-arm64@npm:0.15.18" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"esbuild@npm:0.15.18": - version: 0.15.18 - resolution: "esbuild@npm:0.15.18" +"esbuild@npm:0.16.4": + version: 0.16.4 + resolution: "esbuild@npm:0.16.4" dependencies: - "@esbuild/android-arm": 0.15.18 - "@esbuild/linux-loong64": 0.15.18 - esbuild-android-64: 0.15.18 - esbuild-android-arm64: 0.15.18 - esbuild-darwin-64: 0.15.18 - esbuild-darwin-arm64: 0.15.18 - esbuild-freebsd-64: 0.15.18 - esbuild-freebsd-arm64: 0.15.18 - esbuild-linux-32: 0.15.18 - esbuild-linux-64: 0.15.18 - esbuild-linux-arm: 0.15.18 - esbuild-linux-arm64: 0.15.18 - esbuild-linux-mips64le: 0.15.18 - esbuild-linux-ppc64le: 0.15.18 - esbuild-linux-riscv64: 0.15.18 - esbuild-linux-s390x: 0.15.18 - esbuild-netbsd-64: 0.15.18 - esbuild-openbsd-64: 0.15.18 - esbuild-sunos-64: 0.15.18 - esbuild-windows-32: 0.15.18 - esbuild-windows-64: 0.15.18 - esbuild-windows-arm64: 0.15.18 + "@esbuild/android-arm": 0.16.4 + "@esbuild/android-arm64": 0.16.4 + "@esbuild/android-x64": 0.16.4 + "@esbuild/darwin-arm64": 0.16.4 + "@esbuild/darwin-x64": 0.16.4 + "@esbuild/freebsd-arm64": 0.16.4 + "@esbuild/freebsd-x64": 0.16.4 + "@esbuild/linux-arm": 0.16.4 + "@esbuild/linux-arm64": 0.16.4 + "@esbuild/linux-ia32": 0.16.4 + "@esbuild/linux-loong64": 0.16.4 + "@esbuild/linux-mips64el": 0.16.4 + "@esbuild/linux-ppc64": 0.16.4 + "@esbuild/linux-riscv64": 0.16.4 + "@esbuild/linux-s390x": 0.16.4 + "@esbuild/linux-x64": 0.16.4 + "@esbuild/netbsd-x64": 0.16.4 + "@esbuild/openbsd-x64": 0.16.4 + "@esbuild/sunos-x64": 0.16.4 + "@esbuild/win32-arm64": 0.16.4 + "@esbuild/win32-ia32": 0.16.4 + "@esbuild/win32-x64": 0.16.4 dependenciesMeta: "@esbuild/android-arm": optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true "@esbuild/linux-loong64": optional: true - esbuild-android-64: + "@esbuild/linux-mips64el": optional: true - esbuild-android-arm64: + "@esbuild/linux-ppc64": optional: true - esbuild-darwin-64: + "@esbuild/linux-riscv64": optional: true - esbuild-darwin-arm64: + "@esbuild/linux-s390x": optional: true - esbuild-freebsd-64: + "@esbuild/linux-x64": optional: true - esbuild-freebsd-arm64: + "@esbuild/netbsd-x64": optional: true - esbuild-linux-32: + "@esbuild/openbsd-x64": optional: true - esbuild-linux-64: + "@esbuild/sunos-x64": optional: true - esbuild-linux-arm: + "@esbuild/win32-arm64": optional: true - esbuild-linux-arm64: + "@esbuild/win32-ia32": optional: true - esbuild-linux-mips64le: - optional: true - esbuild-linux-ppc64le: - optional: true - esbuild-linux-riscv64: - optional: true - esbuild-linux-s390x: - optional: true - esbuild-netbsd-64: - optional: true - esbuild-openbsd-64: - optional: true - esbuild-sunos-64: - optional: true - esbuild-windows-32: - optional: true - esbuild-windows-64: - optional: true - esbuild-windows-arm64: + "@esbuild/win32-x64": optional: true bin: esbuild: bin/esbuild - checksum: ec12682b2cb2d4f0669d0e555028b87a9284ca7f6a1b26e35e69a8697165b35cc682ad598abc70f0bbcfdc12ca84ef888caf5ceee389237862e8f8c17da85f89 + checksum: c06e9b2e84f5c7cdb608fa15e5a241d155321097fe1362beab176bc8283f54ae2a9a7fcca741da2663ffb5fea98c6c47226edd22189d3effb14b457e46592d1b languageName: node linkType: hard @@ -6751,7 +6751,7 @@ __metadata: editorconfig: 0.15.3 editorconfig-to-prettier: 0.2.0 enquirer: 2.3.6 - esbuild: 0.15.18 + esbuild: 0.16.4 esbuild-visualizer: 0.4.0 escape-string-regexp: 5.0.0 eslint: 8.29.0