Work around babel error babel/babel#10179

itaylor · Jul 16, 2019 · 0844d73 · 0844d73
1 parent c86a616
commit 0844d73
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 77 deletions.
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -3502,11 +3502,6 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-error@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6853,11 +6848,6 @@ path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
-path-to-regexp@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
-  integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
-
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -8079,42 +8069,6 @@ recursive-readdir@2.2.2:
   dependencies:
     minimatch "3.0.4"
 
-redux-action-router@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/redux-action-router/-/redux-action-router-1.1.0.tgz#1739ee42de145b6db416e75cf12c06b8993a601b"
-  integrity sha512-N53eGRDmzKVGYLsQhnofeR41FXnZkut69SPr2fcJvnrJHw8h8ni6LZ8xerVvTjHAWwdymmSqHpWZJM+j3EHCSg==
-  dependencies:
-    url-mapper "^2.0.0"
-
-redux-awaitable-thunk@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/redux-awaitable-thunk/-/redux-awaitable-thunk-1.1.0.tgz#66ff6c8466fc72e4d038c90b82106c91994e0414"
-  integrity sha512-2F03hxuGNtQRHTQ9CLSN4tlArC8+T8Yl1WApvccIo2WaenACHYlPfKYqokWSCupAYjdcK47LCatk7cj5qd6ToQ==
-
-redux-socket.io-error-thunk@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/redux-socket.io-error-thunk/-/redux-socket.io-error-thunk-1.2.0.tgz#d5253a2984d291a984b218612f0d176adffa8aa9"
-  integrity sha512-Ppv7zme5cf/EzAUMCp8R5zEq3FQwKykACk1s/VkMCfQCJgyUQAKmz1igLgi02USSXNatiIrrIvERJgaKCCZJew==
-  dependencies:
-    es6-error "^4.1.1"
-
-redux-socket.io-message-thunk@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/redux-socket.io-message-thunk/-/redux-socket.io-message-thunk-1.1.0.tgz#8cd5125b91748bb13b779615e078a00b079fb6ce"
-  integrity sha512-5J6blKkbdc8OU5dovbbdPhZjHv7zW9qLzstpagxLo2fFVsLcdZ8YK/WNw94KG2V1iBgsjzddIW8WHoTgtsmu6Q==
-
-redux-thunk-error-handler@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk-error-handler/-/redux-thunk-error-handler-1.1.1.tgz#2880e4d79da83fe4dcf87879e4c0e0fe035b495c"
-  integrity sha512-c3W+b2xeIH4kF4WwB99mw9toZxhxZ+jka091cz3Qwg5X+XCeudbjg/jNNBdGGGhS0zhg8m1UHyKTF7cjDEu48A==
-  dependencies:
-    redux-thunk-recursion-detect "^1.1.1"
-
-redux-thunk-recursion-detect@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk-recursion-detect/-/redux-thunk-recursion-detect-1.1.1.tgz#7f1b13d0442bc287f37bb46e2d6943dab13d0f00"
-  integrity sha512-s50xHim5GJJQ1s5ZFXx43ZxP1L7041Fa/ZkDn+MKvmsWd0oP7wCjQPjX3LUu6fUrlyKdY1hS60cQcMV53nvC3g==
-
 redux@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.3.tgz#0ca18be085e6cf6ed50e445a125f85e8b26b266b"
@@ -8736,13 +8690,6 @@ socket.io-parser@~3.3.0:
     debug "~3.1.0"
     isarray "2.0.1"
 
-socket.io-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/socket.io-promise/-/socket.io-promise-1.1.0.tgz#be54911358ba425365006b32933208db6ff568b0"
-  integrity sha512-vOygb4tE3JHmAIaxwhbFgjWMwR3pVaggddmOh7f3j5HQiFrbcZViS8jDRWg6G2NWSNLoKCShMUeeK393qXpW7A==
-  dependencies:
-    es6-error "^4.1.1"
-
 socket.io@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.2.0.tgz#f0f633161ef6712c972b307598ecd08c9b1b4d5b"
@@ -9524,14 +9471,6 @@ url-loader@1.1.2:
     mime "^2.0.3"
     schema-utils "^1.0.0"
 
-url-mapper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/url-mapper/-/url-mapper-2.0.0.tgz#bf88f791f184d2ccd62124f1e72e0fe98bf0c866"
-  integrity sha1-v4j3kfGE0szWISTx5y4P6YvwyGY=
-  dependencies:
-    path-to-regexp "^2.1.0"
-    urlon "^3.0.1"
-
 url-parse@^1.4.3:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -9547,11 +9486,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-urlon@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/urlon/-/urlon-3.0.1.tgz#f1b38d004ad8a6c62403677a329dd31dafb622dd"
-  integrity sha512-G3njKjdNzJwBoV+i2sezurLCu9RchRJVMn21rtI7D8cCXmI9sXEhfTBkP35HQDknQLTJFYCHepe3tOsHvZTgZA==
-
 use@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"

diff --git a/packages/redux-action-router/.babelrc b/packages/redux-action-router/.babelrc
@@ -1,9 +1,7 @@
 {
-  "plugins": ["@babel/plugin-proposal-object-rest-spread"],
   "env":{
     "test": {
       "plugins": [
-        "@babel/plugin-proposal-object-rest-spread",
         "@babel/plugin-transform-modules-commonjs"
       ]
     }

diff --git a/packages/redux-action-router/src/reduxActionRouter.js b/packages/redux-action-router/src/reduxActionRouter.js
@@ -5,12 +5,11 @@ import hashchangeSupport from './hashchangeSupport.js';
 let urlSupport;
 
 export default function createActionRouterMiddleware(routes, opts) {
-  const options = {
+  const options = Object.assign({
     dispatcher,
     actionHandler,
     urlSupport: hashchangeSupport,
-    ...opts,
-  };
+  }, opts);
   if (urlSupport) {
     urlSupport.cleanUp();
   }
@@ -30,10 +29,7 @@ export default function createActionRouterMiddleware(routes, opts) {
         const { match } = matched;
         if (query) {
           const parsedQuery = querystring.parse(query);
-          values = {
-            ...parsedQuery,
-            ...values,
-          };
+          values = Object.assign({}, parsedQuery, values);
         }
         options.dispatcher(store, match, values, path);
       }

diff --git a/packages/redux-awaitable-state/.babelrc b/packages/redux-awaitable-state/.babelrc
@@ -1,9 +1,7 @@
 {
-  "plugins": ["@babel/plugin-proposal-object-rest-spread"],
   "env":{
     "test": {
       "plugins": [
-        "@babel/plugin-proposal-object-rest-spread",
         "@babel/plugin-transform-modules-commonjs"
       ]
     }