From f7acbf449f70264423d49bb83e7b252ebdbe0c59 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sat, 15 Oct 2022 12:33:42 +0200 Subject: [PATCH] chore: use fixed build for `rollup-plugin-dts` #130 --- package.json | 2 +- pnpm-lock.yaml | 32 ++++++++++++++++---------------- src/builder/rollup.ts | 15 ++------------- src/types.ts | 2 +- 4 files changed, 20 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 0a60285..2d6c10d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "pretty-bytes": "^6.0.0", "rimraf": "^3.0.2", "rollup": "^3.1.0", - "rollup-plugin-dts": "^4.2.3", + "@unjsio/rollup-plugin-dts": "^5.0.0-rc.1", "rollup-plugin-esbuild": "^4.10.1", "scule": "^0.3.2", "typescript": "^4.8.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc78705..3b4395a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,7 @@ specifiers: '@types/mri': ^1.1.1 '@types/node': ^18.8.5 '@types/rimraf': ^3.0.2 + '@unjsio/rollup-plugin-dts': ^5.0.0-rc.1 '@vitest/coverage-c8': ^0.24.1 chalk: ^5.1.2 changelogen: ^0.3.2 @@ -32,7 +33,6 @@ specifiers: pretty-bytes: ^6.0.0 rimraf: ^3.0.2 rollup: ^3.1.0 - rollup-plugin-dts: ^4.2.3 rollup-plugin-esbuild: ^4.10.1 scule: ^0.3.2 typescript: ^4.8.4 @@ -46,6 +46,7 @@ dependencies: '@rollup/plugin-node-resolve': 15.0.0_rollup@3.1.0 '@rollup/plugin-replace': 5.0.0_rollup@3.1.0 '@rollup/pluginutils': 5.0.1_rollup@3.1.0 + '@unjsio/rollup-plugin-dts': 5.0.0-rc.1_iveik5itt6bizfkphibyk5djdy chalk: 5.1.2 consola: 2.15.3 defu: 6.1.0 @@ -63,7 +64,6 @@ dependencies: pretty-bytes: 6.0.0 rimraf: 3.0.2 rollup: 3.1.0 - rollup-plugin-dts: 4.2.3_iveik5itt6bizfkphibyk5djdy rollup-plugin-esbuild: 4.10.1_fclsl4c6gsr6cofi4hyljdq5fe scule: 0.3.2 typescript: 4.8.4 @@ -750,6 +750,20 @@ packages: eslint-visitor-keys: 3.3.0 dev: true + /@unjsio/rollup-plugin-dts/5.0.0-rc.1_iveik5itt6bizfkphibyk5djdy: + resolution: {integrity: sha512-ygcyY5+1PfKjxO6mNlfFWrA1hv9GaMIJMppL+zKqp1zRsDag9jmf7D3isnRWiiE0DSlBHjGGCiKFZ5c5XcWzTA==} + engines: {node: '>=v14'} + peerDependencies: + rollup: ^3.0.0 + typescript: ^4.1 + dependencies: + magic-string: 0.26.7 + rollup: 3.1.0 + typescript: 4.8.4 + optionalDependencies: + '@babel/code-frame': 7.18.6 + dev: false + /@vitest/coverage-c8/0.24.1: resolution: {integrity: sha512-cOFHXRHB9WHtGgsHE4FX4Ef1c9Hon668RNJQOJvqSy1/1Y7zIYIBhFWmuFKLZRCMV4jGT5CRiuB9KtdNsOc3og==} dependencies: @@ -3059,20 +3073,6 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-dts/4.2.3_iveik5itt6bizfkphibyk5djdy: - resolution: {integrity: sha512-jlcpItqM2efqfIiKzDB/IKOS9E9fDvbkJSGw5GtK/PqPGS9eC3R3JKyw2VvpTktZA+TNgJRMu1NTv244aTUzzQ==} - engines: {node: '>=v12.22.12'} - peerDependencies: - rollup: ^2.55 - typescript: ^4.1 - dependencies: - magic-string: 0.26.7 - rollup: 3.1.0 - typescript: 4.8.4 - optionalDependencies: - '@babel/code-frame': 7.18.6 - dev: false - /rollup-plugin-esbuild/4.10.1_fclsl4c6gsr6cofi4hyljdq5fe: resolution: {integrity: sha512-/ymcRB283zjFp1JTBXO8ekxv0c9vRc2L6OTljghsLthQ4vqeDSDWa9BVz1tHiVrx6SbUnUpDPLC0K/MXK7j5TA==} engines: {node: '>=12'} diff --git a/src/builder/rollup.ts b/src/builder/rollup.ts index 4b389c2..67e7b5d 100644 --- a/src/builder/rollup.ts +++ b/src/builder/rollup.ts @@ -7,7 +7,7 @@ import commonjs from '@rollup/plugin-commonjs' import { nodeResolve } from '@rollup/plugin-node-resolve' import alias from '@rollup/plugin-alias' import _esbuild from 'rollup-plugin-esbuild' -import dts from 'rollup-plugin-dts' +import dts from '@unjsio/rollup-plugin-dts' import replace from '@rollup/plugin-replace' import { resolve, dirname, normalize, extname } from 'pathe' import { resolvePath, resolveModuleExportNames } from 'mlly' @@ -117,18 +117,7 @@ export async function rollupBuild (ctx: BuildContext) { const shebangPlugin: any = rollupOptions.plugins.find(p => p && p.name === 'unbuild-shebang') shebangPlugin._options.preserve = false - // TODO: https://github.com/Swatinem/rollup-plugin-dts/issues/226 - const dtsPlugin = dts(ctx.options.rollup.dts) - rollupOptions.plugins.push({ - ...dtsPlugin, - outputOptions (...args) { - const opts = dtsPlugin.outputOptions(...args) - opts.interop = 'esModule' - delete opts.namespaceToStringTag - opts.generatedCode = { symbols: false, ...opts.generatedCode } - return opts - } - }) + rollupOptions.plugins.push(dts(ctx.options.rollup.dts)) await ctx.hooks.callHook('rollup:dts:options', ctx, rollupOptions) const typesBuild = await rollup(rollupOptions) diff --git a/src/types.ts b/src/types.ts index ec72acc..5c93190 100644 --- a/src/types.ts +++ b/src/types.ts @@ -9,7 +9,7 @@ import type { RollupReplaceOptions } from '@rollup/plugin-replace' import type { RollupAliasOptions } from '@rollup/plugin-alias' import type { RollupNodeResolveOptions } from '@rollup/plugin-node-resolve' import type { RollupJsonOptions } from '@rollup/plugin-json' -import type { Options as RollupDtsOptions } from 'rollup-plugin-dts' +import type { Options as RollupDtsOptions } from '@unjsio/rollup-plugin-dts' import type commonjs from '@rollup/plugin-commonjs' export type RollupCommonJSOptions = Parameters[0] & {}