fix: publicPath had // when basePath is / and publicPath is / (#238)

Evaneos · Feb 17, 2017 · 52f68fa · 52f68fa
1 parent 5cf9628
commit 52f68fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/config/index.js b/config/index.js
@@ -140,14 +140,16 @@ export default () => {
     );
 
     // Prepend / to publicPath and basePath if necessary
-    const prependSlash = path => (path.match(/^(http|\/|$)/) ? '' : '/') + path;
+    const prependSlash = path => (
+        ((path.startsWith('/') || path.match(/^(http|\/|$)/)) ? '' : '/') + path
+    );
     [['publicPath'], ['basePath']].forEach(
         path => updatePath(path, prependSlash, config),
     );
 
     // If public path is not absolute url, prepend basePath
     updatePath(['publicPath'], publicPath =>
-        (!publicPath.match(/^(http|\/\/)/) ? config.basePath : '') + config.publicPath,
+        (!publicPath.match(/^(http|\/\/)/) ? config.basePath.replace(/\/$/, '') : '') + config.publicPath,
     config);
 
     return {

diff --git a/examples/counter/.vitaminrc b/examples/counter/.vitaminrc
@@ -1,5 +1,5 @@
 {
-    "basePath": "/piouaoaa",
+    "basePath": "/",
     "publicPath": "",
     "routes": "./routes",
     "redux": {