From 869ee533cb3d5e75dff7149b10f4c7f8a5466407 Mon Sep 17 00:00:00 2001 From: Kovacs Arthur Kraid Date: Fri, 8 Nov 2019 15:20:09 +0200 Subject: [PATCH 1/2] Fix location not being present in a React Native env. --- browser.js | 12 +++++++++--- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- ulog.min.js | 2 +- ulog.umd.js | 12 +++++++++--- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/browser.js b/browser.js index 141954d..8f9fc94 100644 --- a/browser.js +++ b/browser.js @@ -1,8 +1,14 @@ var log = require('./ulog') -var qs = location.search.substring(1), - args = qs && qs.split('&'), - lvl, dbg, i, m +var qs +if (!location) { + qs = ''; +} else { + qs = location.search.substring(1) +} + +var args = qs && qs.split('&'), +lvl, dbg, i, m try { lvl = localStorage.getItem('log') diff --git a/package-lock.json b/package-lock.json index 8335532..8bee19b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2155,7 +2155,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2176,12 +2177,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2196,17 +2199,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2323,7 +2329,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2335,6 +2342,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2349,6 +2357,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2356,12 +2365,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2380,6 +2391,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2460,7 +2472,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2472,6 +2485,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2557,7 +2571,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2593,6 +2608,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2612,6 +2628,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2655,12 +2672,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/ulog.min.js b/ulog.min.js index 195b2b5..fe5c0c3 100644 --- a/ulog.min.js +++ b/ulog.min.js @@ -1 +1 @@ -!function(e,n,o){"function"==typeof define&&define.amd?define(n,[],o):e[n]=o()}(this,"ulog",function(){"use strict";function log(e){return e?mods[e]||(mods[e]=extend(create(e),log)):extend(log)}log.formats=[],log.extends=[],log.enable=function(e){var n,o=(e||"").split(/[\s,]+/);for(n=0;n 1 && names[a[0]] ? a.shift() : 'debug'; for (var i=0; i 1 && names[a[0]] ? a.shift() : 'debug'; for (var i=0; i Date: Fri, 8 Nov 2019 15:30:23 +0200 Subject: [PATCH 2/2] Use try catch instead of simple comparison --- browser.js | 8 ++++---- ulog.min.js | 2 +- ulog.umd.js | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/browser.js b/browser.js index 8f9fc94..2ca0d90 100644 --- a/browser.js +++ b/browser.js @@ -1,10 +1,10 @@ var log = require('./ulog') var qs -if (!location) { - qs = ''; -} else { - qs = location.search.substring(1) +try { + qs = location.search.substring(1) +} catch(e) { + qs = ''; } var args = qs && qs.split('&'), diff --git a/ulog.min.js b/ulog.min.js index fe5c0c3..80f305c 100644 --- a/ulog.min.js +++ b/ulog.min.js @@ -1 +1 @@ -!function(e,n,o){"function"==typeof define&&define.amd?define(n,[],o):e[n]=o()}(this,"ulog",function(){"use strict";function log(e){return e?mods[e]||(mods[e]=extend(create(e),log)):extend(log)}log.formats=[],log.extends=[],log.enable=function(e){var n,o=(e||"").split(/[\s,]+/);for(n=0;n 1 && names[a[0]] ? a.shift() : 'debug'; for (var i=0; i 1 && names[a[0]] ? a.shift() : 'debug'; for (var i=0; i