From 2a48c8cad40d3dba25eadee09d6ec303db9b0a95 Mon Sep 17 00:00:00 2001 From: Marc Harter Date: Wed, 4 Dec 2024 10:41:05 -0700 Subject: [PATCH] Fix types for CJS bundle https://github.com/tj/connect-redis/issues/416 --- package.json | 14 ++++++++++---- vite.config.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f015edc..a2ebdd9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "connect-redis", "description": "Redis session store for Connect", - "version": "8.0.0", + "version": "8.0.1", "author": "TJ Holowaychuk ", "contributors": [ "Marc Harter " @@ -13,8 +13,14 @@ "types": "./dist/connect-redis.d.ts", "exports": { ".": { - "import": "./dist/connect-redis.js", - "require": "./dist/connect-redis.cjs" + "import": { + "types": "./dist/connect-redis.d.ts", + "default": "./dist/connect-redis.js" + }, + "require": { + "types": "./dist/connect-redis.d.cts", + "default": "./dist/connect-redis.cjs" + } } }, "scripts": { @@ -27,7 +33,7 @@ }, "repository": { "type": "git", - "url": "git@github.com:tj/connect-redis.git" + "url": "git+ssh://git@github.com/tj/connect-redis.git" }, "devDependencies": { "@eslint/js": "^9.15.0", diff --git a/vite.config.ts b/vite.config.ts index f8e89d6..55870c9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,3 +1,4 @@ +import {copyFileSync} from "node:fs" import dts from "vite-plugin-dts" import {defineConfig} from "vitest/config" @@ -18,7 +19,15 @@ export default defineConfig({ target: "node18", }, plugins: [ - dts({include: ["index.ts"], rollupTypes: true, insertTypesEntry: true}), + // @ts-expect-error Type mismatch, revisit. + dts({ + include: ["index.ts"], + rollupTypes: true, + insertTypesEntry: true, + afterBuild: () => { + copyFileSync("dist/connect-redis.d.ts", "dist/connect-redis.d.cts") + }, + }), ], test: { include: ["**/*_test.[jt]s"],