From f8f0fd0941f1fbf5f297bead7c65ac6bdf36ed46 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 30 Sep 2022 06:54:16 +0200 Subject: [PATCH] fix(legacy): prepare for Rollup 3 BREAKING CHANGES: Requires Node 14 --- packages/legacy/README.md | 2 +- packages/legacy/package.json | 31 ++++++++++++++++++++++--------- packages/legacy/rollup.config.js | 13 ------------- packages/legacy/rollup.config.mjs | 13 +++++++++++++ pnpm-lock.yaml | 12 ++++++------ 5 files changed, 42 insertions(+), 29 deletions(-) delete mode 100644 packages/legacy/rollup.config.js create mode 100644 packages/legacy/rollup.config.mjs diff --git a/packages/legacy/README.md b/packages/legacy/README.md index 8ada4f387..83dfa6fc1 100644 --- a/packages/legacy/README.md +++ b/packages/legacy/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/legacy/package.json b/packages/legacy/package.json index 03567cba8..04e4d9e29 100644 --- a/packages/legacy/package.json +++ b/packages/legacy/package.json @@ -13,8 +13,16 @@ "author": "Rich Harris", "homepage": "https://github.com/rollup/plugins/tree/master/packages/legacy/#readme", "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": { + "types": "./types/index.d.ts", + "import": "./dist/es/index.js", + "default": "./dist/cjs/index.js" + }, + "engines": { + "node": ">=14.0.0" + }, "scripts": { "build": "rollup -c", "ci:coverage": "nyc pnpm test && nyc report --reporter=text-lcov > coverage.lcov", @@ -30,6 +38,7 @@ }, "files": [ "dist", + "!dist/**/*.map", "types", "README.md", "LICENSE" @@ -39,20 +48,24 @@ "plugin" ], "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.1.0" + "@rollup/pluginutils": "^4.2.1" }, "devDependencies": { "@rollup/plugin-buble": "^0.21.3", - "del-cli": "^3.0.1", - "rollup": "^2.67.3" + "del-cli": "^5.0.0", + "rollup": "^3.0.0-7" }, + "types": "./types/index.d.ts", "ava": { - "babel": { - "compileEnhancements": false - }, + "workerThreads": false, "files": [ "!**/fixtures/**", "!**/helpers/**", diff --git a/packages/legacy/rollup.config.js b/packages/legacy/rollup.config.js deleted file mode 100644 index e1bf2aaa8..000000000 --- a/packages/legacy/rollup.config.js +++ /dev/null @@ -1,13 +0,0 @@ -import buble from '@rollup/plugin-buble'; - -import pkg from './package.json'; - -export default { - input: 'src/index.js', - plugins: [buble()], - external: ['path'], - output: [ - { file: pkg.main, format: 'cjs', sourcemap: true, exports: 'auto' }, - { file: pkg.module, format: 'es', sourcemap: true } - ] -}; diff --git a/packages/legacy/rollup.config.mjs b/packages/legacy/rollup.config.mjs new file mode 100644 index 000000000..888000cd3 --- /dev/null +++ b/packages/legacy/rollup.config.mjs @@ -0,0 +1,13 @@ +import { readFileSync } from 'fs'; + +import buble from '@rollup/plugin-buble'; + +import { createConfig } from '../../shared/rollup.config.mjs'; + +export default { + ...createConfig({ + pkg: JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8')) + }), + input: 'src/index.js', + plugins: [buble()] +}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 74fd3e235..a1e37f5c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -351,15 +351,15 @@ importers: packages/legacy: specifiers: '@rollup/plugin-buble': ^0.21.3 - '@rollup/pluginutils': ^4.1.0 - del-cli: ^3.0.1 - rollup: ^2.67.3 + '@rollup/pluginutils': ^4.2.1 + del-cli: ^5.0.0 + rollup: ^3.0.0-7 dependencies: '@rollup/pluginutils': 4.2.1 devDependencies: - '@rollup/plugin-buble': 0.21.3_rollup@2.79.1 - del-cli: 3.0.1 - rollup: 2.79.1 + '@rollup/plugin-buble': 0.21.3_rollup@3.0.0-7 + del-cli: 5.0.0 + rollup: 3.0.0-7 packages/multi-entry: specifiers: