diff --git a/packages/url/README.md b/packages/url/README.md index 2d71dd193..c2bd5205f 100644 --- a/packages/url/README.md +++ b/packages/url/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/url/package.json b/packages/url/package.json index 83743f2b6..dff0f0577 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -13,10 +13,15 @@ "author": "Arpad Borsos ", "homepage": "https://github.com/rollup/plugins/tree/master/packages/url/#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": ">=10.0.0" + "node": ">=14.0.0" }, "scripts": { "build": "rollup -c", @@ -33,6 +38,7 @@ }, "files": [ "dist", + "!dist/**/*.map", "types", "README.md", "LICENSE" @@ -43,23 +49,26 @@ "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", "make-dir": "^3.1.0", - "mime": "^2.4.6" + "mime": "^3.0.0" }, "devDependencies": { - "del": "^5.1.0", - "globby": "^11.0.1", - "rollup": "^2.67.3" + "del": "^6.1.1", + "globby": "^11.1.0", + "rollup": "^3.0.0-7" }, "types": "./types/index.d.ts", "ava": { - "babel": { - "compileEnhancements": false - }, + "workerThreads": false, "files": [ "!**/fixtures/**", "!**/output/**", diff --git a/packages/url/rollup.config.js b/packages/url/rollup.config.js deleted file mode 100644 index 45735c1f9..000000000 --- a/packages/url/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -import pkg from './package.json'; - -const external = Object.keys(pkg.dependencies).concat(['crypto', 'path', 'fs', 'util']); - -export default { - input: 'src/index.js', - external, - output: [ - { file: pkg.main, format: 'cjs', sourcemap: true, exports: 'auto' }, - { file: pkg.module, format: 'es', sourcemap: true } - ] -}; diff --git a/packages/url/rollup.config.mjs b/packages/url/rollup.config.mjs new file mode 100644 index 000000000..80558c224 --- /dev/null +++ b/packages/url/rollup.config.mjs @@ -0,0 +1,11 @@ +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')) + }), + input: 'src/index.js', + plugins: [] +}; diff --git a/packages/url/test/snapshots/test.js.md b/packages/url/test/snapshots/test.js.md index 4da199a69..6f106b8a5 100644 --- a/packages/url/test/snapshots/test.js.md +++ b/packages/url/test/snapshots/test.js.md @@ -125,6 +125,21 @@ Generated by [AVA](https://avajs.dev). ## copy "large" binary files, limit: 10 +> Snapshot 1 + + `var svg = "98ea1a8cc8cd9baf.svg";␊ + ␊ + export { svg as default };␊ + ` + +> Snapshot 2 + + [ + 'output/98ea1a8cc8cd9baf.svg', + ] + +## copy files with include by absolute path, limit: 0 + > Snapshot 1 `var svg = "98ea1a8cc8cd9baf.svg";␊ @@ -255,18 +270,3 @@ Generated by [AVA](https://avajs.dev). [ 'output/dest/fixtures/6b71fbe07b498a82.png', ] - -## copy files with include by absolute path, limit: 0 - -> Snapshot 1 - - `var svg = "98ea1a8cc8cd9baf.svg";␊ - ␊ - export { svg as default };␊ - ` - -> Snapshot 2 - - [ - 'output/98ea1a8cc8cd9baf.svg', - ] diff --git a/packages/url/test/snapshots/test.js.snap b/packages/url/test/snapshots/test.js.snap index 83f679dbd..43e744421 100644 Binary files a/packages/url/test/snapshots/test.js.snap and b/packages/url/test/snapshots/test.js.snap differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c75924595..d7877e5be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -524,19 +524,19 @@ importers: packages/url: specifiers: '@rollup/pluginutils': ^4.2.1 - del: ^5.1.0 - globby: ^11.0.1 + del: ^6.1.1 + globby: ^11.1.0 make-dir: ^3.1.0 - mime: ^2.4.6 - rollup: ^2.67.3 + mime: ^3.0.0 + rollup: ^3.0.0-7 dependencies: '@rollup/pluginutils': 4.2.1 make-dir: 3.1.0 - mime: 2.6.0 + mime: 3.0.0 devDependencies: - del: 5.1.0 + del: 6.1.1 globby: 11.1.0 - rollup: 2.79.1 + rollup: 3.0.0-7 packages/virtual: specifiers: @@ -5494,9 +5494,9 @@ packages: braces: 3.0.2 picomatch: 2.3.1 - /mime/2.6.0: - resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} - engines: {node: '>=4.0.0'} + /mime/3.0.0: + resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} + engines: {node: '>=10.0.0'} hasBin: true dev: false @@ -6741,6 +6741,14 @@ packages: optionalDependencies: fsevents: 2.3.2 + /rollup/3.0.0-7: + resolution: {integrity: sha512-Hq5hpq9IrR4YfGd4o4zDtsfZnkwoCpjrQ4ZQIZrVF4ryzW6FOgXKBm6N7vJfodIJ6v+51FsqsXD2bxW5wapiuA==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: