From d9760294875b46263265fa4a4c470edfb3347295 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Mon, 4 Jan 2021 11:18:53 +0700 Subject: [PATCH] Make the package a module type (#313) --- package.json | 19 ++++++++++++++++--- test/browser.js | 5 +++-- test/fetch.js | 2 +- test/headers.js | 2 +- test/hooks.js | 2 +- test/http-error.js | 2 +- test/main.js | 2 +- test/methods.js | 2 +- test/prefix-url.js | 2 +- test/retry.js | 2 +- 10 files changed, 27 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9ac12a97..76b5bc0f 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,11 @@ "email": "sindresorhus@gmail.com", "url": "https://sindresorhus.com" }, + "type": "module", + "exports": { + "import": "./index.js", + "require": "./umd.js" + }, "engines": { "node": ">=10" }, @@ -48,7 +53,7 @@ ], "devDependencies": { "abort-controller": "^3.0.0", - "ava": "^3.2.0", + "ava": "^3.15.0", "body": "^5.1.0", "busboy": "^0.3.1", "create-test-server": "2.1.1", @@ -69,13 +74,21 @@ ], "globals": [ "globalThis" - ] + ], + "rules": { + "import/no-useless-path-segments": "off", + "unicorn/import-index": "off", + "import/extensions": "off" + } }, "ava": { "require": [ "esm", "./test/_require" - ] + ], + "nonSemVerExperiments": { + "nextGenConfig": true + } }, "tsd": { "compilerOptions": { diff --git a/test/browser.js b/test/browser.js index bdca80d4..a8897966 100644 --- a/test/browser.js +++ b/test/browser.js @@ -1,10 +1,11 @@ import util from 'util'; import body from 'body'; -import {serial as test} from 'ava'; +import ava from 'ava'; // eslint-disable-line ava/use-test import createTestServer from 'create-test-server'; import Busboy from 'busboy'; -import withPage from './helpers/with-page'; +import withPage from './helpers/with-page.js'; +const test = ava.serial; const pBody = util.promisify(body); test('prefixUrl option', withPage, async (t, page) => { diff --git a/test/fetch.js b/test/fetch.js index 1c66da01..328b6e01 100644 --- a/test/fetch.js +++ b/test/fetch.js @@ -1,5 +1,5 @@ import test from 'ava'; -import ky from '..'; +import ky from '../index.js'; test.serial('relative URLs are passed to fetch unresolved', async t => { const originalFetch = global.fetch; diff --git a/test/headers.js b/test/headers.js index 0a399776..9ae13bb8 100644 --- a/test/headers.js +++ b/test/headers.js @@ -1,7 +1,7 @@ import createTestServer from 'create-test-server'; import FormData from 'form-data'; import test from 'ava'; -import ky from '..'; +import ky from '../index.js'; const echoHeaders = (request, response) => { request.resume(); diff --git a/test/hooks.js b/test/hooks.js index a583aea6..759b38e3 100644 --- a/test/hooks.js +++ b/test/hooks.js @@ -3,7 +3,7 @@ import test from 'ava'; import createTestServer from 'create-test-server'; import body from 'body'; import delay from 'delay'; -import ky from '..'; +import ky from '../index.js'; const pBody = util.promisify(body); diff --git a/test/http-error.js b/test/http-error.js index c8e5cfd2..9022671b 100644 --- a/test/http-error.js +++ b/test/http-error.js @@ -1,6 +1,6 @@ import test from 'ava'; import {Response} from 'node-fetch'; -import ky from '..'; +import ky from '../index.js'; function createFakeResponse({status, statusText}) { // Start with a realistic fetch Response. diff --git a/test/main.js b/test/main.js index 64512595..b7e8aded 100644 --- a/test/main.js +++ b/test/main.js @@ -3,7 +3,7 @@ import test from 'ava'; import createTestServer from 'create-test-server'; import body from 'body'; import delay from 'delay'; -import ky from '..'; +import ky from '../index.js'; const pBody = util.promisify(body); const fixture = 'fixture'; diff --git a/test/methods.js b/test/methods.js index 76369eb4..cef3d374 100644 --- a/test/methods.js +++ b/test/methods.js @@ -1,6 +1,6 @@ import test from 'ava'; import createTestServer from 'create-test-server'; -import ky from '..'; +import ky from '../index.js'; test('common method is normalized', async t => { const server = await createTestServer(); diff --git a/test/prefix-url.js b/test/prefix-url.js index 49502498..62a8a4bb 100644 --- a/test/prefix-url.js +++ b/test/prefix-url.js @@ -1,6 +1,6 @@ import test from 'ava'; import createTestServer from 'create-test-server'; -import ky from '..'; +import ky from '../index.js'; test('prefixUrl option', async t => { const server = await createTestServer(); diff --git a/test/retry.js b/test/retry.js index 29736450..716a60d4 100644 --- a/test/retry.js +++ b/test/retry.js @@ -1,6 +1,6 @@ import test from 'ava'; import createTestServer from 'create-test-server'; -import ky from '..'; +import ky from '../index.js'; const fixture = 'fixture'; const defaultRetryCount = 2;