diff --git a/package-lock.json b/package-lock.json index 621b53c..07fb252 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "halfcab", - "version": "15.0.9", + "version": "16.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "halfcab", - "version": "15.0.9", + "version": "16.0.3", "license": "MIT", "dependencies": { "@lit-labs/ssr": "^4.0.0", @@ -21,7 +21,7 @@ "lit": "^3.3.2", "marked": "^0.7.0", "qs": "^6.5.2", - "shifty-router": "^0.1.1" + "shifty-router": "^1.0.0" }, "devDependencies": { "c8": "^7.1.0", @@ -2860,12 +2860,12 @@ "dev": true }, "node_modules/shifty-router": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shifty-router/-/shifty-router-0.1.1.tgz", - "integrity": "sha512-TEBUCMhUkzopkzvPe9A/zCqm/NkeAGFEjRCYGq0AX9gd7YeRVUYblKQwH7sBe3OvlFvTNaK+HXWnAHSYG4p75w==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shifty-router/-/shifty-router-1.0.0.tgz", + "integrity": "sha512-fqT7+tg+aIqa6AOZ1FdPKGvUofqQlm1qKKvQMhdfzBObYDMKafWptQYvVaYDngo/jnBAs9PMyi/LGfdELPqrQg==", + "license": "MIT", "dependencies": { "global": "^4.3.0", - "wayfarer": "^6.2.1", "xtend": "^4.0.1" } }, @@ -3239,14 +3239,6 @@ "xml-name-validator": "^3.0.0" } }, - "node_modules/wayfarer": { - "version": "6.6.4", - "resolved": "https://registry.npmjs.org/wayfarer/-/wayfarer-6.6.4.tgz", - "integrity": "sha512-5ZRE4iwcIYytikTN9somy5oz/K7hEPK0YfrjCEN6zr5vlqadJ+r+GQmDzsV5zg5aW0qZvctxo443B1YFWSywpw==", - "dependencies": { - "xtend": "^4.0.1" - } - }, "node_modules/web-streams-polyfill": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", @@ -3430,9 +3422,10 @@ "dev": true }, "node_modules/xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", "engines": { "node": ">=0.4" } diff --git a/package.json b/package.json index b59ae98..3a6cc52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halfcab", - "version": "15.0.9", + "version": "16.0.3", "type": "module", "description": "A simple universal JavaScript framework focused on making use of es2015 template strings to build components.", "main": "halfcab.mjs", @@ -13,7 +13,7 @@ "versionbump:fix": "npm version patch --no-git-tag-version", "versionbump:feature": "npm version major --no-git-tag-version", "versionbump:breakingchanges": "npm version major --no-git-tag-version", - "npm-publish": "npm publish", + "npm-publish": "npm publish --tag beta", "start:example": "npx --yes serve . -l 5173" }, "repository": { @@ -60,7 +60,7 @@ "lit": "^3.3.2", "marked": "^0.7.0", "qs": "^6.5.2", - "shifty-router": "^0.1.1" + "shifty-router": "^1.0.0" }, "peerDependencies": { "esm": "^3.2.22" diff --git a/test.js b/test.js index abfbe1c..5ea54f2 100644 --- a/test.js +++ b/test.js @@ -377,7 +377,12 @@ describe('halfcab', () => { }) - it(`Throws an error when a route doesn't exist`, () => { + it(`Switches to the 404 route when a route doesn't exist`, () => { + defineRoute({ + path: '/404', + title: 'Not Found', + component: '404Component' + }) return halfcab({ el: '#root', @@ -385,11 +390,9 @@ describe('halfcab', () => { return html `
` } }) - .then(rootEl => { - let routing = () => { - gotoRoute('/thisIsAFakeRoute') - } - expect(routing).to.throw() + .then(({state}) => { + gotoRoute('/thisIsAFakeRoute') + expect(state.router.component).to.equal('404Component') }) })