From 05b87817b0bf969a76e2e2dfeba82dbe929a65a6 Mon Sep 17 00:00:00 2001
From: Lukas Taegert-Atkinson <lukastaegert@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:52:02 +0200
Subject: [PATCH] fix(url): prepare for Rollup 3 (#1281)

BREAKING CHANGES: Requires Node 14
---
 packages/url/README.md                   |   2 +-
 packages/url/package.json                |  31 +++++++++++++++--------
 packages/url/rollup.config.js            |  12 ---------
 packages/url/rollup.config.mjs           |  11 ++++++++
 packages/url/test/snapshots/test.js.md   |  30 +++++++++++-----------
 packages/url/test/snapshots/test.js.snap | Bin 1318 -> 1204 bytes
 pnpm-lock.yaml                           |  28 ++++++++++++--------
 7 files changed, 65 insertions(+), 49 deletions(-)
 delete mode 100644 packages/url/rollup.config.js
 create mode 100644 packages/url/rollup.config.mjs

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 <arpad.borsos@googlemail.com>",
   "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 83f679dbd508947c725d0a95c8164cd83e6be72d..43e744421c736589c8e3065fadf958cbc1eeafdd 100644
GIT binary patch
literal 1204
zcmV;l1WWrtRzV<BZeeh9Xm4~Nb~6eC03n-%b}Otf1w_qq<8U{xTh4BLLOCupz^>xl
z+I@oYAs>qf00000000B!md$VDL>R{7T`iyrQB{CAa9}7c(u(XlNz-o9QqVYYvn~CI
z(@na~VWqJ>cBXM{uRU(kB80@96IU*axN+nk<Q*q&<EH6;B&^UfYU0VvE6?-%-gl<+
z!qOej=!U=jK{?|N^_lB1mm=S_k;NPuvd|@d*ztJy%L~&aoIL&OZsz@rXwtpR!kynU
zXC#QjH_@V)UuUPprZS9d=p>|T#Vl(n2aR6thnnqSX#0oFj@q<ER~27M1;=g8@_9>i
zDqTm_T8*MxtFKjiSWz^!a<PV^3oQ=cX*5^Wpu1z+_U7i|#@rn3`(D7&kFg38B9mGq
zaya^FV{Rz<t4qlrWImSOTafPIARy<Gl=SB3=dS@c@h1T|mX=ZkK9vLk5uYY-;?qk6
za`{9qVyqo@+dB;#D_B_3;EAhpp{G>w7G9~V$E7_-scFqNX|)uK?y(B3twywdbQZNA
zZ_97cdKm8lURXy}a6`p%NrR=t@A0P8Wfd!$7Hb=8pwq_NSc8;ROPI)VJB41@pBDY|
zOZ0Ry`>#{%KO3^A|8w|sc7<;<YtqjDJH`Ibc;}1oG<q0G$TxCM?V##(V%l{uQXgQ!
zmB*_IhHa~~dw7)Zv<t2M<0I2QE`$f|!WP$$)bd`XnA?A%<@c*iygLLnI5oB_4R{{(
zuAKlv&8*6>M|FP^iC;%aNIwe@ad?`97)nqyyH2gaM0S;@jpmNla&U25iBG{E)+#1G
z^kQpDu5z?PAZ`U?IVy{Qw8eOxS$X8N&nJ1jNO^RG$MEd>K7)~O`ln8Id8Go~<rNh=
zKH;6^Le5-XsV)}^@!!^920DYNlq2!hX$|qAp+$!THeH<LX*cERyAe<25+!+3GK`X8
zmUUu1gz=fH>_2eWDdX!XmqiphTSDbJvWOGXEb=4WVMZP3t;4L(&;N7!x#9We1GZU|
zSa~}tpIxbx?quOvfX^hk8EGyfNg3%wh`5vaM7j$~7NpO;i2D(jZxWFtXeoA>RFTeH
z5?nW&f43YLu5yZcjCT-o4JR@w($5jmL(hpgTnC{j-_4A>QAkI2-ng|VDQjCJw_RB$
z{FJ!zn*Jzn=`{C9FP2NBRCoyUGryPi<+RX2u0+}p?+}hUut0ohAd>|yIi+vc$qbWq
zlZXVusu55E^+=FQLrzU$mKxj>o74+{1Vw|lWD(p10{T3Hd2<{^BZZ<mg5t#M(qIY@
z=JX)G9D<lEWgJIb2ysaW1|t86xF&*s@6-*M=OWLFXGGjMj_*@A@*_Cl@#@~S>Ain6
z^gdiSF}iV!(X6Qb&g<B%r|c?eyAR$x_xkkyzqs;$qmTs1w|+n^*1t4)g~TTTb@|A~
z7@`QhC@>}wX{LzOMu@;7JPK$y#g?$A$FelUa;utz&9iCPWZ~3s2xn(-u6iSrRTd!6
z=TKYY^x7$UyCd{CoKm-oel>*7^a$?{5x!hf!ts85Gq|Kk48sdd1`+{`32(U#$-i1q
SGo)d@l*T`rj@j`d6953|u2eq&

literal 1318
zcmV+>1=;#RRzV<BZeeh9Xm4~Nb}|YA0Dzm2Nq2cbUrF`o(_b?a10RbB00000000B+
zmVIm!WgN%v9@qwDZp<kJr(>WEna*9?b)#j@_}ul@ZQa)1&30Qcjw`+Ex^`RB7di$L
z9qbR3VT`)JFpif50#RfcG7>?S7~_J3C=rARD54S#@r~dze0%QcP21rdvdKvF(odeJ
z-#+d0eSW{^d4Aml2qKe6e|xR8U-e{G`#PY{&0Kpg647H*=tJafJUn1InRT(}xurjz
zc~74Vu==aQB9b7ed|m(1txpXKC(bt>FU*|>u)0EFAHp(pjCUQh<PIL_op*6#h7Vx%
z6o@f`uwDV@E>#iV<!_iB+#b1H2C$kvGX_LRJ<C$IZhl|7@bedzSKnQ70bsR9;TJ^n
z=Wjl(&R)UKC~^;<{J}B=u*xUJIE+~HLBsGHMo#Fx)WK{Q=Ay}E)sP%xIil0O=TzDK
z!#wxZGo<#};|##+PKBftf>?hjxL`qp*7?HFzEJ<jAq&7Nr?3~XIeGuLM(I=&Z)Lu}
z++~;xuzF3QeilKz#jWo>Qn~XHU+AaqvKKep39$N_!kpOzG4$XWmHWP{yZTeR)W*_o
z8ep|Sp%ZcR^hd5&tS==y&TZS<XMRTnSS?h=s6!lk{pH6_%v|1i{!2^Rl_TfR0<7*<
zNSi|tAD+FMKDeZ$JawN?@kDQ(3Sjl1!Y7E+d)SWPw!zuW_k4PC$NbeL0IS~A7@H7h
z%c?j{_rMm(^jY7+rd`_sRzFs_h8XGitu9-g()Ij-ufG|-xO)I#)qY2eLBtFq1@AjD
ziO3-7RYEW)(BjD{$ytn=hl^ZGwUSHJEOqIP2Em}qN8;jQl}c<2v<AaDYw%bhl;aj9
zA>t3`bQG)p_`O*q$V06Tkx3?JkV!BY6jqbuXfHiIogh^NNfKl#8UcvA$Qj5*2Dz{`
z5)MSd)OZFG96u^M4z0qDjRsNB3Wk*{4J+M7mmuXMJ;AL!ZalZ+noO8Zn;4*55|6Y$
z<1u#mU_L1uY6^(hky{80%e>8kN2Fw_*d>I-B7GiZY@+lKay33@1@D10<RE&7T4<tl
zQQ8DcVS$aUH&pp)GiP@S4hJoXRbECk7e+)|?W%~gtem=uCkkOD1Lb*G8uBcp3>=zD
zet-Q#+b9;&9EZJK_aL7hSPnTBbq!FUC}%>{@%kr~Sa7!z$p3g8Cwo53apyzwwuK`>
zF+@$vE%JbJYW~*6ZR$N&@$MEw|6~FFxVtcJ3nS&Bwq}2xx`07lbpeYy0U_L|)@j`8
z0+U*&!>`iVC#Vw}HN`jQlwH&}8`LZ%sDCy2|4#p9r=@Xci*gC!W}#(zj@GE-2@lhh
zJHD|xw1bf6^?0Q*hZrfNWr)}K%~q4Y5tkkty47v58UdNI!qJ*gE*UCoYPF3{ouj(G
z)*YzVg{)3pY1mcE8mkz+ruuPCTWzw#N~LO`(jtG0;ZbXimXsu{N_I23!*7ZUW>c$A
z3{Fq-7b(df-$Ftzwh(c)<8pzN(Oh^Pw3Ux)EM`xu9LMS!dn0T2$Xyo4m5If-ND71<
za)<HxS<b=hTg<j1QxwuP$1?3jFw&08HC@5m3)!Hr!sGFb$-$&|7P(GdOjL9Q#;it`
zMwesv`OUmn_CnY3_6pA7hx&3FuO|vQ#tmy)@m8TVOl^gL#uY$FMU3)*M7wyN+oWLJ
c*mRX~xeiZQcW>EWfQhaA4pW1&nN1J?05<x7W&i*H

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: