space-router 0.9.0 → 0.9.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.2
+
+- Upgrade all depedencies.
+
+## 0.9.1
+
+- Revert to commonjs (remove `type: "module"`) to keep support for cjs in node and esm in browsers.
+
 ## 0.9.0
 
 - Upgrade all dependencies.

package/dist/cjs/history.js

@@ -9,7 +9,27 @@ Object.defineProperty(exports, "createHistory", {
     }
 });
 function createHistory(options) {
-    var listen = function listen(onChange) {
+    var sync = options.sync;
+    var mode = options.mode;
+    var raf;
+    var onPop;
+    var memory = [];
+    var off;
+    var destroyed = false;
+    if (typeof window === "undefined") {
+        mode = "memory";
+        raf = sync ? function(cb) {
+            return cb();
+        } : global.setImmediate;
+    } else {
+        raf = sync ? function(cb) {
+            return cb();
+        } : requestAnimationFrame;
+        if (mode === "history" && !history.pushState) {
+            mode = "hash";
+        }
+    }
+    function listen(onChange) {
         onPop = function() {
             return onChange(getUrl());
         };
@@ -21,8 +41,18 @@ function createHistory(options) {
             destroyed = true;
             off && off();
         };
+    }
+    return {
+        listen: listen,
+        getUrl: getUrl,
+        push: function(url) {
+            go(url);
+        },
+        replace: function(url) {
+            go(url, true);
+        }
     };
-    var go = function go(url, replace) {
+    function go(url, replace) {
         if (destroyed) return;
         url = url.replace(/^\/?#?\/?/, "/").replace(/\/$/, "") || "/";
         if (mode === "history") {
@@ -34,8 +64,8 @@ function createHistory(options) {
             replace ? memory[memory.length - 1] = url : memory.push(url);
             raf(onPop);
         }
-    };
-    var getUrl = function getUrl() {
+    }
+    function getUrl() {
         if (mode === "memory") {
             return memory[memory.length - 1];
         }
@@ -50,43 +80,13 @@ function createHistory(options) {
             }
             return url;
         }
-    };
-    var getHash = // Gets the true hash value. Cannot use location.hash directly due to bug
+    }
+    // Gets the true hash value. Cannot use location.hash directly due to bug
     // in Firefox where location.hash will always be decoded.
     function getHash() {
         var match = location.href.match(/#(.*)$/);
         return match ? match[1].replace("#", "") : "";
-    };
-    var sync = options.sync;
-    var mode = options.mode;
-    var raf;
-    var onPop;
-    var memory = [];
-    var off;
-    var destroyed = false;
-    if (typeof window === "undefined") {
-        mode = "memory";
-        raf = sync ? function(cb) {
-            return cb();
-        } : global.setImmediate;
-    } else {
-        raf = sync ? function(cb) {
-            return cb();
-        } : requestAnimationFrame;
-        if (mode === "history" && !history.pushState) {
-            mode = "hash";
-        }
     }
-    return {
-        listen: listen,
-        getUrl: getUrl,
-        push: function(url) {
-            go(url);
-        },
-        replace: function(url) {
-            go(url, true);
-        }
-    };
 }
 function on(el, type, fn) {
     el.addEventListener(type, fn, false);

package/dist/cjs/index.js

@@ -9,19 +9,19 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    createHistory: function() {
+        return _history.createHistory;
+    },
     createRouter: function() {
         return _router.createRouter;
     },
     merge: function() {
         return _router.merge;
     },
-    createHistory: function() {
-        return _history.createHistory;
-    },
     qs: function() {
         return _qs.qs;
     }
 });
-var _router = require("./router.js");
-var _history = require("./history.js");
-var _qs = require("./qs.js");
+var _router = require("./router");
+var _history = require("./history");
+var _qs = require("./qs");

package/dist/cjs/router.js

@@ -19,9 +19,9 @@ _export(exports, {
         return merge;
     }
 });
-var _match = require("./match.js");
-var _history = require("./history.js");
-var _qs = require("./qs.js");
+var _match = require("./match");
+var _history = require("./history");
+var _qs = require("./qs");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {

package/dist/esm/history.js

@@ -1,5 +1,25 @@
 export function createHistory(options) {
-    var listen = function listen(onChange) {
+    var sync = options.sync;
+    var mode = options.mode;
+    var raf;
+    var onPop;
+    var memory = [];
+    var off;
+    var destroyed = false;
+    if (typeof window === "undefined") {
+        mode = "memory";
+        raf = sync ? function(cb) {
+            return cb();
+        } : global.setImmediate;
+    } else {
+        raf = sync ? function(cb) {
+            return cb();
+        } : requestAnimationFrame;
+        if (mode === "history" && !history.pushState) {
+            mode = "hash";
+        }
+    }
+    function listen(onChange) {
         onPop = function() {
             return onChange(getUrl());
         };
@@ -11,8 +31,18 @@ export function createHistory(options) {
             destroyed = true;
             off && off();
         };
+    }
+    return {
+        listen: listen,
+        getUrl: getUrl,
+        push: function push(url) {
+            go(url);
+        },
+        replace: function replace(url) {
+            go(url, true);
+        }
     };
-    var go = function go(url, replace) {
+    function go(url, replace) {
         if (destroyed) return;
         url = url.replace(/^\/?#?\/?/, "/").replace(/\/$/, "") || "/";
         if (mode === "history") {
@@ -24,8 +54,8 @@ export function createHistory(options) {
             replace ? memory[memory.length - 1] = url : memory.push(url);
             raf(onPop);
         }
-    };
-    var getUrl = function getUrl() {
+    }
+    function getUrl() {
         if (mode === "memory") {
             return memory[memory.length - 1];
         }
@@ -40,43 +70,13 @@ export function createHistory(options) {
             }
             return url;
         }
-    };
-    var getHash = // Gets the true hash value. Cannot use location.hash directly due to bug
+    }
+    // Gets the true hash value. Cannot use location.hash directly due to bug
     // in Firefox where location.hash will always be decoded.
     function getHash() {
         var match = location.href.match(/#(.*)$/);
         return match ? match[1].replace("#", "") : "";
-    };
-    var sync = options.sync;
-    var mode = options.mode;
-    var raf;
-    var onPop;
-    var memory = [];
-    var off;
-    var destroyed = false;
-    if (typeof window === "undefined") {
-        mode = "memory";
-        raf = sync ? function(cb) {
-            return cb();
-        } : global.setImmediate;
-    } else {
-        raf = sync ? function(cb) {
-            return cb();
-        } : requestAnimationFrame;
-        if (mode === "history" && !history.pushState) {
-            mode = "hash";
-        }
     }
-    return {
-        listen: listen,
-        getUrl: getUrl,
-        push: function push(url) {
-            go(url);
-        },
-        replace: function replace(url) {
-            go(url, true);
-        }
-    };
 }
 function on(el, type, fn) {
     el.addEventListener(type, fn, false);

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export { createRouter, merge } from "./router.js";
-export { createHistory } from "./history.js";
-export { qs } from "./qs.js";
+export { createRouter, merge } from "./router";
+export { createHistory } from "./history";
+export { qs } from "./qs";

package/dist/esm/router.js

@@ -77,9 +77,9 @@ function _object_without_properties_loose(source, excluded) {
     }
     return target;
 }
-import { match as findMatch } from "./match.js";
-import { createHistory } from "./history.js";
-import { qs as defaultQs } from "./qs.js";
+import { match as findMatch } from "./match";
+import { createHistory } from "./history";
+import { qs as defaultQs } from "./qs";
 export function createRouter() {
     var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     var history = null;

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "space-router",
   "description": "All the routing essentials.",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "main": "dist/cjs",
   "module": "dist/esm",
-  "type": "module",
   "license": "ICS",
   "repository": {
     "type": "git",
@@ -20,6 +19,9 @@
     "location",
     "url"
   ],
+  "engines": {
+    "node": ">=14"
+  },
   "author": "Karolis Narkevicius",
   "scripts": {
     "test": "npm run build && healthier && prettier --check '**/*.{js,css,yml}' && c8 ava",
@@ -32,15 +34,15 @@
     "release:docs": "hugo -s docs && gh-pages -d docs/public"
   },
   "devDependencies": {
+    "@swc-node/register": "^1.6.8",
     "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.49",
-    "ava": "^5.2.0",
-    "c8": "^7.13.0",
-    "esm": "^3.2.25",
-    "execa": "^7.1.1",
-    "gh-pages": "^5.0.0",
-    "healthier": "^6.3.0",
-    "prettier": "^2.8.7"
+    "@swc/core": "^1.3.96",
+    "ava": "^5.3.1",
+    "c8": "^8.0.1",
+    "execa": "^8.0.1",
+    "gh-pages": "^6.0.0",
+    "healthier": "^7.0.0",
+    "prettier": "^3.0.3"
   },
   "healthier": {
     "global": [
@@ -55,7 +57,7 @@
   },
   "ava": {
     "require": [
-      "esm"
+      "@swc-node/register"
     ]
   }
 }

package/src/index.js

@@ -1,3 +1,3 @@
-export { createRouter, merge } from './router.js'
-export { createHistory } from './history.js'
-export { qs } from './qs.js'
+export { createRouter, merge } from './router'
+export { createHistory } from './history'
+export { qs } from './qs'

package/src/router.js

@@ -1,6 +1,6 @@
-import { match as findMatch } from './match.js'
-import { createHistory } from './history.js'
-import { qs as defaultQs } from './qs.js'
+import { match as findMatch } from './match'
+import { createHistory } from './history'
+import { qs as defaultQs } from './qs'
 
 export function createRouter(options = {}) {
   let history = null

package/tasks/build.js

@@ -1,14 +1,10 @@
-import fs from 'fs'
-import path from 'path'
-import { fileURLToPath } from 'url'
-import { execa } from 'execa'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const sh = (...args) => execa(...args, { stdio: 'inherit', shell: true })
+const fs = require('fs')
+const path = require('path')
 
 ;(async function () {
+  const { execa } = await import('execa')
+  const sh = (...args) => execa(...args, { stdio: 'inherit', shell: true })
+
   await sh('rm -rf dist')
   await sh('mkdir -p dist')
 

package/test/flatten.test.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { flatten } from '../src/router.js'
+import { flatten } from '../src/router'
 
 test('converts array of routes to array of internal route descriptors', (t) => {
   t.deepEqual(
@@ -10,7 +10,7 @@ test('converts array of routes to array of internal route descriptors', (t) => {
     [
       { pattern: '/foo', data: [{ a: 'foo' }] },
       { pattern: '/bar', data: [{ a: 'bar' }] },
-    ]
+    ],
   )
 })
 
@@ -49,7 +49,7 @@ test('handles nested routes', (t) => {
       { pattern: '/foo/bar', data: [{ component: 'root' }, { component: 'foo' }, { component: 'bar' }] },
       { pattern: '/second', data: [{ component: 'second-root' }] },
       { pattern: '/baz/*', data: [{ component: 'second-root' }, { component: 'baz' }] },
-    ]
+    ],
   )
 })
 

package/test/match.test.js

@@ -1,6 +1,6 @@
 import test from 'ava'
-import { qs } from '../src/index.js'
-import { matchOne as match } from '../src/match.js'
+import { qs } from '../src'
+import { matchOne as match } from '../src/match'
 
 test('match explicit equality', (t) => {
   t.deepEqual(match('/', '/').params, {})

package/test/router.test.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { qs, createRouter } from '../src/index.js'
+import { qs, createRouter } from '../src/index'
 
 test('createRouter, listen, navigate and dispose', (t) => {
   const calls = []
@@ -38,7 +38,7 @@ test('createRouter, listen, navigate and dispose', (t) => {
       'user=3?a=11&c=bla#test',
       'user=curr?curr=test',
     ],
-    calls
+    calls,
   )
 
   dispose()
@@ -51,28 +51,28 @@ test('.href(to)', (t) => {
 
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 7 }, query: { a: 1, b: 2 } }),
-    '/user/7/friends?a=1&b=2'
+    '/user/7/friends?a=1&b=2',
   )
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 7 }, query: { a: 1, b: 2 }, hash: '#bla' }),
-    '/user/7/friends?a=1&b=2#bla'
+    '/user/7/friends?a=1&b=2#bla',
   )
   t.deepEqual(router.href({ pathname: '/user/:id/friends', params: { id: 8 }, hash: '#foo' }), '/user/8/friends#foo')
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 8 }, query: {}, hash: '#foo' }),
-    '/user/8/friends#foo'
+    '/user/8/friends#foo',
   )
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 8 }, query: { q: null }, hash: '#foo' }),
-    '/user/8/friends?q=null#foo'
+    '/user/8/friends?q=null#foo',
   )
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 8 }, query: { q: undefined }, hash: '#foo' }),
-    '/user/8/friends#foo'
+    '/user/8/friends#foo',
   )
   t.deepEqual(
     router.href({ pathname: '/user/:id/friends', params: { id: 8 }, query: { q: undefined }, hash: '#foo' }),
-    '/user/8/friends#foo'
+    '/user/8/friends#foo',
   )
   t.deepEqual(router.href({ params: { id: 8 }, query: { q: 1 }, hash: '#foo' }), '/?q=1#foo')
 
@@ -151,7 +151,7 @@ function createTestRouter(cb, { withoutCatchAll = false } = {}) {
       { path: '/user/:id/settings', datum: 'settings-data' },
       !withoutCatchAll && { path: '*', render: () => 'catchall' },
     ].filter(Boolean),
-    cb
+    cb,
   )
   return { router, dispose }
 }