From a0c189da8c5e8d3fd5b417de18b99a85730571e1 Mon Sep 17 00:00:00 2001 From: userquin Date: Thu, 23 Nov 2023 22:18:11 +0100 Subject: [PATCH 1/2] fix: include dual cjs/esm in package exports --- package.json | 102 +++++++++++++++++++++++++++++++------------ pnpm-lock.yaml | 61 ++++++++++++++++++++++++++ scripts/postbuild.ts | 23 ---------- 3 files changed, 135 insertions(+), 51 deletions(-) delete mode 100644 scripts/postbuild.ts diff --git a/package.json b/package.json index 0467199..ad4f04e 100644 --- a/package.json +++ b/package.json @@ -28,49 +28,94 @@ "sideEffects": false, "exports": { ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" + "require": { + "types": "./dist/index.d.cts", + "default": "./dist/index.cjs" + }, + "import": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + } }, "./nuxt": { - "types": "./dist/nuxt.d.ts", - "import": "./dist/nuxt.js", - "require": "./dist/nuxt.cjs" + "require": { + "types": "./dist/nuxt.d.cts", + "default": "./dist/nuxt.cjs" + }, + "import": { + "types": "./dist/nuxt.d.ts", + "default": "./dist/nuxt.js" + } }, "./astro": { - "types": "./dist/astro.d.ts", - "import": "./dist/astro.js", - "require": "./dist/astro.cjs" + "require": { + "types": "./dist/astro.d.cts", + "default": "./dist/astro.cjs" + }, + "import": { + "types": "./dist/astro.d.ts", + "default": "./dist/astro.js" + } }, "./rollup": { - "types": "./dist/rollup.d.ts", - "import": "./dist/rollup.js", - "require": "./dist/rollup.cjs" + "require": { + "types": "./dist/rollup.d.cts", + "default": "./dist/rollup.cjs" + }, + "import": { + "types": "./dist/rollup.d.ts", + "default": "./dist/rollup.js" + } }, "./types": { - "types": "./dist/types.d.ts", - "import": "./dist/types.js", - "require": "./dist/types.cjs" + "require": { + "types": "./dist/types.d.cts", + "default": "./dist/types.cjs" + }, + "import": { + "types": "./dist/types.d.ts", + "default": "./dist/types.js" + } }, "./vite": { - "types": "./dist/vite.d.ts", - "import": "./dist/vite.js", - "require": "./dist/vite.cjs" + "require": { + "types": "./dist/vite.d.cts", + "default": "./dist/vite.cjs" + }, + "import": { + "types": "./dist/vite.d.ts", + "default": "./dist/vite.js" + } }, "./webpack": { - "types": "./dist/webpack.d.ts", - "import": "./dist/webpack.js", - "require": "./dist/webpack.cjs" + "require": { + "types": "./dist/webpack.d.cts", + "default": "./dist/webpack.cjs" + }, + "import": { + "types": "./dist/webpack.d.ts", + "default": "./dist/webpack.js" + } }, "./rspack": { - "types": "./dist/rspack.d.ts", - "import": "./dist/rspack.js", - "require": "./dist/rspack.cjs" + "require": { + "types": "./dist/rspack.d.cts", + "default": "./dist/rspack.cjs" + }, + "import": { + "types": "./dist/rspack.d.ts", + "default": "./dist/rspack.js" + } }, "./esbuild": { - "types": "./dist/esbuild.d.ts", - "import": "./dist/esbuild.js", - "require": "./dist/esbuild.cjs" + "require": { + "types": "./dist/esbuild.d.cts", + "default": "./dist/esbuild.cjs" + }, + "import": { + "types": "./dist/esbuild.d.ts", + "default": "./dist/esbuild.js" + } }, "./*": "./*" }, @@ -93,7 +138,7 @@ "node": ">=14" }, "scripts": { - "build": "tsup src/*.ts --format cjs,esm --dts --splitting --clean && esno scripts/postbuild.ts", + "build": "tsup src/*.ts --format cjs,esm --dts --splitting --clean", "dev": "tsup src/*.ts --watch src", "lint": "eslint .", "lint:fix": "nr lint --fix", @@ -136,6 +181,7 @@ "bumpp": "^9.2.0", "eslint": "^8.54.0", "esno": "^4.0.0", + "publint": "^0.2.5", "rollup": "^4.5.0", "tsup": "^7.3.0", "typescript": "^5.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a07c228..dd5f7a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,6 +63,9 @@ importers: esno: specifier: ^4.0.0 version: 4.0.0 + publint: + specifier: ^0.2.5 + version: 0.2.5 rollup: specifier: ^4.5.0 version: 4.5.0 @@ -4396,6 +4399,17 @@ packages: path-is-absolute: 1.0.1 dev: true + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.6 + once: 1.4.0 + dev: true + /globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} @@ -4708,6 +4722,13 @@ packages: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: true + /ignore-walk@5.0.1: + resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + dependencies: + minimatch: 5.1.6 + dev: true + /ignore@5.2.4: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} @@ -5720,6 +5741,13 @@ packages: brace-expansion: 1.1.11 dev: true + /minimatch@5.1.6: + resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -5895,6 +5923,29 @@ packages: resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==} dev: true + /npm-bundled@2.0.1: + resolution: {integrity: sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + dependencies: + npm-normalize-package-bin: 2.0.0 + dev: true + + /npm-normalize-package-bin@2.0.0: + resolution: {integrity: sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + dev: true + + /npm-packlist@5.1.3: + resolution: {integrity: sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} + hasBin: true + dependencies: + glob: 8.1.0 + ignore-walk: 5.0.1 + npm-bundled: 2.0.1 + npm-normalize-package-bin: 2.0.0 + dev: true + /npm-run-path@4.0.1: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} @@ -6284,6 +6335,16 @@ packages: resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==} dev: true + /publint@0.2.5: + resolution: {integrity: sha512-eoQiP0WXkxkpth1fMLoS1I/6BQoxKNZxTAAnFjPgURFrJulC5D5Uifk49a9kfNCYmcza9E/ZkbFhQQdjkmKAbg==} + engines: {node: '>=16'} + hasBin: true + dependencies: + npm-packlist: 5.1.3 + picocolors: 1.0.0 + sade: 1.8.1 + dev: true + /pump@3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} requiresBuild: true diff --git a/scripts/postbuild.ts b/scripts/postbuild.ts deleted file mode 100644 index 3b9dcba..0000000 --- a/scripts/postbuild.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { resolve } from 'node:path' -import { promises as fs } from 'node:fs' -import { basename } from 'node:path/posix' -import { fileURLToPath } from 'node:url' -import fg from 'fast-glob' - -async function run() { - // fix cjs exports - const files = await fg('*.cjs', { - ignore: ['chunk-*'], - absolute: true, - cwd: resolve(fileURLToPath(import.meta.url), '../../dist'), - }) - for (const file of files) { - console.log('[postbuild]', basename(file)) - let code = await fs.readFile(file, 'utf8') - code = code.replace('exports.default =', 'module.exports =') - code += 'exports.default = module.exports;' - await fs.writeFile(file, code) - } -} - -run() From 2f9af9254d53d7856c5df40c989396ff41f82261 Mon Sep 17 00:00:00 2001 From: userquin Date: Thu, 23 Nov 2023 22:23:07 +0100 Subject: [PATCH 2/2] fix: lint --- package.json | 72 ++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index ad4f04e..f7f4f50 100644 --- a/package.json +++ b/package.json @@ -28,93 +28,93 @@ "sideEffects": false, "exports": { ".": { - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - }, "import": { "types": "./dist/index.d.ts", "default": "./dist/index.js" + }, + "require": { + "types": "./dist/index.d.cts", + "default": "./dist/index.cjs" } }, "./nuxt": { - "require": { - "types": "./dist/nuxt.d.cts", - "default": "./dist/nuxt.cjs" - }, "import": { "types": "./dist/nuxt.d.ts", "default": "./dist/nuxt.js" + }, + "require": { + "types": "./dist/nuxt.d.cts", + "default": "./dist/nuxt.cjs" } }, "./astro": { - "require": { - "types": "./dist/astro.d.cts", - "default": "./dist/astro.cjs" - }, "import": { "types": "./dist/astro.d.ts", "default": "./dist/astro.js" + }, + "require": { + "types": "./dist/astro.d.cts", + "default": "./dist/astro.cjs" } }, "./rollup": { - "require": { - "types": "./dist/rollup.d.cts", - "default": "./dist/rollup.cjs" - }, "import": { "types": "./dist/rollup.d.ts", "default": "./dist/rollup.js" + }, + "require": { + "types": "./dist/rollup.d.cts", + "default": "./dist/rollup.cjs" } }, "./types": { - "require": { - "types": "./dist/types.d.cts", - "default": "./dist/types.cjs" - }, "import": { "types": "./dist/types.d.ts", "default": "./dist/types.js" + }, + "require": { + "types": "./dist/types.d.cts", + "default": "./dist/types.cjs" } }, "./vite": { - "require": { - "types": "./dist/vite.d.cts", - "default": "./dist/vite.cjs" - }, "import": { "types": "./dist/vite.d.ts", "default": "./dist/vite.js" + }, + "require": { + "types": "./dist/vite.d.cts", + "default": "./dist/vite.cjs" } }, "./webpack": { - "require": { - "types": "./dist/webpack.d.cts", - "default": "./dist/webpack.cjs" - }, "import": { "types": "./dist/webpack.d.ts", "default": "./dist/webpack.js" + }, + "require": { + "types": "./dist/webpack.d.cts", + "default": "./dist/webpack.cjs" } }, "./rspack": { - "require": { - "types": "./dist/rspack.d.cts", - "default": "./dist/rspack.cjs" - }, "import": { "types": "./dist/rspack.d.ts", "default": "./dist/rspack.js" + }, + "require": { + "types": "./dist/rspack.d.cts", + "default": "./dist/rspack.cjs" } }, "./esbuild": { - "require": { - "types": "./dist/esbuild.d.cts", - "default": "./dist/esbuild.cjs" - }, "import": { "types": "./dist/esbuild.d.ts", "default": "./dist/esbuild.js" + }, + "require": { + "types": "./dist/esbuild.d.cts", + "default": "./dist/esbuild.cjs" } }, "./*": "./*"