From e33a9ff99aecb2b4dc0e99548fe171214edf8ca6 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 30 Sep 2022 06:52:24 +0200 Subject: [PATCH] fix(inject): prepare for Rollup 3 BREAKING CHANGES: Requires Node 14 --- .prettierignore | 1 + packages/inject/README.md | 2 +- packages/inject/package.json | 42 +++++++++++++------- packages/inject/rollup.config.js | 15 ------- packages/inject/rollup.config.mjs | 13 ++++++ packages/inject/test/snapshots/test.js.md | 2 +- packages/inject/test/snapshots/test.js.snap | Bin 948 -> 895 bytes packages/inject/{ => types}/index.d.ts | 0 pnpm-lock.yaml | 26 ++++++------ 9 files changed, 56 insertions(+), 45 deletions(-) delete mode 100644 packages/inject/rollup.config.js create mode 100644 packages/inject/rollup.config.mjs rename packages/inject/{ => types}/index.d.ts (100%) diff --git a/.prettierignore b/.prettierignore index 49c3fcbbb..1cf411722 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,4 +5,5 @@ packages/json/test/fixtures/garbage/* packages/yaml/test/fixtures/**/* **/dist/ **/fixtures/ +**/snapshots/ pnpm-lock.yaml diff --git a/packages/inject/README.md b/packages/inject/README.md index 3ba127f5a..7473b4dd0 100644 --- a/packages/inject/README.md +++ b/packages/inject/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/inject/package.json b/packages/inject/package.json index ccbb77d95..7bb3dc492 100644 --- a/packages/inject/package.json +++ b/packages/inject/package.json @@ -13,8 +13,16 @@ "author": "Rich Harris ", "homepage": "https://github.com/rollup/plugins/tree/master/packages/inject#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", @@ -27,11 +35,12 @@ "pretest": "pnpm build", "release": "pnpm --workspace-root plugin:release --pkg $npm_package_name", "test": "ava", - "test:ts": "tsc index.d.ts test/types.ts --noEmit" + "test:ts": "tsc types/index.d.ts test/types.ts --noEmit" }, "files": [ "dist", - "index.d.ts", + "!dist/**/*.map", + "types", "README.md", "LICENSE" ], @@ -44,25 +53,28 @@ "modules" ], "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": "^3.1.0", - "estree-walker": "^2.0.1", - "magic-string": "^0.25.7" + "@rollup/pluginutils": "^4.2.1", + "estree-walker": "^2.0.2", + "magic-string": "^0.26.4" }, "devDependencies": { "@rollup/plugin-buble": "^0.21.3", - "del-cli": "^3.0.1", + "del-cli": "^5.0.0", "locate-character": "^2.0.5", - "rollup": "^2.67.3", - "source-map": "^0.7.3", - "typescript": "^3.9.7" + "rollup": "^3.0.0-7", + "source-map": "^0.7.4", + "typescript": "^4.8.3" }, + "types": "./types/index.d.ts", "ava": { - "babel": { - "compileEnhancements": false - }, "files": [ "!**/fixtures/**", "!**/helpers/**", diff --git a/packages/inject/rollup.config.js b/packages/inject/rollup.config.js deleted file mode 100644 index 2244813fc..000000000 --- a/packages/inject/rollup.config.js +++ /dev/null @@ -1,15 +0,0 @@ -import buble from '@rollup/plugin-buble'; - -import pkg from './package.json'; - -const external = Object.keys(pkg.dependencies).concat('path'); - -export default { - input: 'src/index.js', - plugins: [buble()], - external, - output: [ - { file: pkg.main, format: 'cjs', exports: 'auto' }, - { file: pkg.module, format: 'es' } - ] -}; diff --git a/packages/inject/rollup.config.mjs b/packages/inject/rollup.config.mjs new file mode 100644 index 000000000..888000cd3 --- /dev/null +++ b/packages/inject/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/packages/inject/test/snapshots/test.js.md b/packages/inject/test/snapshots/test.js.md index 9d2dce476..be5457c96 100644 --- a/packages/inject/test/snapshots/test.js.md +++ b/packages/inject/test/snapshots/test.js.md @@ -112,7 +112,7 @@ Generated by [AVA](https://avajs.dev). $inject_Buffer_isBuffer('foo');␊ ` -## generates \* imports +## generates * imports > Snapshot 1 diff --git a/packages/inject/test/snapshots/test.js.snap b/packages/inject/test/snapshots/test.js.snap index 5d2fb236487174ffa871c0924ae0252d988da746..8889cc1e71ad9fd686d303b18369a7d6215166e3 100644 GIT binary patch literal 895 zcmV-_1AzQNRzVt!yE80%sRFcQ&aJAAX1e5n%UpX{Acqy9V-*>(uXhT zq*HjfCN-gTBtRsXLZO_H)7)4m$brKtY9~oUPML9Z{5eU$!Hey4y$e16Idi^u@yw&j z;HdEcB-X`Tq}EJDu(Ma7odu(Qe?1Hb;?`|()E6Q)nvB9onMoK}gk%;BM*TT|YqHA) zAqkhEn3|+eJkG7jnRWJ`fYy*=$e9CjLylQ89!p)}2@O*`N%pEm_V9GFWIHg~KY)#a zORIo>2Mk(ZPfrIcoo;V?|9_4rmJ;(Q$!`ekxCKWI++(JZgdVOQ)`&Sm`*UyEx0iWponv`zr3) zZ@tcBO1*=zd$Tnze}G6%bVHxYLswX&VSULkH)@tjrD$kMi_L{av_n2TpLHjUl@qB! ziCcVEYRpX$jKKzCKB^AH%4p=>&dbB2`9|Y{L+;~YiCsgN#>+BZViUuN0uLoQ&Qev! zj(j|9mG4fKj`e@+zbhH&#J>ZSL1GSANc&(VjCtuKLe@ffnHD;B(rBT8M_IT&C@)9%A0_SEgaAOPf@OgB7}~OF9nLPwMwdcJX~|N#=d;FC@Mwaifz`1dYk4-)uy6 zFL3dU+Q+b^{6IQ!VC*gh%V75FSS%)mPCz>^{*EY2E6Z@2?(Y_9iuR49#h?jF(&o5a zDFxAeI1E_aD||FTjTU@UUi-BQpSR%dS8&%n6uYY%j~!RJtV_>J5x3D`)Uo<*rQ+9} z1x>m1iPA=IK6on9axyNQs56*?RKBr=Ga?5|9WSwNalWlMgJ?)@#xA0me9KqMOY&&w zkysO+pF5hB7U5n2%A;-w|B6IAM(Qw#qF}?n4DW(f!LHT)9A_Bs3Q13pQ;j-C9y7P< zV*T2Z?Wd(|Ibn5T>&kk9pL1Itytz2$6U_fBB<}IdcOY+tgN|PG&-bDcxecpF>Zr70 VnKyIq6Q~5?1RNx?fHz`mmt;BMFI17E1HhoZ_4P=G z10F%x)4u%d?489eV+VWok7!=lDRT5Q$U*e3;!Szc)`^FYoVrqXWu(Z_9T|eq8d-U# zxct_}E`Mh0r=pi!6m&E!Sbbpr)Xz7~;iHy{9Nh)- zYFb9-#UT|f<2_}in-1x1B1gY~WC(+J55<8(mS?|U)Q5@fpe7X1Y@|`76M|w$w@E#c z!XoBQ+bMulQgTbu0>3T8RjO5)~=0UJIbi$DnMZ7EY2a7fox-~Iw}JR z#`=%gi~5dTT`7}LKSQr^L(8gH zKWLv(VL`bwAbWHQ!FnT0*XlNc!D%{PHWWCzSoe#MGI9{2DD&ZKbNt@O)x%j&E5VGl77e8 zE<&~5!d}qz>0!0LMlvU&>)7@iG_EA8F=&2(BfOU0jTKHUJss`Gjwe=EGfia`dyAHZ z467y&IU&vAYSkahOi4X1g>Rdmr4#s{Pti&}Vg((8Sjf~s3n{tr*EBWM--03j9>*lf WbyakW`{zQ8^J diff --git a/packages/inject/index.d.ts b/packages/inject/types/index.d.ts similarity index 100% rename from packages/inject/index.d.ts rename to packages/inject/types/index.d.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a042bd7d0..da125ece0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -313,25 +313,25 @@ importers: packages/inject: specifiers: '@rollup/plugin-buble': ^0.21.3 - '@rollup/pluginutils': ^3.1.0 - del-cli: ^3.0.1 - estree-walker: ^2.0.1 + '@rollup/pluginutils': ^4.2.1 + del-cli: ^5.0.0 + estree-walker: ^2.0.2 locate-character: ^2.0.5 - magic-string: ^0.25.7 - rollup: ^2.67.3 - source-map: ^0.7.3 - typescript: ^3.9.7 + magic-string: ^0.26.4 + rollup: ^3.0.0-7 + source-map: ^0.7.4 + typescript: ^4.8.3 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 + '@rollup/pluginutils': 4.2.1 estree-walker: 2.0.2 - magic-string: 0.25.9 + magic-string: 0.26.4 devDependencies: - '@rollup/plugin-buble': 0.21.3_rollup@2.79.1 - del-cli: 3.0.1 + '@rollup/plugin-buble': 0.21.3_rollup@3.0.0-7 + del-cli: 5.0.0 locate-character: 2.0.5 - rollup: 2.79.1 + rollup: 3.0.0-7 source-map: 0.7.4 - typescript: 3.9.10 + typescript: 4.8.3 packages/json: specifiers: