From 4d070f64f41b15351398dffab7558e3f2df5c92f Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 23 Sep 2022 07:06:00 +0200 Subject: [PATCH] fix(auto-install): prepare for Rollup 3 BREAKING CHANGES: Requires Node 14 --- packages/auto-install/README.md | 2 +- packages/auto-install/package.json | 40 +++++++++++------- packages/auto-install/rollup.config.js | 13 ------ packages/auto-install/rollup.config.mjs | 7 +++ packages/auto-install/src/index.ts | 2 +- .../test/snapshots/npm-bare.js.snap | Bin 142 -> 175 bytes .../auto-install/test/snapshots/npm.js.snap | Bin 237 -> 244 bytes pnpm-lock.yaml | 18 ++++---- 8 files changed, 42 insertions(+), 40 deletions(-) delete mode 100644 packages/auto-install/rollup.config.js create mode 100644 packages/auto-install/rollup.config.mjs diff --git a/packages/auto-install/README.md b/packages/auto-install/README.md index 141705bdf..d33835f79 100755 --- a/packages/auto-install/README.md +++ b/packages/auto-install/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/auto-install/package.json b/packages/auto-install/package.json index d7fd35331..1e10188b2 100755 --- a/packages/auto-install/package.json +++ b/packages/auto-install/package.json @@ -13,8 +13,16 @@ "author": "Rich Harris", "homepage": "https://github.com/rollup/plugins/tree/master/packages/auto-install/#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": { + "import": "./dist/es/index.js", + "types": "./types/index.d.ts", + "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", @@ -31,6 +39,7 @@ }, "files": [ "dist", + "!dist/**/*.map", "types", "README.md", "LICENSE" @@ -44,25 +53,24 @@ "modules" ], "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } }, "devDependencies": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-typescript": "^5.0.2", - "del": "^5.1.0", + "@rollup/plugin-node-resolve": "^14.1.0", + "@rollup/plugin-typescript": "^8.5.0", + "del": "^6.1.1", "node-noop": "^1.0.0", - "rollup": "^2.67.3", - "typescript": "^4.1.2" + "rollup": "^3.0.0-7", + "typescript": "^4.8.3" }, - "types": "types/index.d.ts", + "types": "./types/index.d.ts", "ava": { - "babel": true, - "extensions": [ - "ts" - ], - "require": [ - "ts-node/register" - ], + "workerThreads": false, "files": [ "!**/fixtures/**", "!**/output/**", diff --git a/packages/auto-install/rollup.config.js b/packages/auto-install/rollup.config.js deleted file mode 100644 index 3be3f88a2..000000000 --- a/packages/auto-install/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({ sourceMap: false })], - external: ['path', 'fs', 'child_process', 'module', 'util'], - output: [ - { format: 'cjs', file: pkg.main, exports: 'auto' }, - { format: 'esm', file: pkg.module } - ] -}; diff --git a/packages/auto-install/rollup.config.mjs b/packages/auto-install/rollup.config.mjs new file mode 100644 index 000000000..2a28aaaf6 --- /dev/null +++ b/packages/auto-install/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/auto-install/src/index.ts b/packages/auto-install/src/index.ts index d01d12343..21852574f 100644 --- a/packages/auto-install/src/index.ts +++ b/packages/auto-install/src/index.ts @@ -6,7 +6,7 @@ import { promisify } from 'util'; import { Plugin } from 'rollup'; -import { RollupAutoInstallOptions } from '../types'; +import type { RollupAutoInstallOptions } from '../types'; const execAsync = promisify(exec); diff --git a/packages/auto-install/test/snapshots/npm-bare.js.snap b/packages/auto-install/test/snapshots/npm-bare.js.snap index eff58914d1825dda87118ed14896037c76a6c557..b4e4b48757038728a74e14e5aff55b11bc4c0807 100644 GIT binary patch literal 175 zcmV;g08sxyRzVg{hWXmN3 zAP?yO{vV4700000000A9n3j~2pPXIXxG1$Gvm_@qGp`_5Md0|+p(G6*u7RdXpQD5azpq~@ih<|SvQ7AsjPfW&~JdHE@+x_SBe d1wbLCI72-HJp(16Of6R}7XSlAausm^003g^K_dVF literal 142 zcmZ<^b5sbm*vIz1dBp2>G}Fn|GbZ~_pd2;}Wh z`%=5;@b}97>sjvP+~40gk&z{)VaCix*)wS=sRAh`tDgl01bBJsdYtw4JnMbVM>lL! r5JM-U>*r6wL8YHRedca(@+xerVyj~Fa+n#lE=rG~Q99edid5Db1@`VT&xTO1t zpg7&Yvmc8H00000000AJjzJ2-Knz7&M1=0VLFi^ST6E*WwMP(fC8RT{4z0=HjDm;@ zy-7W(Q&dpQCj1xv|7okT5ncQHgMtkWiRBYE*1#Saw{) uXO|2hH{^&7v9{#%Idm*i7DHneaS`R4X)!4#dAwY+YxV@UgJID30001F3T<-$ literal 237 zcmV|V6A?8-~a#s4P0P< diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5cf16900a..483c2eea4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,18 +91,18 @@ importers: packages/auto-install: specifiers: - '@rollup/plugin-node-resolve': ^8.4.0 - '@rollup/plugin-typescript': ^5.0.2 - del: ^5.1.0 + '@rollup/plugin-node-resolve': ^14.1.0 + '@rollup/plugin-typescript': ^8.5.0 + del: ^6.1.1 node-noop: ^1.0.0 - rollup: ^2.67.3 - typescript: ^4.1.2 + rollup: ^3.0.0-7 + typescript: ^4.8.3 devDependencies: - '@rollup/plugin-node-resolve': 8.4.0_rollup@2.79.1 - '@rollup/plugin-typescript': 5.0.2_5q64ijqsuisqe52alrh6v6njki - del: 5.1.0 + '@rollup/plugin-node-resolve': 14.1.0_rollup@3.0.0-7 + '@rollup/plugin-typescript': 8.5.0_vmpcm5aav5u37diqfc6pdubvhq + del: 6.1.1 node-noop: 1.0.0 - rollup: 2.79.1 + rollup: 3.0.0-7 typescript: 4.8.3 packages/babel: