From 77d73df1c60affd38e5372d460717ab5eaad2ca3 Mon Sep 17 00:00:00 2001 From: fi3ework Date: Tue, 16 Jul 2024 13:30:12 +0800 Subject: [PATCH] test: chdir before build (#37) --- .../alias/__snapshots__/index.test.ts.snap | 8 +- e2e/cases/alias/rslib.config.ts | 5 +- .../type-commonjs/rslib.config.ts | 3 +- .../autoExtension/type-module/rslib.config.ts | 3 +- e2e/cases/define/rslib.config.ts | 3 +- e2e/cases/externals/browser/rslib.config.ts | 3 +- e2e/cases/externals/node/rslib.config.ts | 3 +- .../config/__snapshots__/index.test.ts.snap | 10 +- e2e/cases/syntax/config/rslib.config.ts | 3 +- .../default/__snapshots__/index.test.ts.snap | 4 +- e2e/cases/syntax/default/rslib.config.ts | 3 +- e2e/scripts/shared.ts | 1 + package.json | 2 +- pnpm-lock.yaml | 255 +++++++----------- setupVitestTests.js | 4 - setupVitestTests.ts | 8 + vitest.workspace.ts | 2 +- 17 files changed, 124 insertions(+), 196 deletions(-) delete mode 100644 setupVitestTests.js create mode 100644 setupVitestTests.ts diff --git a/e2e/cases/alias/__snapshots__/index.test.ts.snap b/e2e/cases/alias/__snapshots__/index.test.ts.snap index 5dc66e72..bf70ab6f 100644 --- a/e2e/cases/alias/__snapshots__/index.test.ts.snap +++ b/e2e/cases/alias/__snapshots__/index.test.ts.snap @@ -2,10 +2,10 @@ exports[`source.alias 1`] = ` " -;// CONCATENATED MODULE: ./e2e/cases/alias/src/a.ts +;// CONCATENATED MODULE: ./src/a.ts const a = 'hello world'; -;// CONCATENATED MODULE: ./e2e/cases/alias/src/index.ts +;// CONCATENATED MODULE: ./src/index.ts console.info(a); @@ -18,10 +18,10 @@ exports[`source.alias 2`] = ` "use strict"; var __webpack_exports__ = {}; -;// CONCATENATED MODULE: ./e2e/cases/alias/src/a.ts +;// CONCATENATED MODULE: ./src/a.ts const a = 'hello world'; -;// CONCATENATED MODULE: ./e2e/cases/alias/src/index.ts +;// CONCATENATED MODULE: ./src/index.ts console.info(a); diff --git a/e2e/cases/alias/rslib.config.ts b/e2e/cases/alias/rslib.config.ts index 1dd1a34f..e713354f 100644 --- a/e2e/cases/alias/rslib.config.ts +++ b/e2e/cases/alias/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -6,10 +5,10 @@ export default defineConfig({ lib: [generateBundleEsmConfig(__dirname), generateBundleCjsConfig(__dirname)], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, alias: { - '@src': join(__dirname, 'src'), + '@src': 'src', }, }, }); diff --git a/e2e/cases/autoExtension/type-commonjs/rslib.config.ts b/e2e/cases/autoExtension/type-commonjs/rslib.config.ts index 73a7b5ab..0e80fc21 100644 --- a/e2e/cases/autoExtension/type-commonjs/rslib.config.ts +++ b/e2e/cases/autoExtension/type-commonjs/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, @@ -16,7 +15,7 @@ export default defineConfig({ ], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, }); diff --git a/e2e/cases/autoExtension/type-module/rslib.config.ts b/e2e/cases/autoExtension/type-module/rslib.config.ts index 73a7b5ab..0e80fc21 100644 --- a/e2e/cases/autoExtension/type-module/rslib.config.ts +++ b/e2e/cases/autoExtension/type-module/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, @@ -16,7 +15,7 @@ export default defineConfig({ ], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, }); diff --git a/e2e/cases/define/rslib.config.ts b/e2e/cases/define/rslib.config.ts index ca3e8e40..ce3ac260 100644 --- a/e2e/cases/define/rslib.config.ts +++ b/e2e/cases/define/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -6,7 +5,7 @@ export default defineConfig({ lib: [generateBundleEsmConfig(__dirname), generateBundleCjsConfig(__dirname)], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, define: { VERSION: JSON.stringify('1.0.0'), diff --git a/e2e/cases/externals/browser/rslib.config.ts b/e2e/cases/externals/browser/rslib.config.ts index 1a385402..0ccda950 100644 --- a/e2e/cases/externals/browser/rslib.config.ts +++ b/e2e/cases/externals/browser/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -6,7 +5,7 @@ export default defineConfig({ lib: [generateBundleEsmConfig(__dirname), generateBundleCjsConfig(__dirname)], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, output: { diff --git a/e2e/cases/externals/node/rslib.config.ts b/e2e/cases/externals/node/rslib.config.ts index 1adc696c..8025fca1 100644 --- a/e2e/cases/externals/node/rslib.config.ts +++ b/e2e/cases/externals/node/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -9,7 +8,7 @@ export default defineConfig({ ], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, output: { diff --git a/e2e/cases/syntax/config/__snapshots__/index.test.ts.snap b/e2e/cases/syntax/config/__snapshots__/index.test.ts.snap index 4a6d1c04..68ee31a6 100644 --- a/e2e/cases/syntax/config/__snapshots__/index.test.ts.snap +++ b/e2e/cases/syntax/config/__snapshots__/index.test.ts.snap @@ -2,7 +2,7 @@ exports[`should downgrade class private method by default 1`] = ` " -;// CONCATENATED MODULE: ./node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_class_private_method_get.js +;// CONCATENATED MODULE: ../../../../node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_class_private_method_get.js function _class_private_method_get(receiver, privateSet, fn) { if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance"); @@ -10,7 +10,7 @@ function _class_private_method_get(receiver, privateSet, fn) { } -;// CONCATENATED MODULE: ./node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_check_private_redeclaration.js +;// CONCATENATED MODULE: ../../../../node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_check_private_redeclaration.js function _check_private_redeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); @@ -18,7 +18,7 @@ function _check_private_redeclaration(obj, privateCollection) { } -;// CONCATENATED MODULE: ./node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_class_private_method_init.js +;// CONCATENATED MODULE: ../../../../node_modules/.pnpm/@swc+helpers@0.5.11/node_modules/@swc/helpers/esm/_class_private_method_init.js function _class_private_method_init(obj, privateSet) { @@ -27,7 +27,7 @@ function _class_private_method_init(obj, privateSet) { } -;// CONCATENATED MODULE: ./e2e/cases/syntax/config/src/foo.ts +;// CONCATENATED MODULE: ./src/foo.ts var _bar = new WeakSet(); @@ -40,7 +40,7 @@ class Foo { function bar() {} /*#__PURE__*/ -;// CONCATENATED MODULE: ./e2e/cases/syntax/config/src/index.ts +;// CONCATENATED MODULE: ./src/index.ts export { Foo }; diff --git a/e2e/cases/syntax/config/rslib.config.ts b/e2e/cases/syntax/config/rslib.config.ts index 792ed00f..6ce0a9bc 100644 --- a/e2e/cases/syntax/config/rslib.config.ts +++ b/e2e/cases/syntax/config/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -17,7 +16,7 @@ export default defineConfig({ ], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, }); diff --git a/e2e/cases/syntax/default/__snapshots__/index.test.ts.snap b/e2e/cases/syntax/default/__snapshots__/index.test.ts.snap index 5ac20c8b..01153bb3 100644 --- a/e2e/cases/syntax/default/__snapshots__/index.test.ts.snap +++ b/e2e/cases/syntax/default/__snapshots__/index.test.ts.snap @@ -2,7 +2,7 @@ exports[`should downgrade class private method by default 1`] = ` " -;// CONCATENATED MODULE: ./e2e/cases/syntax/default/src/foo.ts +;// CONCATENATED MODULE: ./src/foo.ts class Foo { constructor(){ this.#bar(); @@ -11,7 +11,7 @@ class Foo { } -;// CONCATENATED MODULE: ./e2e/cases/syntax/default/src/index.ts +;// CONCATENATED MODULE: ./src/index.ts export { Foo }; diff --git a/e2e/cases/syntax/default/rslib.config.ts b/e2e/cases/syntax/default/rslib.config.ts index 234013cd..db7071fc 100644 --- a/e2e/cases/syntax/default/rslib.config.ts +++ b/e2e/cases/syntax/default/rslib.config.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path'; import { defineConfig } from '@rslib/core'; import { generateBundleCjsConfig, generateBundleEsmConfig } from '#shared'; @@ -6,7 +5,7 @@ export default defineConfig({ lib: [generateBundleEsmConfig(__dirname), generateBundleCjsConfig(__dirname)], source: { entry: { - main: join(__dirname, 'src/index.ts'), + main: './src/index.ts', }, }, }); diff --git a/e2e/scripts/shared.ts b/e2e/scripts/shared.ts index da256b60..24e80ddc 100644 --- a/e2e/scripts/shared.ts +++ b/e2e/scripts/shared.ts @@ -65,6 +65,7 @@ export async function getEntryJsResults(rslibConfig: RslibConfig) { export const buildAndGetEntryJsResults = async (fixturePath: string) => { const rslibConfig = await loadConfig(join(fixturePath, 'rslib.config.ts')); + process.chdir(fixturePath); await build(rslibConfig); const results = await getEntryJsResults(rslibConfig); return { diff --git a/package.json b/package.json index a7f0db90..1ae78a0b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "prettier-plugin-packagejson": "^2.5.0", "simple-git-hooks": "^2.11.1", "typescript": "^5.5.3", - "vitest": "^1.6.0" + "vitest": "^2.0.1" }, "packageManager": "pnpm@9.5.0", "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29d1c50e..c3b19ff0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -51,8 +51,8 @@ importers: specifier: ^5.5.3 version: 5.5.3 vitest: - specifier: ^1.6.0 - version: 1.6.0(@types/node@18.19.39)(terser@5.19.2) + specifier: ^2.0.1 + version: 2.0.3(@types/node@18.19.39)(terser@5.19.2) e2e: dependencies: @@ -1223,20 +1223,23 @@ packages: resolution: {integrity: sha512-IBBb+iI2NLu4VQn3Vwldyi2QwaXt5+hTyh58ggAMoCGE6DJmPvwL3KPBWcJl1m9LYPChBLE980Jw+CS4Wokqxw==} hasBin: true - '@vitest/expect@1.6.0': - resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==} + '@vitest/expect@2.0.3': + resolution: {integrity: sha512-X6AepoOYePM0lDNUPsGXTxgXZAl3EXd0GYe/MZyVE4HzkUqyUVC6S3PrY5mClDJ6/7/7vALLMV3+xD/Ko60Hqg==} - '@vitest/runner@1.6.0': - resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==} + '@vitest/pretty-format@2.0.3': + resolution: {integrity: sha512-URM4GLsB2xD37nnTyvf6kfObFafxmycCL8un3OC9gaCs5cti2u+5rJdIflZ2fUJUen4NbvF6jCufwViAFLvz1g==} - '@vitest/snapshot@1.6.0': - resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==} + '@vitest/runner@2.0.3': + resolution: {integrity: sha512-EmSP4mcjYhAcuBWwqgpjR3FYVeiA4ROzRunqKltWjBfLNs1tnMLtF+qtgd5ClTwkDP6/DGlKJTNa6WxNK0bNYQ==} - '@vitest/spy@1.6.0': - resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==} + '@vitest/snapshot@2.0.3': + resolution: {integrity: sha512-6OyA6v65Oe3tTzoSuRPcU6kh9m+mPL1vQ2jDlPdn9IQoUxl8rXhBnfICNOC+vwxWY684Vt5UPgtcA2aPFBb6wg==} - '@vitest/utils@1.6.0': - resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==} + '@vitest/spy@2.0.3': + resolution: {integrity: sha512-sfqyAw/ypOXlaj4S+w8689qKM1OyPOqnonqOc9T91DsoHbfN5mU7FdifWWv3MtQFf0lEUstEwR9L/q/M390C+A==} + + '@vitest/utils@2.0.3': + resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==} '@yarnpkg/lockfile@1.1.0': resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} @@ -1249,10 +1252,6 @@ packages: resolution: {integrity: sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==} hasBin: true - acorn-walk@8.3.3: - resolution: {integrity: sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==} - engines: {node: '>=0.4.0'} - acorn@8.12.1: resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} @@ -1294,8 +1293,9 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - assertion-error@1.1.0: - resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} + assertion-error@2.0.1: + resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} + engines: {node: '>=12'} astral-regex@2.0.0: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} @@ -1348,9 +1348,9 @@ packages: caniuse-lite@1.0.30001641: resolution: {integrity: sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==} - chai@4.4.1: - resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} - engines: {node: '>=4'} + chai@5.1.1: + resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} + engines: {node: '>=12'} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -1372,8 +1372,9 @@ packages: engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0} hasBin: true - check-error@1.0.3: - resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + check-error@2.1.1: + resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} + engines: {node: '>= 16'} ci-info@3.9.0: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} @@ -1430,9 +1431,6 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - confbox@0.1.7: - resolution: {integrity: sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==} - convert-source-map@1.8.0: resolution: {integrity: sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==} @@ -1474,8 +1472,8 @@ packages: supports-color: optional: true - deep-eql@4.1.4: - resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==} + deep-eql@5.0.2: + resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} defaults@1.0.4: @@ -1842,9 +1840,6 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@9.0.0: - resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} - js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -1890,10 +1885,6 @@ packages: resolution: {integrity: sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==} engines: {node: '>= 12.13.0'} - local-pkg@0.5.0: - resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} - engines: {node: '>=14'} - locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -1922,8 +1913,8 @@ packages: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true - loupe@2.3.7: - resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} + loupe@3.1.1: + resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==} lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} @@ -1975,9 +1966,6 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - mlly@1.7.1: - resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==} - mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -2066,10 +2054,6 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-limit@5.0.0: - resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} - engines: {node: '>=18'} - p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -2109,8 +2093,9 @@ packages: pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - pathval@1.1.1: - resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} + pathval@2.0.0: + resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} + engines: {node: '>= 14.16'} picocolors@1.0.1: resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} @@ -2131,9 +2116,6 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - pkg-types@1.1.3: - resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==} - playwright-core@1.43.1: resolution: {integrity: sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==} engines: {node: '>=16'} @@ -2410,9 +2392,6 @@ packages: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - strip-literal@2.1.0: - resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} - strong-log-transformer@2.1.0: resolution: {integrity: sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==} engines: {node: '>=4'} @@ -2472,12 +2451,16 @@ packages: tinybench@2.8.0: resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} - tinypool@0.8.4: - resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} + tinypool@1.0.0: + resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==} + engines: {node: ^18.0.0 || >=20.0.0} + + tinyrainbow@1.2.0: + resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} engines: {node: '>=14.0.0'} - tinyspy@2.2.1: - resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==} + tinyspy@3.0.0: + resolution: {integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==} engines: {node: '>=14.0.0'} tmp@0.0.33: @@ -2510,10 +2493,6 @@ packages: tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - type-detect@4.0.8: - resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} - engines: {node: '>=4'} - type-fest@3.13.1: resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==} engines: {node: '>=14.16'} @@ -2523,9 +2502,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - ufo@1.5.3: - resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} - undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} @@ -2549,8 +2525,8 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - vite-node@1.6.0: - resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==} + vite-node@2.0.3: + resolution: {integrity: sha512-14jzwMx7XTcMB+9BhGQyoEAmSl0eOr3nrnn+Z12WNERtOvLN+d2scbRUvyni05rT3997Bg+rZb47NyP4IQPKXg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -2582,15 +2558,15 @@ packages: terser: optional: true - vitest@1.6.0: - resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==} + vitest@2.0.3: + resolution: {integrity: sha512-o3HRvU93q6qZK4rI2JrhKyZMMuxg/JRt30E6qeQs6ueaiz5hr1cPj+Sk2kATgQzMMqsa2DiNI0TIK++1ULx8Jw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.6.0 - '@vitest/ui': 1.6.0 + '@vitest/browser': 2.0.3 + '@vitest/ui': 2.0.3 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2660,10 +2636,6 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - yocto-queue@1.1.1: - resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==} - engines: {node: '>=12.20'} - snapshots: '@ampproject/remapping@2.3.0': @@ -3666,34 +3638,38 @@ snapshots: '@vercel/ncc@0.38.1': {} - '@vitest/expect@1.6.0': + '@vitest/expect@2.0.3': + dependencies: + '@vitest/spy': 2.0.3 + '@vitest/utils': 2.0.3 + chai: 5.1.1 + tinyrainbow: 1.2.0 + + '@vitest/pretty-format@2.0.3': dependencies: - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - chai: 4.4.1 + tinyrainbow: 1.2.0 - '@vitest/runner@1.6.0': + '@vitest/runner@2.0.3': dependencies: - '@vitest/utils': 1.6.0 - p-limit: 5.0.0 + '@vitest/utils': 2.0.3 pathe: 1.1.2 - '@vitest/snapshot@1.6.0': + '@vitest/snapshot@2.0.3': dependencies: + '@vitest/pretty-format': 2.0.3 magic-string: 0.30.10 pathe: 1.1.2 - pretty-format: 29.7.0 - '@vitest/spy@1.6.0': + '@vitest/spy@2.0.3': dependencies: - tinyspy: 2.2.1 + tinyspy: 3.0.0 - '@vitest/utils@1.6.0': + '@vitest/utils@2.0.3': dependencies: - diff-sequences: 29.6.3 + '@vitest/pretty-format': 2.0.3 estree-walker: 3.0.3 - loupe: 2.3.7 - pretty-format: 29.7.0 + loupe: 3.1.1 + tinyrainbow: 1.2.0 '@yarnpkg/lockfile@1.1.0': {} @@ -3706,10 +3682,6 @@ snapshots: dependencies: argparse: 2.0.1 - acorn-walk@8.3.3: - dependencies: - acorn: 8.12.1 - acorn@8.12.1: {} ajv@8.16.0: @@ -3743,7 +3715,7 @@ snapshots: array-union@2.1.0: {} - assertion-error@1.1.0: {} + assertion-error@2.0.1: {} astral-regex@2.0.0: {} @@ -3802,15 +3774,13 @@ snapshots: caniuse-lite@1.0.30001641: {} - chai@4.4.1: + chai@5.1.1: dependencies: - assertion-error: 1.1.0 - check-error: 1.0.3 - deep-eql: 4.1.4 - get-func-name: 2.0.2 - loupe: 2.3.7 - pathval: 1.1.1 - type-detect: 4.0.8 + assertion-error: 2.0.1 + check-error: 2.1.1 + deep-eql: 5.0.2 + loupe: 3.1.1 + pathval: 2.0.0 chalk@2.4.2: dependencies: @@ -3839,9 +3809,7 @@ snapshots: table: 6.8.2 type-fest: 3.13.1 - check-error@1.0.3: - dependencies: - get-func-name: 2.0.2 + check-error@2.1.1: {} ci-info@3.9.0: {} @@ -3885,8 +3853,6 @@ snapshots: concat-map@0.0.1: {} - confbox@0.1.7: {} - convert-source-map@1.8.0: dependencies: safe-buffer: 5.1.2 @@ -3921,9 +3887,7 @@ snapshots: dependencies: ms: 2.1.2 - deep-eql@4.1.4: - dependencies: - type-detect: 4.0.8 + deep-eql@5.0.2: {} defaults@1.0.4: dependencies: @@ -4306,8 +4270,6 @@ snapshots: js-tokens@4.0.0: {} - js-tokens@9.0.0: {} - js-yaml@3.14.1: dependencies: argparse: 1.0.10 @@ -4348,11 +4310,6 @@ snapshots: loader-utils@3.3.1: {} - local-pkg@0.5.0: - dependencies: - mlly: 1.7.1 - pkg-types: 1.1.3 - locate-path@5.0.0: dependencies: p-locate: 4.1.0 @@ -4378,7 +4335,7 @@ snapshots: dependencies: js-tokens: 4.0.0 - loupe@2.3.7: + loupe@3.1.1: dependencies: get-func-name: 2.0.2 @@ -4428,13 +4385,6 @@ snapshots: minimist@1.2.8: {} - mlly@1.7.1: - dependencies: - acorn: 8.12.1 - pathe: 1.1.2 - pkg-types: 1.1.3 - ufo: 1.5.3 - mri@1.2.0: {} ms@2.1.2: {} @@ -4560,10 +4510,6 @@ snapshots: dependencies: yocto-queue: 0.1.0 - p-limit@5.0.0: - dependencies: - yocto-queue: 1.1.1 - p-locate@4.1.0: dependencies: p-limit: 2.3.0 @@ -4588,7 +4534,7 @@ snapshots: pathe@1.1.2: {} - pathval@1.1.1: {} + pathval@2.0.0: {} picocolors@1.0.1: {} @@ -4602,12 +4548,6 @@ snapshots: dependencies: find-up: 4.1.0 - pkg-types@1.1.3: - dependencies: - confbox: 0.1.7 - mlly: 1.7.1 - pathe: 1.1.2 - playwright-core@1.43.1: {} playwright@1.43.1: @@ -4878,10 +4818,6 @@ snapshots: strip-final-newline@3.0.0: {} - strip-literal@2.1.0: - dependencies: - js-tokens: 9.0.0 - strong-log-transformer@2.1.0: dependencies: duplexer: 0.1.2 @@ -4951,9 +4887,11 @@ snapshots: tinybench@2.8.0: {} - tinypool@0.8.4: {} + tinypool@1.0.0: {} - tinyspy@2.2.1: {} + tinyrainbow@1.2.0: {} + + tinyspy@3.0.0: {} tmp@0.0.33: dependencies: @@ -4983,14 +4921,10 @@ snapshots: tslib@2.6.3: {} - type-detect@4.0.8: {} - type-fest@3.13.1: {} typescript@5.5.3: {} - ufo@1.5.3: {} - undici-types@5.26.5: {} universalify@0.1.2: {} @@ -5009,12 +4943,12 @@ snapshots: util-deprecate@1.0.2: {} - vite-node@1.6.0(@types/node@18.19.39)(terser@5.19.2): + vite-node@2.0.3(@types/node@18.19.39)(terser@5.19.2): dependencies: cac: 6.7.14 debug: 4.3.5 pathe: 1.1.2 - picocolors: 1.0.1 + tinyrainbow: 1.2.0 vite: 5.3.3(@types/node@18.19.39)(terser@5.19.2) transitivePeerDependencies: - '@types/node' @@ -5036,27 +4970,26 @@ snapshots: fsevents: 2.3.3 terser: 5.19.2 - vitest@1.6.0(@types/node@18.19.39)(terser@5.19.2): + vitest@2.0.3(@types/node@18.19.39)(terser@5.19.2): dependencies: - '@vitest/expect': 1.6.0 - '@vitest/runner': 1.6.0 - '@vitest/snapshot': 1.6.0 - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - acorn-walk: 8.3.3 - chai: 4.4.1 + '@ampproject/remapping': 2.3.0 + '@vitest/expect': 2.0.3 + '@vitest/pretty-format': 2.0.3 + '@vitest/runner': 2.0.3 + '@vitest/snapshot': 2.0.3 + '@vitest/spy': 2.0.3 + '@vitest/utils': 2.0.3 + chai: 5.1.1 debug: 4.3.5 execa: 8.0.1 - local-pkg: 0.5.0 magic-string: 0.30.10 pathe: 1.1.2 - picocolors: 1.0.1 std-env: 3.7.0 - strip-literal: 2.1.0 tinybench: 2.8.0 - tinypool: 0.8.4 + tinypool: 1.0.0 + tinyrainbow: 1.2.0 vite: 5.3.3(@types/node@18.19.39)(terser@5.19.2) - vite-node: 1.6.0(@types/node@18.19.39)(terser@5.19.2) + vite-node: 2.0.3(@types/node@18.19.39)(terser@5.19.2) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 18.19.39 @@ -5120,5 +5053,3 @@ snapshots: yargs-parser: 21.1.1 yocto-queue@0.1.0: {} - - yocto-queue@1.1.1: {} diff --git a/setupVitestTests.js b/setupVitestTests.js deleted file mode 100644 index 480544fe..00000000 --- a/setupVitestTests.js +++ /dev/null @@ -1,4 +0,0 @@ -beforeEach(() => { - // since our NODE_ENV injection logic is via cli, we need to delete "test" NODE_ENV to avoid affecting the default build config - delete process.env.NODE_ENV; -}); diff --git a/setupVitestTests.ts b/setupVitestTests.ts new file mode 100644 index 00000000..c86233e3 --- /dev/null +++ b/setupVitestTests.ts @@ -0,0 +1,8 @@ +import process from 'node:process'; +import { beforeEach } from 'vitest'; + +beforeEach(() => { + // since our NODE_ENV injection logic is via cli, we need to + // delete "test" NODE_ENV to avoid affecting the default build config + delete process.env.NODE_ENV; +}); diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 88721e7d..fe686a21 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -20,7 +20,7 @@ export default defineWorkspace([ test: { ...shared, name: 'artifact', - setupFiles: ['./setupVitestTests.js'], + setupFiles: ['./setupVitestTests.ts'], include: ['e2e/cases/**/*.test.ts'], exclude: ['e2e/cases/**/*.pw.test.ts', '**/node_modules/**'], },