Update LocationUtils.js

modules/LocationUtils.js

@@ -31,21 +31,8 @@ export function createLocation(path, state, key, currentLocation) {
     if (state !== undefined && location.state === undefined)
       location.state = state;
   }
-
-  try {
-    location.pathname = decodeURI(location.pathname);
-  } catch (e) {
-    if (e instanceof URIError) {
-      throw new URIError(
-        'Pathname "' +
-          location.pathname +
-          '" could not be decoded. ' +
-          'This is likely caused by an invalid percent-encoding.'
-      );
-    } else {
-      throw e;
-    }
-  }
+
+  validateSegmentsCanBeDecoded(location.pathname);
 
   if (key) location.key = key;
 
@@ -69,6 +56,27 @@ export function createLocation(path, state, key, currentLocation) {
   return location;
 }
 
+function validateSegmentsCanBeDecoded(pathname){
+  var segments = pathname.split('/');
+
+  for(var i = 0; i < segments.length; ++i) {
+    try {
+      decodeURIComponent(segments[i]);
+    } catch (e) {
+      if (e instanceof URIError) {
+        throw new URIError(
+          'Pathname "' +
+          pathname +
+          '" has segment(s) that cannot be decoded. ' +
+          'This is likely caused by an invalid percent-encoding.'
+        );
+      } else {
+        throw e;
+      }
+    }
+  }
+}
+
 export function locationsAreEqual(a, b) {
   return (
     a.pathname === b.pathname &&

modules/__tests__/TestSequences/LocationPathnameAlwaysSame.js

@@ -11,15 +11,15 @@ export default function(history, done) {
     },
     location => {
       expect(location).toMatchObject({
-        pathname: '/歴史'
+        pathname: '/%E6%AD%B4%E5%8F%B2'
       });
       // encoded object
       const pathname = '/%E6%AD%B4%E5%8F%B2';
       history.replace({ pathname });
     },
     location => {
       expect(location).toMatchObject({
-        pathname: '/歴史'
+        pathname: '/%E6%AD%B4%E5%8F%B2'
       });
       // unencoded string
       const pathname = '/歴史';

modules/__tests__/TestSequences/PushInvalidPathname.js

@@ -8,7 +8,7 @@ export default function(history, done) {
       expect(() => {
         history.push('/hello%');
       }).toThrow(
-        'Pathname "/hello%" could not be decoded. This is likely caused by an invalid percent-encoding.'
+        'Pathname "/hello%" has segment(s) that cannot be decoded. This is likely caused by an invalid percent-encoding.'
       );
     }
   ];

modules/__tests__/TestSequences/ReplaceInvalidPathname.js

@@ -8,7 +8,7 @@ export default function(history, done) {
       expect(() => {
         history.replace('/hello%');
       }).toThrow(
-        'Pathname "/hello%" could not be decoded. This is likely caused by an invalid percent-encoding.'
+        'Pathname "/hello%" has segment(s) that cannot be decoded. This is likely caused by an invalid percent-encoding.'
       );
     }
   ];