diff --git a/packages/vitest/package.json b/packages/vitest/package.json index 19bc56c2b..943ae7af2 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -25,14 +25,14 @@ "import": "./dist/index.js", "types": "./dist/index.d.ts" }, - "./node": { - "import": "./dist/node.js", - "types": "./dist/node.d.ts" - }, + "./*": "./*", "./global": { "types": "./global.d.ts" }, - "./*": "./*" + "./node": { + "import": "./dist/node.js", + "types": "./dist/node.d.ts" + } }, "main": "./dist/index.js", "module": "./dist/index.js", @@ -48,15 +48,12 @@ "scripts": { "build": "rimraf dist && rollup -c", "dev": "rollup -c --watch src", - "typecheck": "tsc --noEmit", - "prepublishOnly": "nr build" + "prepublishOnly": "nr build", + "typecheck": "tsc --noEmit" }, "dependencies": { "@types/chai": "^4.3.0", "@types/chai-subset": "^1.3.3", - "chai": "^4.3.4", - "chai-subset": "^1.6.0", - "fast-glob": "^3.2.7", "local-pkg": "^0.4.0", "tinypool": "^0.0.3", "tinyspy": "^0.1.2" @@ -71,8 +68,11 @@ "@types/prompts": "^2.4.0", "c8": "^7.10.0", "cac": "^6.7.12", + "chai": "^4.3.4", + "chai-subset": "^1.6.0", "cli-truncate": "^3.1.0", "diff": "^5.0.0", + "fast-glob": "^3.2.7", "find-up": "^6.2.0", "flatted": "^3.2.4", "happy-dom": "^2.25.0", diff --git a/packages/vitest/src/reporters/error.ts b/packages/vitest/src/reporters/error.ts index 672dc994f..d9cde54ca 100644 --- a/packages/vitest/src/reporters/error.ts +++ b/packages/vitest/src/reporters/error.ts @@ -105,7 +105,7 @@ function handleImportOutsideModuleError(stack: string, ctx: Vitest) { async function getSourcePos(ctx: Vitest, nearest: ParsedStack) { const mod = ctx.server.moduleGraph.getModuleById(nearest.file) const transformResult = mod?.ssrTransformResult - const pos = await getOriginalPos(transformResult?.map, nearest) + const pos = await getOriginalPos(transformResult?.map as RawSourceMap | undefined, nearest) return pos } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55137a559..0af2edd2d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,9 +148,6 @@ importers: dependencies: '@types/chai': 4.3.0 '@types/chai-subset': 1.3.3 - chai: 4.3.4 - chai-subset: 1.6.0 - fast-glob: 3.2.7 local-pkg: 0.4.0 tinypool: 0.0.3 tinyspy: 0.1.2 @@ -164,8 +161,11 @@ importers: '@types/prompts': 2.4.0 c8: 7.10.0 cac: 6.7.12 + chai: 4.3.4 + chai-subset: 1.6.0 cli-truncate: 3.1.0 diff: 5.0.0 + fast-glob: 3.2.7 find-up: 6.2.0 flatted: 3.2.4 happy-dom: 2.25.0 @@ -1402,10 +1402,12 @@ packages: dependencies: '@nodelib/fs.stat': 2.0.4 run-parallel: 1.2.0 + dev: true /@nodelib/fs.stat/2.0.4: resolution: {integrity: sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==} engines: {node: '>= 8'} + dev: true /@nodelib/fs.walk/1.2.6: resolution: {integrity: sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==} @@ -1413,6 +1415,7 @@ packages: dependencies: '@nodelib/fs.scandir': 2.1.4 fastq: 1.10.1 + dev: true /@polka/url/1.0.0-next.21: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} @@ -2470,7 +2473,7 @@ packages: /assertion-error/1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} - dev: false + dev: true /asynckit/0.4.0: resolution: {integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k=} @@ -2523,6 +2526,7 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 + dev: true /browser-process-hrtime/1.0.0: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} @@ -2628,7 +2632,7 @@ packages: /chai-subset/1.6.0: resolution: {integrity: sha1-pdDKFOMpp5WW7XAFi2ZGvWmIz+k=} engines: {node: '>=4'} - dev: false + dev: true /chai/4.3.4: resolution: {integrity: sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==} @@ -2640,7 +2644,7 @@ packages: get-func-name: 2.0.0 pathval: 1.1.1 type-detect: 4.0.8 - dev: false + dev: true /chalk/2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -2668,7 +2672,7 @@ packages: /check-error/1.0.2: resolution: {integrity: sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=} - dev: false + dev: true /chokidar/3.5.2: resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==} @@ -3009,7 +3013,7 @@ packages: engines: {node: '>=0.12'} dependencies: type-detect: 4.0.8 - dev: false + dev: true /deep-is/0.1.3: resolution: {integrity: sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=} @@ -4014,6 +4018,7 @@ packages: glob-parent: 5.1.2 merge2: 1.4.1 micromatch: 4.0.4 + dev: true /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -4027,6 +4032,7 @@ packages: resolution: {integrity: sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==} dependencies: reusify: 1.0.4 + dev: true /fd-slicer/1.1.0: resolution: {integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=} @@ -4053,6 +4059,7 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 + dev: true /find-replace/3.0.0: resolution: {integrity: sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==} @@ -4185,7 +4192,7 @@ packages: /get-func-name/2.0.0: resolution: {integrity: sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=} - dev: false + dev: true /get-intrinsic/1.1.1: resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==} @@ -4225,6 +4232,7 @@ packages: engines: {node: '>= 6'} dependencies: is-glob: 4.0.3 + dev: true /glob-parent/6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} @@ -4539,6 +4547,7 @@ packages: /is-extglob/2.1.1: resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=} engines: {node: '>=0.10.0'} + dev: true /is-fullwidth-code-point/3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} @@ -4555,6 +4564,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 + dev: true /is-module/1.0.0: resolution: {integrity: sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=} @@ -4573,6 +4583,7 @@ packages: /is-number/7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} + dev: true /is-potential-custom-element-name/1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} @@ -4967,6 +4978,7 @@ packages: /merge2/1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} + dev: true /micromatch/4.0.4: resolution: {integrity: sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==} @@ -4974,6 +4986,7 @@ packages: dependencies: braces: 3.0.2 picomatch: 2.3.0 + dev: true /mime-db/1.51.0: resolution: {integrity: sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==} @@ -5405,7 +5418,7 @@ packages: /pathval/1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} - dev: false + dev: true /pend/1.2.0: resolution: {integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA=} @@ -5421,6 +5434,7 @@ packages: /picomatch/2.3.0: resolution: {integrity: sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==} engines: {node: '>=8.6'} + dev: true /pidtree/0.3.1: resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==} @@ -5612,6 +5626,7 @@ packages: /queue-microtask/1.2.2: resolution: {integrity: sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==} + dev: true /raf/3.4.1: resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==} @@ -5918,6 +5933,7 @@ packages: /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + dev: true /rifm/0.12.1_react@17.0.2: resolution: {integrity: sha512-OGA1Bitg/dSJtI/c4dh90svzaUPt228kzFsUkJbtA2c964IqEAwWXeL9ZJi86xWv3j5SMqRvGULl7bA6cK0Bvg==} @@ -5971,6 +5987,7 @@ packages: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: queue-microtask: 1.2.2 + dev: true /safe-buffer/5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -6365,6 +6382,7 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 + dev: true /totalist/1.1.0: resolution: {integrity: sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==} @@ -6430,6 +6448,7 @@ packages: /type-detect/4.0.8: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} + dev: true /type-fest/0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}