improve url change logic

Author: HillLiu

packages/reshow-url/compile.sh

@@ -1,3 +1,37 @@
 #!/bin/sh
 
-npm run build
+develop(){
+    echo "Develop Mode";
+    npm run build
+}
+
+killBy(){
+    ps auxwwww | grep $1 | grep -v grep | awk '{print $2}' | xargs -I{} kill -9 {}
+}
+
+stop(){
+    DIR="$( cd "$(dirname "$0")" ; pwd -P )"
+    killBy ${DIR}/node_modules/.bin/babel 
+}
+
+watch(){
+    stop 
+    npm run build:cjs:ui -- --watch &
+    npm run build:cjs:src -- --watch &
+    npm run build:es:ui -- --watch &
+    npm run build:es:src -- --watch &
+}
+
+case "$1" in
+  watch)
+    watch 
+    ;;
+  stop)
+    stop 
+    ;;
+  *)
+    develop
+    ;; 
+esac
+
+exit $?

packages/reshow-url/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reshow-url",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "reshow url util",
   "main": "./build/cjs/src/index.js",
   "module": "./build/es/src/index.js",
@@ -25,10 +25,15 @@
   },
   "scripts": {
     "clean": "find ./build -name '*.*' | xargs rm -rf",
-    "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --root-mode upward && BABEL_ENV=cjs babel ui -d build/cjs/ui --root-mode upward",
-    "build:es": "BABEL_ENV=es babel src -d build/es/src --root-mode upward && BABEL_ENV=es babel ui -d build/es/ui --root-mode upward",
+    "build:cjs": "npm run build:cjs:src && npm run build:cjs:ui",
+    "build:cjs:src": "BABEL_ENV=cjs babel src -d build/cjs/src --root-mode upward",
+    "build:cjs:ui": "BABEL_ENV=cjs babel ui -d build/cjs/ui --root-mode upward",
+    "build:es": "npm run build:es:src && npm run build:es:ui",
+    "build:es:src": "BABEL_ENV=es babel src -d build/es/src --root-mode upward",
+    "build:es:ui": "BABEL_ENV=es babel ui -d build/es/ui --root-mode upward",
     "build": "npm run clean && npm run build:cjs && npm run build:es",
-    "mocha": "mocha -r jsdom-global/register 'build/cjs/**/__tests__/*.js'",
+    "mochaFor": "mocha -r jsdom-global/register",
+    "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"
   },

packages/reshow-url/ui/organisms/ClientRoute.jsx

@@ -27,11 +27,12 @@ class ClientRoute extends Reshow {
   };
 
   getPath() {
-    const nextThemePath = this.getGlobalPath()
-      ? this.resetGlobalPath()
-      : this.getUrlChangeState(this.props.url || doc().URL)?.themePath ||
-        this.resetGlobalPath();
-    this.resetGlobalPath(nextThemePath);
+    let nextThemePath = this.getUrlChangeState(this.props.url || doc().URL)?.themePath;
+    if (!nextThemePath) {
+      nextThemePath = this.resetGlobalPath();
+    } else {
+      this.resetGlobalPath(nextThemePath);
+    }
     return nextThemePath;
   }