From 64e605d563059cbf36cbd3e73b9f9b5c4b13d642 Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 20 Jun 2022 00:48:17 +0800 Subject: [PATCH 1/6] feat: use esbuild supported feature --- package.json | 2 +- packages/vite/package.json | 2 +- packages/vite/src/node/optimizer/index.ts | 7 +- pnpm-lock.yaml | 146 +++++++++++----------- 4 files changed, 81 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index d9923fa7b80bf4..a17dcd6ccb005a 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@typescript-eslint/parser": "^5.27.1", "conventional-changelog-cli": "^2.2.2", "cross-env": "^7.0.3", - "esbuild": "^0.14.43", + "esbuild": "^0.14.46", "eslint": "^8.17.0", "eslint-define-config": "^1.5.1", "eslint-plugin-import": "^2.26.0", diff --git a/packages/vite/package.json b/packages/vite/package.json index 8090b1feceb19e..0412d0e8879532 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -57,7 +57,7 @@ }, "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { - "esbuild": "^0.14.43", + "esbuild": "^0.14.46", "postcss": "^8.4.14", "resolve": "^1.22.0", "rollup": "^2.75.6" diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts index 6043a0fcd9452a..954247e0995967 100644 --- a/packages/vite/src/node/optimizer/index.ts +++ b/packages/vite/src/node/optimizer/index.ts @@ -555,7 +555,12 @@ export async function runOptimizeDeps( ...plugins, esbuildDepPlugin(flatIdDeps, flatIdToExports, config) ], - ...esbuildOptions + ...esbuildOptions, + supported: { + 'dynamic-import': true, + 'import-meta': true, + ...esbuildOptions.supported + } }) const meta = result.metafile! diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 50bf6b16a92af4..c202f4de11d0d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,7 +37,7 @@ importers: '@typescript-eslint/parser': ^5.27.1 conventional-changelog-cli: ^2.2.2 cross-env: ^7.0.3 - esbuild: ^0.14.43 + esbuild: ^0.14.46 eslint: ^8.17.0 eslint-define-config: ^1.5.1 eslint-plugin-import: ^2.26.0 @@ -95,7 +95,7 @@ importers: '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i conventional-changelog-cli: 2.2.2 cross-env: 7.0.3 - esbuild: 0.14.43 + esbuild: 0.14.46 eslint: 8.17.0 eslint-define-config: 1.5.1 eslint-plugin-import: 2.26.0_pv5w3e62ssxduf5aiwxbc3knra @@ -235,7 +235,7 @@ importers: dotenv: ^14.3.2 dotenv-expand: ^5.1.0 es-module-lexer: ^0.10.5 - esbuild: ^0.14.43 + esbuild: ^0.14.46 esno: ^0.16.3 estree-walker: ^3.0.1 etag: ^1.8.1 @@ -271,7 +271,7 @@ importers: ufo: ^0.8.4 ws: ^8.8.0 dependencies: - esbuild: 0.14.43 + esbuild: 0.14.46 postcss: 8.4.14 resolve: 1.22.0 rollup: 2.75.6 @@ -3922,8 +3922,8 @@ packages: dev: true optional: true - /esbuild-android-64/0.14.43: - resolution: {integrity: sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==} + /esbuild-android-64/0.14.46: + resolution: {integrity: sha512-ZyJqwAcjNbZprs0ZAxnUAOhEhdE5kTKwz+CZuLmZYNLAPyRgBtaC8pT2PCuPifNvV8Cl3yLlrQPaOCjovoyb5g==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -3947,8 +3947,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.43: - resolution: {integrity: sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==} + /esbuild-android-arm64/0.14.46: + resolution: {integrity: sha512-BKcnUksvCijO9ONv6b4SikZE/OZftwJvX91XROODZGQmuwGVg97jmLDVu3lxuHdFlMNNzxh8taJ2mbCWZzH/Iw==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -3972,8 +3972,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.43: - resolution: {integrity: sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==} + /esbuild-darwin-64/0.14.46: + resolution: {integrity: sha512-/ss2kO92sUJ9/1nHnMb3+oab8w6dyqKrMtPMvSYJ9KZIYGAZxz/WYxfFprY7Xk+ZxWnnlASSyZlG+If1nVmFYg==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -3997,8 +3997,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.43: - resolution: {integrity: sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==} + /esbuild-darwin-arm64/0.14.46: + resolution: {integrity: sha512-WX0JOaEFf6t+rIjXO6THsf/0fhQAt2Zb0/PSYlvXnuQQAmOmFAfPsuRNocp5ME0NGaUqZd4FxqqmLEVK3RzPAg==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -4022,8 +4022,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.43: - resolution: {integrity: sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==} + /esbuild-freebsd-64/0.14.46: + resolution: {integrity: sha512-o+ozPFuHRCAGCVWU2bLurOUgVkT0jcPEu082VBUY2Q/yLf+B+/3nXzh4Fjp5O21tOvJRTn7hUVydG9j5+vYE6A==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -4047,8 +4047,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.43: - resolution: {integrity: sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==} + /esbuild-freebsd-arm64/0.14.46: + resolution: {integrity: sha512-9zicZ0X43WDKz3sjNfcqYO38xbfJpSWYXB+FxvYYkmBwGA52K0SAu4oKuTTLi8od8X2IIo1x5C5TUNvKDSVJww==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -4072,8 +4072,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.43: - resolution: {integrity: sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==} + /esbuild-linux-32/0.14.46: + resolution: {integrity: sha512-ZnTpZMVb0VGvL99R5eh4OrJwbUyvpM6M88VAMuHP4LvFjuvZrhgefjKqEGuWZZW7JRnAjKqjXLjWdhdSjwMFnQ==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -4097,8 +4097,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.43: - resolution: {integrity: sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==} + /esbuild-linux-64/0.14.46: + resolution: {integrity: sha512-ECCRRZtX6l4ubeVhHhiVoK/uYAkvzNqfmR4gP4N/9H9RPu+b8YCcN4bQGp7xCuYIV6Xd41WpOMyO+xpcQvjtQQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -4122,8 +4122,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.43: - resolution: {integrity: sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==} + /esbuild-linux-arm/0.14.46: + resolution: {integrity: sha512-RvTJEi4vj13c5FP9YPp+8Y6x6HK1E7uSqfy3y9UoeaNAzNZWA7fN1U3hQjTL/dy5zTJH5KE64mrt5k5+he+CQA==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -4147,8 +4147,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.43: - resolution: {integrity: sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==} + /esbuild-linux-arm64/0.14.46: + resolution: {integrity: sha512-HX0TXCHyI0NEWG4jg8LlW1PbZQbnz+PUH56yjx996cgM5pC90u32drKs/tyJiyyQmNk9OXOogjKw7LEdp/Qc1w==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -4172,8 +4172,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.43: - resolution: {integrity: sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==} + /esbuild-linux-mips64le/0.14.46: + resolution: {integrity: sha512-jnb2NDwGqJUVmxn1v0f7seNdDm0nRNWHP9Z3MrWAGnBCdnnDlsjqRFDnbKoaQvWONEa+rOOr/giK+VL0hgQExA==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -4197,8 +4197,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.43: - resolution: {integrity: sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==} + /esbuild-linux-ppc64le/0.14.46: + resolution: {integrity: sha512-uu3JTQUrwwauKY9z8yq5MnDyOlT3f2DNOzBcYz4dB78HqwEqilCsifoBGd0WcbED5n57dc59X+LZMTZ8Ose44w==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -4214,8 +4214,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.43: - resolution: {integrity: sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==} + /esbuild-linux-riscv64/0.14.46: + resolution: {integrity: sha512-OB29r1EG44ZY34JnXCRERxo7k4pRKoQdaoRg2HIeCavatsXZwW4LCakpLnMQ72vXT1HtpBUABEjHkKkn5JyrUg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -4231,8 +4231,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.43: - resolution: {integrity: sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==} + /esbuild-linux-s390x/0.14.46: + resolution: {integrity: sha512-XQ/U9TueMSGYyPTKyZsJVraiuvxhwCDIMn/QwFXCRCJ6H/Cy/Rq33u9qhpeSziinHKfzJROGx5A8mQY6aYamdQ==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -4256,8 +4256,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.43: - resolution: {integrity: sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==} + /esbuild-netbsd-64/0.14.46: + resolution: {integrity: sha512-i15BwqHaAIFp1vBJkitAbHtwXcLk9TdHs/Ia1xGIAutQYXSJNPLM3Z4B4hyfHNEFl2yBqBIYpglMohv2ClNdOQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -4281,8 +4281,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.43: - resolution: {integrity: sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==} + /esbuild-openbsd-64/0.14.46: + resolution: {integrity: sha512-XwOIFCE140Y/PvjrwjFfa/QLWBuvhR1mPCOa35mKx02jt++wPNgf0qhn6HfdVC3vQe7R46RwTp4q2cp99fepEg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -4306,8 +4306,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.43: - resolution: {integrity: sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==} + /esbuild-sunos-64/0.14.46: + resolution: {integrity: sha512-+kV3JnmfdxBVpHyFvuGXWtu6tXxXApOLPkSrVkMJf6+ns/3PLtPndpzwCzHjD+qYUEk8ln4MA+ufQ2qmjW5mZg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -4331,8 +4331,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.43: - resolution: {integrity: sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==} + /esbuild-windows-32/0.14.46: + resolution: {integrity: sha512-gzGC1Q11B/Bo5A2EX4N22oigWmhL7Z0eDyc8kbSoJjqSrGQuRE7B0uMpluO+q0O/gZ1S3zdw+M4PCWlqOIeXLA==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -4356,8 +4356,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.43: - resolution: {integrity: sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==} + /esbuild-windows-64/0.14.46: + resolution: {integrity: sha512-Do2daaskfOjmCB7o3ygz6fD3K6SPjZLERiZLktzHz2oUCwsebKu/gmop0+j/XdrVIXC32wFzHzDS+9CTu9OShw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -4381,8 +4381,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.43: - resolution: {integrity: sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==} + /esbuild-windows-arm64/0.14.46: + resolution: {integrity: sha512-VEzMy6bM60/HT/URTDElyhfi2Pk0quCCrEhRlI4MRno/AIqYUGw0rZwkPl6PeoqVI6BgoBHGY576GWTiPmshCA==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -4441,32 +4441,32 @@ packages: esbuild-windows-arm64: 0.14.38 dev: true - /esbuild/0.14.43: - resolution: {integrity: sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==} + /esbuild/0.14.46: + resolution: {integrity: sha512-vdm5G1JdZBktva8dwQci/s44VbeBUg8g907xoZx77mqFZ4gU5GlMULNsdGeID+qXCXocsfYSGtE0LvqH3eiNQg==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.43 - esbuild-android-arm64: 0.14.43 - esbuild-darwin-64: 0.14.43 - esbuild-darwin-arm64: 0.14.43 - esbuild-freebsd-64: 0.14.43 - esbuild-freebsd-arm64: 0.14.43 - esbuild-linux-32: 0.14.43 - esbuild-linux-64: 0.14.43 - esbuild-linux-arm: 0.14.43 - esbuild-linux-arm64: 0.14.43 - esbuild-linux-mips64le: 0.14.43 - esbuild-linux-ppc64le: 0.14.43 - esbuild-linux-riscv64: 0.14.43 - esbuild-linux-s390x: 0.14.43 - esbuild-netbsd-64: 0.14.43 - esbuild-openbsd-64: 0.14.43 - esbuild-sunos-64: 0.14.43 - esbuild-windows-32: 0.14.43 - esbuild-windows-64: 0.14.43 - esbuild-windows-arm64: 0.14.43 + esbuild-android-64: 0.14.46 + esbuild-android-arm64: 0.14.46 + esbuild-darwin-64: 0.14.46 + esbuild-darwin-arm64: 0.14.46 + esbuild-freebsd-64: 0.14.46 + esbuild-freebsd-arm64: 0.14.46 + esbuild-linux-32: 0.14.46 + esbuild-linux-64: 0.14.46 + esbuild-linux-arm: 0.14.46 + esbuild-linux-arm64: 0.14.46 + esbuild-linux-mips64le: 0.14.46 + esbuild-linux-ppc64le: 0.14.46 + esbuild-linux-riscv64: 0.14.46 + esbuild-linux-s390x: 0.14.46 + esbuild-netbsd-64: 0.14.46 + esbuild-openbsd-64: 0.14.46 + esbuild-sunos-64: 0.14.46 + esbuild-windows-32: 0.14.46 + esbuild-windows-64: 0.14.46 + esbuild-windows-arm64: 0.14.46 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -5187,7 +5187,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.16.0 + uglify-js: 3.16.1 dev: true /hard-rejection/2.1.0: @@ -7334,7 +7334,7 @@ packages: '@babel/code-frame': 7.16.7 dev: true - /rollup-plugin-esbuild/4.9.1_2uefy6dldbldonrghlgjus4ieu: + /rollup-plugin-esbuild/4.9.1_cwxz74zmd3ygpekohj7vrjvhry: resolution: {integrity: sha512-qn/x7Wz9p3Xnva99qcb+nopH0d2VJwVnsxJTGEg+Sh2Z3tqQl33MhOwzekVo1YTKgv+yAmosjcBRJygMfGrtLw==} engines: {node: '>=12'} peerDependencies: @@ -7344,7 +7344,7 @@ packages: '@rollup/pluginutils': 4.2.1 debug: 4.3.4 es-module-lexer: 0.9.3 - esbuild: 0.14.43 + esbuild: 0.14.46 joycon: 3.1.1 jsonc-parser: 3.0.0 rollup: 2.75.6 @@ -8217,8 +8217,8 @@ packages: resolution: {integrity: sha512-/+BmBDe8GvlB2nIflWasLLAInjYG0bC9HRnfEpNi4sw77J2AJNnEVnTDReVrehoh825+Q/evF3THXTAweyam2g==} dev: true - /uglify-js/3.16.0: - resolution: {integrity: sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==} + /uglify-js/3.16.1: + resolution: {integrity: sha512-X5BGTIDH8U6IQ1TIRP62YC36k+ULAa1d59BxlWvPUJ1NkW5L3FwcGfEzuVvGmhJFBu0YJ5Ge25tmRISqCmLiRQ==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true @@ -8247,7 +8247,7 @@ packages: chalk: 5.0.1 consola: 2.15.3 defu: 6.0.0 - esbuild: 0.14.43 + esbuild: 0.14.46 hookable: 5.1.1 jiti: 1.13.0 magic-string: 0.26.1 @@ -8261,7 +8261,7 @@ packages: rimraf: 3.0.2 rollup: 2.75.6 rollup-plugin-dts: 4.2.1_7tpfgeokwovvsnuai4vwqwidpi - rollup-plugin-esbuild: 4.9.1_2uefy6dldbldonrghlgjus4ieu + rollup-plugin-esbuild: 4.9.1_cwxz74zmd3ygpekohj7vrjvhry scule: 0.2.1 typescript: 4.6.4 untyped: 0.4.4 From 11e1f6a77754df77a56f9ba51737d51a68a4e791 Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 20 Jun 2022 00:51:57 +0800 Subject: [PATCH 2/6] feat(optimizer): use modules target in dev --- packages/vite/src/node/build.ts | 12 ++---------- packages/vite/src/node/constants.ts | 10 ++++++++++ packages/vite/src/node/optimizer/index.ts | 3 ++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 710c7218513018..b3ef7816d0a040 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -47,7 +47,7 @@ import { loadFallbackPlugin } from './plugins/loadFallback' import type { PackageData } from './packages' import { watchPackageDataPlugin } from './packages' import { ensureWatchPlugin } from './plugins/ensureWatch' -import { VERSION } from './constants' +import { ESBUILD_MODULES_TARGET, VERSION } from './constants' export interface BuildOptions { /** @@ -266,15 +266,7 @@ export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions { // handle special build targets if (resolved.target === 'modules') { - // Support browserslist - // "defaults and supports es6-module and supports es6-module-dynamic-import", - resolved.target = [ - 'es2020', // support import.meta.url - 'edge88', - 'firefox78', - 'chrome87', - 'safari13' // transpile nullish coalescing - ] + resolved.target = ESBUILD_MODULES_TARGET } else if (resolved.target === 'esnext' && resolved.minify === 'terser') { // esnext + terser: limit to es2021 so it can be minified by terser resolved.target = 'es2021' diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts index 3b4d496e30bd3c..21792d8fdbccee 100644 --- a/packages/vite/src/node/constants.ts +++ b/packages/vite/src/node/constants.ts @@ -11,6 +11,16 @@ export const DEFAULT_MAIN_FIELDS = [ 'jsnext' ] +// Support browserslist +// "defaults and supports es6-module and supports es6-module-dynamic-import", +export const ESBUILD_MODULES_TARGET = [ + 'es2020', // support import.meta.url + 'edge88', + 'firefox78', + 'chrome87', + 'safari13' // transpile nullish coalescing +] + export const DEFAULT_EXTENSIONS = [ '.mjs', '.js', diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts index 954247e0995967..4fbf8210c7fd35 100644 --- a/packages/vite/src/node/optimizer/index.ts +++ b/packages/vite/src/node/optimizer/index.ts @@ -22,6 +22,7 @@ import { writeFile } from '../utils' import { transformWithEsbuild } from '../plugins/esbuild' +import { ESBUILD_MODULES_TARGET } from '../constants' import { esbuildDepPlugin } from './esbuildDepPlugin' import { scanImports } from './scan' export { initDepsOptimizer, getDepsOptimizer } from './optimizer' @@ -543,7 +544,7 @@ export async function runOptimizeDeps( // avoid replacing `process.env.NODE_ENV` for 'browser' platform: 'neutral', format: 'esm', - target: config.build.target || undefined, + target: isBuild ? config.build.target || undefined : ESBUILD_MODULES_TARGET, external: config.optimizeDeps?.exclude, logLevel: 'error', splitting: true, From 8d931b9c1fd9ff056a79d5ac426bca7d1464c94f Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 23 Jun 2022 11:04:39 +0800 Subject: [PATCH 3/6] chore: update esbuild --- package.json | 2 +- packages/vite/package.json | 2 +- pnpm-lock.yaml | 140 ++++++++++++++++++------------------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index a17dcd6ccb005a..f7bdf23165b198 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@typescript-eslint/parser": "^5.27.1", "conventional-changelog-cli": "^2.2.2", "cross-env": "^7.0.3", - "esbuild": "^0.14.46", + "esbuild": "^0.14.47", "eslint": "^8.17.0", "eslint-define-config": "^1.5.1", "eslint-plugin-import": "^2.26.0", diff --git a/packages/vite/package.json b/packages/vite/package.json index 0412d0e8879532..cade96e9c91236 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -57,7 +57,7 @@ }, "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { - "esbuild": "^0.14.46", + "esbuild": "^0.14.47", "postcss": "^8.4.14", "resolve": "^1.22.0", "rollup": "^2.75.6" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c202f4de11d0d0..93d0b0b8e91585 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,7 +37,7 @@ importers: '@typescript-eslint/parser': ^5.27.1 conventional-changelog-cli: ^2.2.2 cross-env: ^7.0.3 - esbuild: ^0.14.46 + esbuild: ^0.14.47 eslint: ^8.17.0 eslint-define-config: ^1.5.1 eslint-plugin-import: ^2.26.0 @@ -95,7 +95,7 @@ importers: '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i conventional-changelog-cli: 2.2.2 cross-env: 7.0.3 - esbuild: 0.14.46 + esbuild: 0.14.47 eslint: 8.17.0 eslint-define-config: 1.5.1 eslint-plugin-import: 2.26.0_pv5w3e62ssxduf5aiwxbc3knra @@ -235,7 +235,7 @@ importers: dotenv: ^14.3.2 dotenv-expand: ^5.1.0 es-module-lexer: ^0.10.5 - esbuild: ^0.14.46 + esbuild: ^0.14.47 esno: ^0.16.3 estree-walker: ^3.0.1 etag: ^1.8.1 @@ -271,7 +271,7 @@ importers: ufo: ^0.8.4 ws: ^8.8.0 dependencies: - esbuild: 0.14.46 + esbuild: 0.14.47 postcss: 8.4.14 resolve: 1.22.0 rollup: 2.75.6 @@ -3922,8 +3922,8 @@ packages: dev: true optional: true - /esbuild-android-64/0.14.46: - resolution: {integrity: sha512-ZyJqwAcjNbZprs0ZAxnUAOhEhdE5kTKwz+CZuLmZYNLAPyRgBtaC8pT2PCuPifNvV8Cl3yLlrQPaOCjovoyb5g==} + /esbuild-android-64/0.14.47: + resolution: {integrity: sha512-R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -3947,8 +3947,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.46: - resolution: {integrity: sha512-BKcnUksvCijO9ONv6b4SikZE/OZftwJvX91XROODZGQmuwGVg97jmLDVu3lxuHdFlMNNzxh8taJ2mbCWZzH/Iw==} + /esbuild-android-arm64/0.14.47: + resolution: {integrity: sha512-OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -3972,8 +3972,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.46: - resolution: {integrity: sha512-/ss2kO92sUJ9/1nHnMb3+oab8w6dyqKrMtPMvSYJ9KZIYGAZxz/WYxfFprY7Xk+ZxWnnlASSyZlG+If1nVmFYg==} + /esbuild-darwin-64/0.14.47: + resolution: {integrity: sha512-R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -3997,8 +3997,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.46: - resolution: {integrity: sha512-WX0JOaEFf6t+rIjXO6THsf/0fhQAt2Zb0/PSYlvXnuQQAmOmFAfPsuRNocp5ME0NGaUqZd4FxqqmLEVK3RzPAg==} + /esbuild-darwin-arm64/0.14.47: + resolution: {integrity: sha512-seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -4022,8 +4022,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.46: - resolution: {integrity: sha512-o+ozPFuHRCAGCVWU2bLurOUgVkT0jcPEu082VBUY2Q/yLf+B+/3nXzh4Fjp5O21tOvJRTn7hUVydG9j5+vYE6A==} + /esbuild-freebsd-64/0.14.47: + resolution: {integrity: sha512-ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -4047,8 +4047,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.46: - resolution: {integrity: sha512-9zicZ0X43WDKz3sjNfcqYO38xbfJpSWYXB+FxvYYkmBwGA52K0SAu4oKuTTLi8od8X2IIo1x5C5TUNvKDSVJww==} + /esbuild-freebsd-arm64/0.14.47: + resolution: {integrity: sha512-ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -4072,8 +4072,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.46: - resolution: {integrity: sha512-ZnTpZMVb0VGvL99R5eh4OrJwbUyvpM6M88VAMuHP4LvFjuvZrhgefjKqEGuWZZW7JRnAjKqjXLjWdhdSjwMFnQ==} + /esbuild-linux-32/0.14.47: + resolution: {integrity: sha512-FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -4097,8 +4097,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.46: - resolution: {integrity: sha512-ECCRRZtX6l4ubeVhHhiVoK/uYAkvzNqfmR4gP4N/9H9RPu+b8YCcN4bQGp7xCuYIV6Xd41WpOMyO+xpcQvjtQQ==} + /esbuild-linux-64/0.14.47: + resolution: {integrity: sha512-nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -4122,8 +4122,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.46: - resolution: {integrity: sha512-RvTJEi4vj13c5FP9YPp+8Y6x6HK1E7uSqfy3y9UoeaNAzNZWA7fN1U3hQjTL/dy5zTJH5KE64mrt5k5+he+CQA==} + /esbuild-linux-arm/0.14.47: + resolution: {integrity: sha512-ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -4147,8 +4147,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.46: - resolution: {integrity: sha512-HX0TXCHyI0NEWG4jg8LlW1PbZQbnz+PUH56yjx996cgM5pC90u32drKs/tyJiyyQmNk9OXOogjKw7LEdp/Qc1w==} + /esbuild-linux-arm64/0.14.47: + resolution: {integrity: sha512-ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -4172,8 +4172,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.46: - resolution: {integrity: sha512-jnb2NDwGqJUVmxn1v0f7seNdDm0nRNWHP9Z3MrWAGnBCdnnDlsjqRFDnbKoaQvWONEa+rOOr/giK+VL0hgQExA==} + /esbuild-linux-mips64le/0.14.47: + resolution: {integrity: sha512-mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -4197,8 +4197,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.46: - resolution: {integrity: sha512-uu3JTQUrwwauKY9z8yq5MnDyOlT3f2DNOzBcYz4dB78HqwEqilCsifoBGd0WcbED5n57dc59X+LZMTZ8Ose44w==} + /esbuild-linux-ppc64le/0.14.47: + resolution: {integrity: sha512-WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -4214,8 +4214,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.46: - resolution: {integrity: sha512-OB29r1EG44ZY34JnXCRERxo7k4pRKoQdaoRg2HIeCavatsXZwW4LCakpLnMQ72vXT1HtpBUABEjHkKkn5JyrUg==} + /esbuild-linux-riscv64/0.14.47: + resolution: {integrity: sha512-1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -4231,8 +4231,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.46: - resolution: {integrity: sha512-XQ/U9TueMSGYyPTKyZsJVraiuvxhwCDIMn/QwFXCRCJ6H/Cy/Rq33u9qhpeSziinHKfzJROGx5A8mQY6aYamdQ==} + /esbuild-linux-s390x/0.14.47: + resolution: {integrity: sha512-eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -4256,8 +4256,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.46: - resolution: {integrity: sha512-i15BwqHaAIFp1vBJkitAbHtwXcLk9TdHs/Ia1xGIAutQYXSJNPLM3Z4B4hyfHNEFl2yBqBIYpglMohv2ClNdOQ==} + /esbuild-netbsd-64/0.14.47: + resolution: {integrity: sha512-Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -4281,8 +4281,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.46: - resolution: {integrity: sha512-XwOIFCE140Y/PvjrwjFfa/QLWBuvhR1mPCOa35mKx02jt++wPNgf0qhn6HfdVC3vQe7R46RwTp4q2cp99fepEg==} + /esbuild-openbsd-64/0.14.47: + resolution: {integrity: sha512-QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -4306,8 +4306,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.46: - resolution: {integrity: sha512-+kV3JnmfdxBVpHyFvuGXWtu6tXxXApOLPkSrVkMJf6+ns/3PLtPndpzwCzHjD+qYUEk8ln4MA+ufQ2qmjW5mZg==} + /esbuild-sunos-64/0.14.47: + resolution: {integrity: sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -4331,8 +4331,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.46: - resolution: {integrity: sha512-gzGC1Q11B/Bo5A2EX4N22oigWmhL7Z0eDyc8kbSoJjqSrGQuRE7B0uMpluO+q0O/gZ1S3zdw+M4PCWlqOIeXLA==} + /esbuild-windows-32/0.14.47: + resolution: {integrity: sha512-H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -4356,8 +4356,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.46: - resolution: {integrity: sha512-Do2daaskfOjmCB7o3ygz6fD3K6SPjZLERiZLktzHz2oUCwsebKu/gmop0+j/XdrVIXC32wFzHzDS+9CTu9OShw==} + /esbuild-windows-64/0.14.47: + resolution: {integrity: sha512-/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -4381,8 +4381,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.46: - resolution: {integrity: sha512-VEzMy6bM60/HT/URTDElyhfi2Pk0quCCrEhRlI4MRno/AIqYUGw0rZwkPl6PeoqVI6BgoBHGY576GWTiPmshCA==} + /esbuild-windows-arm64/0.14.47: + resolution: {integrity: sha512-HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -4441,32 +4441,32 @@ packages: esbuild-windows-arm64: 0.14.38 dev: true - /esbuild/0.14.46: - resolution: {integrity: sha512-vdm5G1JdZBktva8dwQci/s44VbeBUg8g907xoZx77mqFZ4gU5GlMULNsdGeID+qXCXocsfYSGtE0LvqH3eiNQg==} + /esbuild/0.14.47: + resolution: {integrity: sha512-wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.46 - esbuild-android-arm64: 0.14.46 - esbuild-darwin-64: 0.14.46 - esbuild-darwin-arm64: 0.14.46 - esbuild-freebsd-64: 0.14.46 - esbuild-freebsd-arm64: 0.14.46 - esbuild-linux-32: 0.14.46 - esbuild-linux-64: 0.14.46 - esbuild-linux-arm: 0.14.46 - esbuild-linux-arm64: 0.14.46 - esbuild-linux-mips64le: 0.14.46 - esbuild-linux-ppc64le: 0.14.46 - esbuild-linux-riscv64: 0.14.46 - esbuild-linux-s390x: 0.14.46 - esbuild-netbsd-64: 0.14.46 - esbuild-openbsd-64: 0.14.46 - esbuild-sunos-64: 0.14.46 - esbuild-windows-32: 0.14.46 - esbuild-windows-64: 0.14.46 - esbuild-windows-arm64: 0.14.46 + esbuild-android-64: 0.14.47 + esbuild-android-arm64: 0.14.47 + esbuild-darwin-64: 0.14.47 + esbuild-darwin-arm64: 0.14.47 + esbuild-freebsd-64: 0.14.47 + esbuild-freebsd-arm64: 0.14.47 + esbuild-linux-32: 0.14.47 + esbuild-linux-64: 0.14.47 + esbuild-linux-arm: 0.14.47 + esbuild-linux-arm64: 0.14.47 + esbuild-linux-mips64le: 0.14.47 + esbuild-linux-ppc64le: 0.14.47 + esbuild-linux-riscv64: 0.14.47 + esbuild-linux-s390x: 0.14.47 + esbuild-netbsd-64: 0.14.47 + esbuild-openbsd-64: 0.14.47 + esbuild-sunos-64: 0.14.47 + esbuild-windows-32: 0.14.47 + esbuild-windows-64: 0.14.47 + esbuild-windows-arm64: 0.14.47 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -7334,7 +7334,7 @@ packages: '@babel/code-frame': 7.16.7 dev: true - /rollup-plugin-esbuild/4.9.1_cwxz74zmd3ygpekohj7vrjvhry: + /rollup-plugin-esbuild/4.9.1_ktu2kzacvi5wdos6kd33ysa7ja: resolution: {integrity: sha512-qn/x7Wz9p3Xnva99qcb+nopH0d2VJwVnsxJTGEg+Sh2Z3tqQl33MhOwzekVo1YTKgv+yAmosjcBRJygMfGrtLw==} engines: {node: '>=12'} peerDependencies: @@ -7344,7 +7344,7 @@ packages: '@rollup/pluginutils': 4.2.1 debug: 4.3.4 es-module-lexer: 0.9.3 - esbuild: 0.14.46 + esbuild: 0.14.47 joycon: 3.1.1 jsonc-parser: 3.0.0 rollup: 2.75.6 @@ -8247,7 +8247,7 @@ packages: chalk: 5.0.1 consola: 2.15.3 defu: 6.0.0 - esbuild: 0.14.46 + esbuild: 0.14.47 hookable: 5.1.1 jiti: 1.13.0 magic-string: 0.26.1 @@ -8261,7 +8261,7 @@ packages: rimraf: 3.0.2 rollup: 2.75.6 rollup-plugin-dts: 4.2.1_7tpfgeokwovvsnuai4vwqwidpi - rollup-plugin-esbuild: 4.9.1_cwxz74zmd3ygpekohj7vrjvhry + rollup-plugin-esbuild: 4.9.1_ktu2kzacvi5wdos6kd33ysa7ja scule: 0.2.1 typescript: 4.6.4 untyped: 0.4.4 From 3eaca61322db2cb63e6ca58cbe239ea51878e096 Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 23 Jun 2022 11:17:12 +0800 Subject: [PATCH 4/6] chore: add top-level-await --- packages/vite/src/node/optimizer/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts index 8e0c37fb161e59..2d4bd6fc0d9aac 100644 --- a/packages/vite/src/node/optimizer/index.ts +++ b/packages/vite/src/node/optimizer/index.ts @@ -575,6 +575,7 @@ export async function runOptimizeDeps( supported: { 'dynamic-import': true, 'import-meta': true, + 'top-level-await': true, ...esbuildOptions.supported } }) From edf4408f79657b4c02b384b51c7dce3282dcadde Mon Sep 17 00:00:00 2001 From: bluwy Date: Thu, 23 Jun 2022 11:20:54 +0800 Subject: [PATCH 5/6] chore: test lib umd and iife regex --- playground/lib/vite.config.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/playground/lib/vite.config.js b/playground/lib/vite.config.js index f4cacb9d73d3cc..d9fb932f535ebb 100644 --- a/playground/lib/vite.config.js +++ b/playground/lib/vite.config.js @@ -5,6 +5,12 @@ const path = require('path') * @type {import('vite').UserConfig} */ module.exports = { + esbuild: { + supported: { + // Force esbuild inject helpers to test regex + 'object-rest-spread': false + } + }, build: { rollupOptions: { output: { From 549036ea030964e788b10860c3566c812c5d5c77 Mon Sep 17 00:00:00 2001 From: bluwy Date: Fri, 24 Jun 2022 14:26:19 +0800 Subject: [PATCH 6/6] chore: remove top-level-await --- packages/vite/src/node/optimizer/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts index 2d4bd6fc0d9aac..8e0c37fb161e59 100644 --- a/packages/vite/src/node/optimizer/index.ts +++ b/packages/vite/src/node/optimizer/index.ts @@ -575,7 +575,6 @@ export async function runOptimizeDeps( supported: { 'dynamic-import': true, 'import-meta': true, - 'top-level-await': true, ...esbuildOptions.supported } })