Fixing a bug with noMatchWarning #267

krasimir · Jan 23, 2021 · 6a1eca9 · 6a1eca9
1 parent 4ebbd50
commit 6a1eca9
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 11 deletions.
diff --git a/lib/es/index.js b/lib/es/index.js
@@ -1,3 +1,5 @@
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 import { pushStateAvailable, matchRoute, parseQuery, extractGETParameters, isFunction, isString, clean, parseNavigateOptions, windowAvailable, getCurrentEnvURL, accumulateHooks } from "./utils";
 import Q from "./Q";
 import setLocationPath from "./middlewares/setLocationPath";
@@ -86,7 +88,7 @@ export default function Navigo(appRoute, resolveOptions) {
       instance: self,
       currentLocationPath: to ? clean(root) + "/" + clean(to) : undefined,
       navigateOptions: {},
-      resolveOptions: options || DEFAULT_RESOLVE_OPTIONS
+      resolveOptions: _extends({}, DEFAULT_RESOLVE_OPTIONS, options)
     };
     Q([setLocationPath, matchPathToRegisteredRoutes, Q["if"](function (_ref) {
       var matches = _ref.matches;

diff --git a/lib/navigo.amd.js b/lib/navigo.amd.js
diff --git a/lib/navigo.amd.js.map b/lib/navigo.amd.js.map
diff --git a/lib/navigo.amd.min.js b/lib/navigo.amd.min.js
diff --git a/lib/navigo.amd.min.js.map b/lib/navigo.amd.min.js.map
diff --git a/lib/navigo.js b/lib/navigo.js
diff --git a/lib/navigo.js.map b/lib/navigo.js.map
diff --git a/lib/navigo.min.js b/lib/navigo.min.js
diff --git a/lib/navigo.min.js.map b/lib/navigo.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "8.7.1",
+  "version": "8.7.2",
   "description": "A simple vanilla JavaScript router",
   "main": "lib/navigo.js",
   "browser": "lib/navigo.min.js",

diff --git a/src/__tests__/basic.spec.ts b/src/__tests__/basic.spec.ts
@@ -216,6 +216,21 @@ describe("Given the Navigo library", () => {
         expect(warn).not.toBeCalled();
         warn.mockRestore();
       });
+      describe("and we set noMatchWarning=true in the navigo constructor", () => {
+        it("should not print a warning if there is no matching route", () => {
+          const warn = jest.spyOn(console, "warn");
+          warn.mockImplementationOnce(() => {});
+          const r: NavigoRouter = new Navigo("/", {
+            hash: true,
+            noMatchWarning: true,
+          });
+          const res = r.resolve("/", {});
+
+          expect(res).toEqual(false);
+          expect(warn).not.toBeCalled();
+          warn.mockRestore();
+        });
+      });
     });
     it("should still update the browser URL", () => {
       const warn = jest.spyOn(console, "warn");

diff --git a/src/index.ts b/src/index.ts
@@ -116,7 +116,7 @@ export default function Navigo(
       instance: self,
       currentLocationPath: to ? `${clean(root)}/${clean(to)}` : undefined,
       navigateOptions: {},
-      resolveOptions: options || DEFAULT_RESOLVE_OPTIONS,
+      resolveOptions: { ...DEFAULT_RESOLVE_OPTIONS, ...options },
     };
     Q(
       [