work in progress

Author: thejohnhoffer

packages/use-hash-history/__debug__/TestSequences/PushRelativePathnameWarning.js

@@ -1,24 +1,47 @@
 import { suite } from "uvu";
-import * as chai from 'chai';
+import * as assert from 'uvu/assert';
 import * as ENV from "./setup/env.js";
 import { useHashHistory } from "../index.ts";
 
-import PushRelativePathnameWarning from './TestSequences/PushRelativePathnameWarning.js';
-
 const TestUseHistory = suite("test history hook");
 
 TestUseHistory.before.each(ENV.reset);
 
+/*
+ * Roundtrip test of pathname update
+ */
+const testLocationPathname = async ({ fn, listen, input }) => {
+  return new Promise((resolve) => {
+    listen(({ location }) => {
+      resolve(location.pathname);
+    });
+    fn(input);
+  });
+};
+
 TestUseHistory("Runs", async () => {
   debugger
-	const history = useHashHistory({hashRoot:"/"})
-  chai.expect(() => {
-    PushRelativePathnameWarning(history, (e) => {
-      if (e) {
-        throw(e)
-      }
-    })
-  }).to.not.throw()
+  const history = useHashHistory({hashRoot:"/"})
+
+  await testLocationPathname({
+    fn: history.push,
+    listen: history.listen,
+    input: '/the/path?the=query#the-hash'
+  })
+
+  await testLocationPathname({
+    fn: history.push,
+    listen: history.listen,
+    input: '../other/path?another=query#another-hash'
+  })
+
+  const pathname = await testLocationPathname({
+    fn: history.push,
+    listen: history.listen,
+    input: '../other/path?another=query#another-hash'
+  })
+
+  assert.is(pathname, '../other/path?another=query#another-hash')
 });
 
 TestUseHistory.run();

packages/use-hash-history/__debug__/index.js

@@ -55,41 +55,9 @@ const makeGlobalDocument = () => {
   });
 };
 
-class ExecSteps {
-  
-  constructor ({listen, location}) {
-    this.listen = listen
-    this.ctx = {
-      location 
-    }
-  }
-  steps (steps, history, done) {
-    steps.reduce(async (context, step) => {
-      this.ctx = await context;
-      return await new Promise((resolve) => {
-        this.listen((result) => {
-          resolve({
-            ...this.ctx, ...result
-          });
-        });
-        step(this.ctx)
-      });
-    }, this.ctx).then((result) => {
-      done(result)
-    }).catch((e) => {
-      done(e)
-    });
-  }
-}
-
 export function reset() {
   const newGlobal = {
     document: makeGlobalDocument()
   };
   global.document = newGlobal.document;
-  const window = document.defaultView;
-  const {listen, location} = window.history;
-
-  const exec = new ExecSteps({listen, location})
-  global.execSteps = exec.steps.bind(exec)
 }

packages/use-hash-history/__debug__/setup/env.js

@@ -5,13 +5,15 @@ import { execSteps, spyOn } from './utils.js';
 export default (history, done) => {
   let steps = [
     ({ location }) => {
+      console.warn({warn: 1, ...location})
       expect(location).toMatchObject({
         pathname: '/'
       });
 
       history.push('/the/path?the=query#the-hash');
     },
     ({ action, location }) => {
+      console.warn({warn: 2, ...location})
       expect(action).toBe('PUSH');
       expect(location).toMatchObject({
         pathname: '/the/path?the=query#the-hash',
@@ -21,14 +23,14 @@ export default (history, done) => {
 
       let { spy, destroy } = spyOn(console, 'warn');
 
-      debugger
       history.push('../other/path?another=query#another-hash');
 
       expect(spy).not.toHaveBeenCalled();
 
       destroy();
     },
     ({ location }) => {
+      console.warn({warn: 3, ...location})
       expect(location).toMatchObject({
         pathname: '../other/path?another=query#another-hash',
         search: '',

packages/use-hash-history/__tests__/TestSequences/PushRelativePathnameWarning.js

@@ -29,13 +29,5 @@
   ],
   "peerDependencies": {
     "history": "5.x"
-  },
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "esm": "^3.2.25",
-    "history": "^5.1.0",
-    "linkedom": "^0.13.0",
-    "tsm": "^2.2.1",
-    "uvu": "^0.5.2"
   }
 }

packages/use-hash-history/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "use-hash-history",
+  "version": "1.0.1",
+  "description": "A history hook for react-router-dom",
+  "license": "MIT",
+  "author": "John T. Hoffer",
+  "repository": "github:thejohnhoffer/use-hash-history",
+  "contributors": [
+    {
+      "name": "React Training",
+      "email": "[email protected]"
+    }
+  ],
+  "scripts": {
+    "debug": "node --inspect-brk node_modules/uvu/bin.js -r tsm -r esm __debug__"
+  },
+  "type": "module",
+  "main": "main.js",
+  "module": "index.js",
+  "types": "index.d.ts",
+  "unpkg": "umd/history.production.min.js",
+  "sideEffects": false,
+  "dependencies": {
+    "@babel/runtime": "^7.7.6"
+  },
+  "keywords": [
+    "history",
+    "location"
+  ],
+  "peerDependencies": {
+    "history": "5.x"
+  },
+  "devDependencies": {
+    "esm": "^3.2.25",
+    "history": "^5.1.0",
+    "linkedom": "^0.13.0",
+    "tsm": "^2.2.1",
+    "uvu": "^0.5.2"
+  }
+}