prepare 0.14.0

#56

Author: HillLiu

packages/reshow-url/compile.sh

@@ -16,6 +16,7 @@ stop(){
 
 watch(){
     stop 
+    echo "Watch Mode";
     npm run build:cjs:ui -- --watch &
     npm run build:cjs:src -- --watch &
     npm run build:es:ui -- --watch &

packages/reshow-url/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reshow-url",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "reshow url util",
   "main": "./build/cjs/src/index.js",
   "module": "./build/es/src/index.js",

packages/reshow-url/src/stores/urlStore.js

@@ -8,6 +8,12 @@ import arrayDedup from "array.dedup";
 
 const keys = Object.keys;
 
+/**
+ * Calling history.pushState() or history.replaceState() won't trigger a popstate event.
+ * The popstate event is only triggered by performing a browser action, such as clicking on the back button 
+ *
+ * https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
+ */
 const updateUrl = (url) => history.pushState && history.pushState("", "", url);
 
 const urlChange = "urlChange";
@@ -55,10 +61,10 @@ class UrlStore extends ReduceStore {
     return new URL({});
   }
 
-  urlChange = () => {
+  handleUrlChange = () => {
     this.nextEmits.push(urlChange);
     urlDispatch({ type: "url", url: doc().URL });
-    ajaxDispatch("urlChange");
+    ajaxDispatch(urlChange);
   };
 
   onUrlChange(cb) {
@@ -69,9 +75,9 @@ class UrlStore extends ReduceStore {
     this.removeListener(cb, urlChange);
   }
 
-  registerEvent(win) {
-    if (win && win.addEventListener) {
-      win.addEventListener("popstate", this.urlChange, true);
+  registerEvent(oWin) {
+    if (oWin && oWin.addEventListener) {
+      oWin.addEventListener("popstate", this.handleUrlChange, true);
       ajaxStore.urlDispatch = urlDispatch;
     }
   }

packages/reshow-url/ui/organisms/__tests__/UrlReturnTest.js

@@ -38,18 +38,24 @@ describe("Test Url Return", () => {
       );
     }
   }
-  it("test get pathname", () => {
+  it("test get pathname", (done) => {
     const vDom = <FakeComponent urlKey=":pathname" />;
     const uFake = mount(vDom).instance();
     urlDispatch({ type: "url", url: "http://localhost/aaa" });
-    expect(uFake.el.props[":pathname"]).to.deep.equal(["", "aaa"]);
+    setTimeout(() => {
+      expect(uFake.el.props[":pathname"]).to.deep.equal(["", "aaa"]);
+      done();
+    }, 100);
   });
 
-  it("test get query", () => {
+  it("test get query", (done) => {
     const vDom = <FakeComponent urlKey="foo" />;
     const uFake = mount(vDom).instance();
     urlDispatch({ type: "query", params: { foo: "bar" } });
-    expect(uFake.el.props["foo"]).to.equal("bar");
+    setTimeout(() => {
+      expect(uFake.el.props["foo"]).to.equal("bar");
+      done();
+    }, 100);
   });
 
   it("test trigger by history", (done) => {

packages/reshow-url/yarn.lock

@@ -1253,9 +1253,9 @@ once@^1.3.0:
     wrappy "1"
 
 organism-react-ajax@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/organism-react-ajax/-/organism-react-ajax-0.14.0.tgz#4feb5646c5b178a3f941301e5c4a358bb8f3a4e1"
-  integrity sha512-/4+t2qI1FwTCrE8a3LFRO/S09fI48LLi1+Ul6yiHmPmfHFhwIRcnB7xZZWug3+raszTMLMGa7zZlKjDXXpOQOQ==
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/organism-react-ajax/-/organism-react-ajax-0.14.1.tgz#ffc59a4a0b0ac6da5f37546bc78c682cd436d9e6"
+  integrity sha512-tdFJT5stecAp8EwsfTaMzMWNuZSggFWE6YUHDJIjwXT/KYjQZ7RScgBEKZsNDcv1xEdaaOPLhAzpI+aRCx59JA==
   dependencies:
     call-func "*"
     es6-promise "4.2.5"
@@ -1537,9 +1537,9 @@ reshow-runtime@*:
     reshow-constant "*"
 
 reshow@*:
-  version "0.12.11"
-  resolved "https://registry.yarnpkg.com/reshow/-/reshow-0.12.11.tgz#785073f0b91fa53e82dd7a6df4d2b4a130942403"
-  integrity sha512-dxxAMSDfPLXLDjo/yi5NQzzzl8DsAr3DhBLBmQM1L38mtQOhAUMmGLNeYiJEVp03v/Y0qG8PnyvTIrqRUpPEIQ==
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/reshow/-/reshow-0.14.0.tgz#b6d4e57c23d1ab686ae7d969c28421686df8e5b9"
+  integrity sha512-UOreukYZ1B+9cPz1PQCu29A472l735Xva3/CkmeG+Fb5wPqZek3ZmZciAF7ybtwNELPq7GBJqOgqrDALEERwvg==
   dependencies:
     call-func "*"
     get-storage "*"
@@ -1549,6 +1549,7 @@ reshow@*:
     organism-react-popup "*"
     react-atomic-molecule "*"
     reshow-flux "*"
+    reshow-return "*"
     reshow-runtime "*"
     seturl "*"
     smooth-scroll-to "*"