Updates build.

meadow · Dec 1, 2020 · 44ec859 · 44ec859
1 parent 304a365
commit 44ec859
Show file tree

Hide file tree

Showing 6 changed files with 128 additions and 105 deletions.
diff --git a/build/lib/PathUtils.js b/build/lib/PathUtils.js
@@ -76,7 +76,11 @@ var PathUtils = {
     var params = {};
 
     paramNames.forEach(function (paramName, index) {
-      params[paramName] = match[index + 1];
+      var paramValue = match[index + 1];
+      if (paramValue != null) {
+        paramValue = decodeURIComponent(paramValue);
+      }
+      params[paramName] = paramValue;
     });
 
     return params;
@@ -112,7 +116,7 @@ var PathUtils = {
         segment = params[paramName];
       }
 
-      return segment;
+      return encodeURIComponent(segment);
     }).replace(paramInjectTrailingSlashMatcher, '/');
   },
 

diff --git a/build/lib/TestUtils.js b/build/lib/TestUtils.js
@@ -168,4 +168,19 @@ exports.EchoBarParam = React.createClass({
       this.context.router.getCurrentParams().bar
     );
   }
+});
+
+exports.EchoBarQuery = React.createClass({
+  displayName: 'EchoBarQuery',
+
+  contextTypes: {
+    router: PropTypes.router.isRequired
+  },
+  render: function render() {
+    return React.createElement(
+      'div',
+      { className: 'EchoBarQuery' },
+      this.context.router.getCurrentQuery().bar
+    );
+  }
 });
diff --git a/build/lib/locations/HistoryLocation.js b/build/lib/locations/HistoryLocation.js
@@ -72,7 +72,7 @@ var HistoryLocation = {
   pop: History.back,
 
   getCurrentPath: function getCurrentPath() {
-    return decodeURI(window.location.pathname + window.location.search);
+    return window.location.pathname + window.location.search;
   },
 
   toString: function toString() {

diff --git a/build/package.json b/build/package.json
@@ -27,6 +27,9 @@
     "react",
     "router"
   ],
+  "engines": {
+    "node": "10.x"
+  },
   "keywords": [
     "react",
     "react-component",