From 8482014de4cabf2fac14e28ca80130cbe8adee21 Mon Sep 17 00:00:00 2001 From: Mark Wubben Date: Sat, 30 Dec 2023 21:27:46 +0100 Subject: [PATCH] Upgrade to v6 --- .github/workflows/test.yml | 4 ++-- README.md | 2 +- cli.js | 2 +- index.cjs | 2 +- index.d.ts | 2 +- index.js | 2 +- index.test-d.ts | 2 +- package.json | 8 ++++---- test.cjs | 2 +- test.js | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1c847f1..77bb9d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,8 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ^20 - run: npm it diff --git a/README.md b/README.md index 6812a25..8e03593 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ You don't need to use this package. Check out [AVA](https://avajs.dev/) instead. -And yes, we know you can alias dependencies. Unfortunately npm doesn't install bin stubs for aliases. +And yes, we know you can alias dependencies. Unfortunately it confuses `npx ava`, so a wrapper package with a differently named bin stub is preferrable. diff --git a/cli.js b/cli.js index b4ae34b..01dce9b 100755 --- a/cli.js +++ b/cli.js @@ -3,5 +3,5 @@ import {createRequire} from 'node:module'; import {pathToFileURL} from 'node:url'; const require = createRequire(import.meta.url); -const mainEntrypoint = pathToFileURL(require.resolve('@ava/v5')); +const mainEntrypoint = pathToFileURL(require.resolve('@ava/v6')); import(new URL('cli.mjs', mainEntrypoint)); diff --git a/index.cjs b/index.cjs index 93d5e99..c0681ce 100644 --- a/index.cjs +++ b/index.cjs @@ -1 +1 @@ -module.exports = require('@ava/v5'); +module.exports = require('@ava/v6'); diff --git a/index.d.ts b/index.d.ts index 80b1974..9400d44 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1 +1 @@ -export {default} from '@ava/v5'; +export {default} from '@ava/v6'; diff --git a/index.js b/index.js index 80b1974..9400d44 100644 --- a/index.js +++ b/index.js @@ -1 +1 @@ -export {default} from '@ava/v5'; +export {default} from '@ava/v6'; diff --git a/index.test-d.ts b/index.test-d.ts index bc164d6..5d8c5f5 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -1,4 +1,4 @@ -import type test from '@ava/v5'; +import type test from '@ava/v6'; import {expectType} from 'tsd'; import pkg from '.'; diff --git a/package.json b/package.json index 9e2dc5e..672843a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "author": "Mark Wubben (https://novemberborn.net/)", "license": "MIT", "scripts": { - "test": "xo && tsd && ./node_modules/@ava/v5/entrypoints/cli.mjs" + "test": "xo && tsd && ./node_modules/@ava/v6/entrypoints/cli.mjs" }, "bin": { "test-ava": "./cli.js" @@ -26,10 +26,10 @@ "index.d.ts" ], "dependencies": { - "@ava/v5": "npm:ava@5.3.1" + "@ava/v6": "npm:ava@^6" }, "devDependencies": { - "tsd": "^0.28.1", - "xo": "^0.54.2" + "tsd": "^0.30.1", + "xo": "^0.56.0" } } diff --git a/test.cjs b/test.cjs index 01f2425..53cd633 100644 --- a/test.cjs +++ b/test.cjs @@ -1,4 +1,4 @@ -const test = require('@ava/v5'); +const test = require('@ava/v6'); test('exports ava (CJS)', t => { t.is(test, require('@ava/test')); diff --git a/test.js b/test.js index 01722e5..8e871f0 100644 --- a/test.js +++ b/test.js @@ -1,4 +1,4 @@ -import test from '@ava/v5'; +import test from '@ava/v6'; test('exports ava (ESM)', async t => { const {default: exported} = await import('@ava/test');