diff --git a/e2e/e2e.ts b/e2e/e2e.ts index 8ba6f26..b24707f 100644 --- a/e2e/e2e.ts +++ b/e2e/e2e.ts @@ -20,18 +20,18 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); type VitePackages = | { vite: typeof import("./vite2/node_modules/vite"); - vitePluginLegacy: typeof import("./vite2/node_modules/@vitejs/plugin-legacy")["default"]; - vitePluginTopLevelAwait: typeof import("./vite2/node_modules/vite-plugin-top-level-await")["default"]; + vitePluginLegacy: (typeof import("./vite2/node_modules/@vitejs/plugin-legacy"))["default"]; + vitePluginTopLevelAwait: (typeof import("./vite2/node_modules/vite-plugin-top-level-await"))["default"]; } | { vite: typeof import("./vite3/node_modules/vite"); - vitePluginLegacy: typeof import("./vite3/node_modules/@vitejs/plugin-legacy")["default"]; - vitePluginTopLevelAwait: typeof import("./vite3/node_modules/vite-plugin-top-level-await")["default"]; + vitePluginLegacy: (typeof import("./vite3/node_modules/@vitejs/plugin-legacy"))["default"]; + vitePluginTopLevelAwait: (typeof import("./vite3/node_modules/vite-plugin-top-level-await"))["default"]; } | { vite: typeof import("./vite4/node_modules/vite"); - vitePluginLegacy: typeof import("./vite4/node_modules/@vitejs/plugin-legacy")["default"]; - vitePluginTopLevelAwait: typeof import("./vite4/node_modules/vite-plugin-top-level-await")["default"]; + vitePluginLegacy: (typeof import("./vite4/node_modules/@vitejs/plugin-legacy"))["default"]; + vitePluginTopLevelAwait: (typeof import("./vite4/node_modules/vite-plugin-top-level-await"))["default"]; }; async function buildAndStartProdServer( diff --git a/exports/require.cjs b/exports/require.cjs index 146ea7a..d440507 100644 --- a/exports/require.cjs +++ b/exports/require.cjs @@ -1 +1,2 @@ -module.exports = require("../dist/index"); +module.exports = require("../dist/index").default; +module.exports.default = require("../dist/index").default; diff --git a/exports/require.d.cts b/exports/require.d.cts new file mode 100644 index 0000000..8d4dacd --- /dev/null +++ b/exports/require.d.cts @@ -0,0 +1,3 @@ +import type _default from "../dist/index.d.ts"; +declare const _export: typeof _default & { default: typeof _default }; +export = _export; diff --git a/exports/types.d.ts b/exports/types.d.ts deleted file mode 100644 index 8cc601e..0000000 --- a/exports/types.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "../dist/index"; -export { default } from "../dist/index"; diff --git a/package.json b/package.json index f49f802..c8ac947 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,17 @@ "name": "vite-plugin-wasm", "version": "3.2.2", "description": "Add WebAssembly ESM integration (aka. Webpack's `asyncWebAssembly`) to Vite and support `wasm-pack` generated modules.", - "types": "./dist/index.d.ts", - "main": "./dist/index.js", + "types": "./exports/require.d.cts", + "main": "./exports/require.cjs", "exports": { - "types": "./exports/types.d.ts", - "import": "./exports/import.mjs", - "require": "./exports/require.cjs" + "import": { + "types": "./dist/index.d.ts", + "default": "./exports/import.mjs" + }, + "require": { + "types": "./exports/require.d.cts", + "default": "./exports/require.cjs" + } }, "repository": "https://github.com/Menci/vite-plugin-wasm", "author": "Menci ", @@ -24,7 +29,7 @@ "scripts": { "build": "tsc", "test": "cross-env NODE_NO_WARNINGS=1 NODE_OPTIONS=--experimental-vm-modules jest --verbose --coverage --forceExit", - "format": "prettier --write '**/*.{mjs,cjs,js,ts}'", + "format": "prettier --write '**/*.{mjs,cjs,js,mts,cts,ts}'", "pretest": "yarn --cwd e2e && playwright install firefox" }, "devDependencies": {