diff --git a/packages/data-uri/README.md b/packages/data-uri/README.md index 75e4bd883..242c93bd2 100644 --- a/packages/data-uri/README.md +++ b/packages/data-uri/README.md @@ -13,7 +13,7 @@ ## Requirements -This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+. +This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v1.20.0+. ## Install diff --git a/packages/data-uri/package.json b/packages/data-uri/package.json index ea9bb7ceb..b81be3bcb 100644 --- a/packages/data-uri/package.json +++ b/packages/data-uri/package.json @@ -13,10 +13,15 @@ "author": "shellscape", "homepage": "https://github.com/rollup/plugins/tree/master/packages/data-uri", "bugs": "https://github.com/rollup/plugins/issues", - "main": "dist/index.js", - "module": "dist/index.es.js", + "main": "./dist/cjs/index.js", + "module": "./dist/es/index.js", + "exports": { + "import": "./dist/es/index.js", + "types": "./types/index.d.ts", + "default": "./dist/cjs/index.js" + }, "engines": { - "node": ">= 8.0.0" + "node": ">=14.0.0" }, "scripts": { "build": "rollup -c", @@ -33,6 +38,7 @@ }, "files": [ "dist", + "!dist/**/*.map", "types", "README.md", "LICENSE" @@ -47,15 +53,22 @@ "url" ], "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + }, + "dependencies": { + "@rollup/pluginutils": "^4.2.1" }, "devDependencies": { - "@rollup/plugin-typescript": "^5.0.2", - "@rollup/pluginutils": "^3.0.1", - "rollup": "^2.67.3", - "typescript": "^4.1.2" + "@rollup/plugin-typescript": "^8.5.0", + "rollup": "^3.0.0-7", + "typescript": "^4.8.3" }, - "types": "types/index.d.ts", + "types": "./types/index.d.ts", "ava": { "workerThreads": false, "files": [ diff --git a/packages/data-uri/rollup.config.js b/packages/data-uri/rollup.config.js deleted file mode 100644 index 8358e56b6..000000000 --- a/packages/data-uri/rollup.config.js +++ /dev/null @@ -1,13 +0,0 @@ -import typescript from '@rollup/plugin-typescript'; - -import pkg from './package.json'; - -export default { - input: 'src/index.ts', - plugins: [typescript()], - external: [...Object.keys(pkg.devDependencies), 'url'], - output: [ - { format: 'cjs', file: pkg.main, sourcemap: true, exports: 'auto' }, - { format: 'esm', file: pkg.module, sourcemap: true } - ] -}; diff --git a/packages/data-uri/rollup.config.mjs b/packages/data-uri/rollup.config.mjs new file mode 100644 index 000000000..2a28aaaf6 --- /dev/null +++ b/packages/data-uri/rollup.config.mjs @@ -0,0 +1,7 @@ +import { readFileSync } from 'fs'; + +import { createConfig } from '../../shared/rollup.config.mjs'; + +export default createConfig({ + pkg: JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8')) +}); diff --git a/packages/data-uri/src/index.ts b/packages/data-uri/src/index.ts index 7960d3b79..cd2e5fa08 100644 --- a/packages/data-uri/src/index.ts +++ b/packages/data-uri/src/index.ts @@ -66,7 +66,7 @@ export default function dataUri(): Plugin { } catch (e: any) { const error: RollupError = { message: e.toString(), - parserError: e, + cause: e, plugin: '@rollup/plugin-data-uri', pluginCode: 'DU$JSON' }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4294fa3a6..42b4b32a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -202,14 +202,15 @@ importers: packages/data-uri: specifiers: - '@rollup/plugin-typescript': ^5.0.2 - '@rollup/pluginutils': ^3.0.1 - rollup: ^2.67.3 - typescript: ^4.1.2 + '@rollup/plugin-typescript': ^8.5.0 + '@rollup/pluginutils': ^4.2.1 + rollup: ^3.0.0-7 + typescript: ^4.8.3 + dependencies: + '@rollup/pluginutils': 4.2.1 devDependencies: - '@rollup/plugin-typescript': 5.0.2_5q64ijqsuisqe52alrh6v6njki - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 - rollup: 2.79.1 + '@rollup/plugin-typescript': 8.5.0_vmpcm5aav5u37diqfc6pdubvhq + rollup: 3.0.0-7 typescript: 4.8.3 packages/dsv: