From 484b5de0510cfe833a46632d806397f6592a1a0d Mon Sep 17 00:00:00 2001 From: akarachen Date: Sat, 24 Aug 2024 14:03:50 +0800 Subject: [PATCH 1/3] fix: cjs build of vite node server --- packages/vite-node/rollup.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/vite-node/rollup.config.js b/packages/vite-node/rollup.config.js index ede4289d164e..3735ff88c261 100644 --- a/packages/vite-node/rollup.config.js +++ b/packages/vite-node/rollup.config.js @@ -32,6 +32,9 @@ const external = [ 'node:events', 'node:vm', ] +const esmOnly = [ + 'tinyrainbow', +] const plugins = [ resolve({ @@ -68,7 +71,7 @@ export default defineConfig([ entryFileNames: '[name].cjs', chunkFileNames: 'chunk-[name].cjs', }, - external, + external: external.filter(v => !esmOnly.includes(v)), plugins, onwarn, }, From fc43dffa42ce48ed5a027870ca3c63e20245fd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=B0=98=E5=AE=A4=E5=86=85=E7=82=B9=E5=A2=A8?= Date: Fri, 30 Aug 2024 00:17:32 +0800 Subject: [PATCH 2/3] fix: tinyrainbow --- packages/vite-node/package.json | 4 ++-- packages/vite-node/rollup.config.js | 5 +---- packages/vitest/LICENSE.md | 29 +++++++++++++++++++++++++++++ pnpm-lock.yaml | 6 +++--- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/packages/vite-node/package.json b/packages/vite-node/package.json index c3c5b79767cb..7edcb07c6601 100644 --- a/packages/vite-node/package.json +++ b/packages/vite-node/package.json @@ -85,11 +85,11 @@ "cac": "^6.7.14", "debug": "^4.3.6", "pathe": "^1.1.2", - "tinyrainbow": "^1.2.0", "vite": "^5.0.0" }, "devDependencies": { "@jridgewell/trace-mapping": "^0.3.25", - "@types/debug": "^4.1.12" + "@types/debug": "^4.1.12", + "tinyrainbow": "^1.2.0" } } diff --git a/packages/vite-node/rollup.config.js b/packages/vite-node/rollup.config.js index 3735ff88c261..ede4289d164e 100644 --- a/packages/vite-node/rollup.config.js +++ b/packages/vite-node/rollup.config.js @@ -32,9 +32,6 @@ const external = [ 'node:events', 'node:vm', ] -const esmOnly = [ - 'tinyrainbow', -] const plugins = [ resolve({ @@ -71,7 +68,7 @@ export default defineConfig([ entryFileNames: '[name].cjs', chunkFileNames: 'chunk-[name].cjs', }, - external: external.filter(v => !esmOnly.includes(v)), + external, plugins, onwarn, }, diff --git a/packages/vitest/LICENSE.md b/packages/vitest/LICENSE.md index d54def96b44e..9f826da7d2d2 100644 --- a/packages/vitest/LICENSE.md +++ b/packages/vitest/LICENSE.md @@ -1235,6 +1235,35 @@ Repository: sindresorhus/p-locate --------------------------------------- +## package-manager-detector +License: MIT +By: Anthony Fu +Repository: git+https://github.com/antfu-collective/package-manager-detector.git + +> MIT License +> +> Copyright (c) 2020-PRESENT Anthony Fu +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +> SOFTWARE. + +--------------------------------------- + ## picomatch License: MIT By: Jon Schlinkert diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 206325367caf..5aafcbdc1932 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -889,9 +889,6 @@ importers: pathe: specifier: ^1.1.2 version: 1.1.2 - tinyrainbow: - specifier: ^1.2.0 - version: 1.2.0 vite: specifier: ^5.4.0 version: 5.4.0(@types/node@20.14.15)(terser@5.22.0) @@ -902,6 +899,9 @@ importers: '@types/debug': specifier: ^4.1.12 version: 4.1.12 + tinyrainbow: + specifier: ^1.2.0 + version: 1.2.0 packages/vitest: dependencies: From 5ba6938069d0c2c720a0a5a4dbe5e63c495cfdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E5=B0=98=E5=AE=A4=E5=86=85=E7=82=B9=E5=A2=A8?= Date: Fri, 30 Aug 2024 00:19:21 +0800 Subject: [PATCH 3/3] revert: unexpected license change This reverts commit fc43dffa42ce48ed5a027870ca3c63e20245fd83. --- packages/vitest/LICENSE.md | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/packages/vitest/LICENSE.md b/packages/vitest/LICENSE.md index 9f826da7d2d2..d54def96b44e 100644 --- a/packages/vitest/LICENSE.md +++ b/packages/vitest/LICENSE.md @@ -1235,35 +1235,6 @@ Repository: sindresorhus/p-locate --------------------------------------- -## package-manager-detector -License: MIT -By: Anthony Fu -Repository: git+https://github.com/antfu-collective/package-manager-detector.git - -> MIT License -> -> Copyright (c) 2020-PRESENT Anthony Fu -> -> Permission is hereby granted, free of charge, to any person obtaining a copy -> of this software and associated documentation files (the "Software"), to deal -> in the Software without restriction, including without limitation the rights -> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -> copies of the Software, and to permit persons to whom the Software is -> furnished to do so, subject to the following conditions: -> -> The above copyright notice and this permission notice shall be included in all -> copies or substantial portions of the Software. -> -> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -> SOFTWARE. - ---------------------------------------- - ## picomatch License: MIT By: Jon Schlinkert