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 5d2fb2364..8889cc1e7 100644 Binary files a/packages/inject/test/snapshots/test.js.snap and b/packages/inject/test/snapshots/test.js.snap differ 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: