Merge remote-tracking branch 'origin/master' into greenkeeper/rollup-…

…plugin-commonjs-10.0.0
elderapo · Jun 13, 2019 · 0fa2c11 · 0fa2c11
2 parents 60cde1a + 31fc176
commit 0fa2c11
Show file tree

Hide file tree

Showing 2 changed files with 1,157 additions and 1,055 deletions.
diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-resolve": "^4.2.3",
+    "rollup-plugin-node-resolve": "^5.0.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rollup-plugin-typescript2": "^0.21.0",
     "semantic-release": "^15.13.3",