Upgrading esm-bundle-scripts

Author: Joel Denning

package.json

@@ -36,9 +36,8 @@
   },
   "homepage": "https://github.com/esm-bundle/react#readme",
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "7.1.3",
     "@rollup/plugin-replace": "2.3.2",
-    "esm-bundle-scripts": "1.1.0",
+    "esm-bundle-scripts": "1.2.0",
     "react": "16.13.1"
   },
   "dependencies": {}

yarn.lock

@@ -543,7 +543,11 @@
     magic-string "^0.25.2"
     resolve "^1.11.0"
 
+<<<<<<< HEAD
 "@rollup/plugin-node-resolve@7.1.3", "@rollup/plugin-node-resolve@^7.1.3":
+=======
+"@rollup/plugin-node-resolve@^7.1.3":
+>>>>>>> Upgrading esm-bundle-scripts
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
   integrity sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==
@@ -2014,10 +2018,17 @@ escodegen@^1.11.1:
   optionalDependencies:
     source-map "~0.6.1"
 
+<<<<<<< HEAD
 esm-bundle-scripts@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/esm-bundle-scripts/-/esm-bundle-scripts-1.1.0.tgz#ed56bde1ca4dd7f05c355adcce2fc54c26ea282b"
   integrity sha512-CkDmDOX7ECL69Ye0Bm4FcNl5BnWykqwGLqpP5bcjYrWcLnYmYdQQZjPtAphI59b2dFzVqKTxwJxfc7/H0t2nrw==
+=======
+esm-bundle-scripts@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/esm-bundle-scripts/-/esm-bundle-scripts-1.2.0.tgz#9366d844522d518501253b893c5c184d29de882b"
+  integrity sha512-N+5V8oL8XsdXjruLfSlX3JCuuvcmNf69feL8zLBVpttyHAHufBn5aN3U7nnNJRxMs7zeaH63s9pF/X6A5iZscg==
+>>>>>>> Upgrading esm-bundle-scripts
   dependencies:
     "@rollup/plugin-commonjs" "^11.1.0"
     "@rollup/plugin-node-resolve" "^7.1.3"
@@ -2032,7 +2043,7 @@ esm-bundle-scripts@1.1.0:
     prettier "^2.0.5"
     pretty-quick "^2.0.1"
     release-it "^13.5.5"
-    release-it-plugin-esm-bundle "^2.0.0"
+    release-it-plugin-esm-bundle "^2.1.0"
     rollup "^2.7.1"
     rollup-cli "^1.0.9"
     rollup-plugin-terser "^5.3.0"
@@ -4745,10 +4756,10 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-release-it-plugin-esm-bundle@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/release-it-plugin-esm-bundle/-/release-it-plugin-esm-bundle-2.0.0.tgz#4d4af9c5040354078f145a6ce3b1d147831a86d0"
-  integrity sha512-n99mvuGG3zgEnliJMcQoDiddRiTzShcQ0EEcHPOKLxTKpcVkr0DqTCTsLFL53Q8TYR2biBxs81pNdzISbg0ctg==
+release-it-plugin-esm-bundle@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/release-it-plugin-esm-bundle/-/release-it-plugin-esm-bundle-2.1.0.tgz#e3b23223102e0fdf121cc6608d6c86a0a7b382eb"
+  integrity sha512-AWnkgV488lCVqrUX69PppbdtfuHANXBPIpozr9NbjNp+MZTKtFeBvu8+bSwzxY3EUn0vCOa3MEXTi15eUc+d3A==
 
 release-it@^13.5.5:
   version "13.5.5"
@@ -4893,7 +4904,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.14.2, resolve@^1.15.1:
+resolve@^1.14.2:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c"
+  integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@^1.15.1:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
   integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==