@canopycanopycanopy/b-ber-lib 1.2.16 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/Config.js +1 -1
  2. package/EbookConvert.js +18 -18
  3. package/Spine.js +18 -18
  4. package/State.js +31 -24
  5. package/Yaml.js +18 -16
  6. package/package.json +9 -8
  7. package/utils/index.js +3 -3
package/Config.js CHANGED
@@ -49,7 +49,7 @@ class Config {
49
49
  private: false,
50
50
  ignore: [],
51
51
  autoprefixer_options: {
52
- overrideBrowserslist: ['last 2 versions', '> 2%'],
52
+ overrideBrowserslist: ['defaults', '> 1%', 'not dead', 'not IE 11'],
53
53
  flexbox: 'no-2009'
54
54
  },
55
55
  layout: 'columns',
package/EbookConvert.js CHANGED
@@ -1,34 +1,34 @@
1
1
  "use strict";
2
2
 
3
- var _Object$defineProperty2 = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
3
+ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
4
4
 
5
- var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
5
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
6
6
 
7
- _Object$defineProperty2(exports, "__esModule", {
8
- value: true
9
- });
7
+ var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
10
8
 
11
- exports.default = void 0;
9
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
12
10
 
13
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
11
+ var _forEachInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
14
12
 
15
- var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
13
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
16
14
 
17
- var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
15
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
18
16
 
19
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
17
+ var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
20
18
 
21
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
19
+ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
22
20
 
23
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
21
+ _Object$defineProperty(exports, "__esModule", {
22
+ value: true
23
+ });
24
24
 
25
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
25
+ exports.default = void 0;
26
26
 
27
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
27
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
28
28
 
29
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
29
+ var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
30
30
 
31
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
31
+ var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
32
32
 
33
33
  var _path = _interopRequireDefault(require("path"));
34
34
 
@@ -40,9 +40,9 @@ var _commandExists = _interopRequireDefault(require("command-exists"));
40
40
 
41
41
  var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
42
42
 
43
- function ownKeys(object, enumerableOnly) { var keys = (0, _keys.default)(object); if (_getOwnPropertySymbols.default) { var symbols = (0, _getOwnPropertySymbols.default)(object); if (enumerableOnly) symbols = (0, _filter.default)(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor.default)(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
43
+ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
44
44
 
45
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context; (0, _forEach.default)(_context = ownKeys(Object(source), true)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context2; (0, _forEach.default)(_context2 = ownKeys(Object(source))).call(_context2, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
45
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context = ownKeys(Object(source), !0)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
46
46
 
47
47
  const command = 'ebook-convert';
48
48
  const defaults = {
package/Spine.js CHANGED
@@ -1,10 +1,24 @@
1
1
  "use strict";
2
2
 
3
- var _Object$defineProperty2 = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
3
+ var _Object$keys2 = require("@babel/runtime-corejs3/core-js-stable/object/keys");
4
+
5
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
6
+
7
+ var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
8
+
9
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
10
+
11
+ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
12
+
13
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
14
+
15
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
16
+
17
+ var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
4
18
 
5
19
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
6
20
 
7
- _Object$defineProperty2(exports, "__esModule", {
21
+ _Object$defineProperty(exports, "__esModule", {
8
22
  value: true
9
23
  });
10
24
 
@@ -30,20 +44,6 @@ var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
30
44
 
31
45
  var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
32
46
 
33
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
34
-
35
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
36
-
37
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
38
-
39
- var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
40
-
41
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
42
-
43
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
44
-
45
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
46
-
47
47
  var _path = _interopRequireDefault(require("path"));
48
48
 
49
49
  var _glob = _interopRequireDefault(require("glob"));
@@ -60,9 +60,9 @@ var _SpineItem = _interopRequireDefault(require("./SpineItem"));
60
60
 
61
61
  const _excluded = ["nodes"];
62
62
 
63
- function ownKeys(object, enumerableOnly) { var keys = (0, _keys.default)(object); if (_getOwnPropertySymbols.default) { var symbols = (0, _getOwnPropertySymbols.default)(object); if (enumerableOnly) symbols = (0, _filter.default)(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor.default)(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
63
+ function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
64
64
 
65
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context2; (0, _forEach.default)(_context2 = ownKeys(Object(source), true)).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context3; (0, _forEach.default)(_context3 = ownKeys(Object(source))).call(_context3, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
65
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
66
66
 
67
67
  class Spine {
68
68
  constructor({
package/State.js CHANGED
@@ -1,10 +1,26 @@
1
1
  "use strict";
2
2
 
3
- var _Object$defineProperty2 = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
3
+ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
4
+
5
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
6
+
7
+ var _filterInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
8
+
9
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
10
+
11
+ var _forEachInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
12
+
13
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
14
+
15
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
16
+
17
+ var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
18
+
19
+ var _Symbol$toPrimitive = require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive");
4
20
 
5
21
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
6
22
 
7
- _Object$defineProperty2(exports, "__esModule", {
23
+ _Object$defineProperty(exports, "__esModule", {
8
24
  value: true
9
25
  });
10
26
 
@@ -26,20 +42,6 @@ var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
26
42
 
27
43
  var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
28
44
 
29
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
30
-
31
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
32
-
33
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
34
-
35
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
36
-
37
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
38
-
39
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
40
-
41
- var _toPrimitive2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive"));
42
-
43
45
  var _crypto = _interopRequireDefault(require("crypto"));
44
46
 
45
47
  var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
@@ -54,6 +56,8 @@ var _set = _interopRequireDefault(require("lodash/set"));
54
56
 
55
57
  var _get = _interopRequireDefault(require("lodash/get"));
56
58
 
59
+ var _has = _interopRequireDefault(require("lodash/has"));
60
+
57
61
  var _merge = _interopRequireDefault(require("lodash/merge"));
58
62
 
59
63
  var _remove = _interopRequireDefault(require("lodash/remove"));
@@ -78,11 +82,11 @@ var _Spine = _interopRequireDefault(require("./Spine"));
78
82
 
79
83
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
80
84
 
81
- function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[_toPrimitive2.default]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
85
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[_Symbol$toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
82
86
 
83
- function ownKeys(object, enumerableOnly) { var keys = (0, _keys.default)(object); if (_getOwnPropertySymbols.default) { var symbols = (0, _getOwnPropertySymbols.default)(object); if (enumerableOnly) symbols = (0, _filter.default)(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor.default)(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
87
+ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
84
88
 
85
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context4; (0, _forEach.default)(_context4 = ownKeys(Object(source), true)).call(_context4, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context5; (0, _forEach.default)(_context5 = ownKeys(Object(source))).call(_context5, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
89
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context4 = ownKeys(Object(source), !0)).call(_context4, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context5 = ownKeys(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
86
90
 
87
91
  const themes = {
88
92
  'b-ber-theme-serif': _bBerThemeSerif.default,
@@ -305,6 +309,9 @@ class State {
305
309
  (0, _defineProperty2.default)(this, "update", (prop, val) => {
306
310
  (0, _set.default)(this, prop, val);
307
311
  });
312
+ (0, _defineProperty2.default)(this, "has", prop => {
313
+ return (0, _has.default)(this, prop);
314
+ });
308
315
  (0, _defineProperty2.default)(this, "contains", (coll, value) => {
309
316
  var _context3;
310
317
 
@@ -361,12 +368,12 @@ class State {
361
368
 
362
369
 
363
370
  try {
364
- if (this.theme = require(_path.default.resolve(userThemesPath, this.config.theme))) // eslint-disable-line global-require, import/no-dynamic-require
365
- {
366
- _bBerLogger.default.info(`Loaded theme [${this.config.theme}]`);
371
+ if (this.theme = require(_path.default.resolve(userThemesPath, this.config.theme)) // eslint-disable-line global-require, import/no-dynamic-require
372
+ ) {
373
+ _bBerLogger.default.info(`Loaded theme [${this.config.theme}]`);
367
374
 
368
- return;
369
- }
375
+ return;
376
+ }
370
377
  } catch (_) {// noop
371
378
  } // possibly a theme installed with npm, test the project root
372
379
 
package/Yaml.js CHANGED
@@ -1,10 +1,24 @@
1
1
  "use strict";
2
2
 
3
- var _Object$defineProperty2 = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
3
+ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
4
+
5
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
6
+
7
+ var _filterInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
8
+
9
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
10
+
11
+ var _forEachInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
12
+
13
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
14
+
15
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
16
+
17
+ var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
4
18
 
5
19
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
6
20
 
7
- _Object$defineProperty2(exports, "__esModule", {
21
+ _Object$defineProperty(exports, "__esModule", {
8
22
  value: true
9
23
  });
10
24
 
@@ -18,18 +32,6 @@ var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
18
32
 
19
33
  var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
20
34
 
21
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
22
-
23
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
24
-
25
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
26
-
27
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
28
-
29
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
30
-
31
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
32
-
33
35
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
34
36
 
35
37
  var _find = _interopRequireDefault(require("lodash/find"));
@@ -40,9 +42,9 @@ var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
40
42
 
41
43
  var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
42
44
 
43
- function ownKeys(object, enumerableOnly) { var keys = (0, _keys.default)(object); if (_getOwnPropertySymbols.default) { var symbols = (0, _getOwnPropertySymbols.default)(object); if (enumerableOnly) symbols = (0, _filter.default)(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor.default)(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
45
+ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
44
46
 
45
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context3; (0, _forEach.default)(_context3 = ownKeys(Object(source), true)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context4; (0, _forEach.default)(_context4 = ownKeys(Object(source))).call(_context4, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
47
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
46
48
 
47
49
  const YAWN = require('yawn-yaml/cjs'); // TODO set up decoder
48
50
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@canopycanopycanopy/b-ber-lib",
3
- "version": "1.2.16",
3
+ "version": "2.0.0",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -21,17 +21,18 @@
21
21
  "@babel/cli": "^7.10.5",
22
22
  "@babel/core": "^7.10.5",
23
23
  "@babel/preset-env": "^7.10.4",
24
+ "browserslist": "^4.17.4",
24
25
  "jest": "^26.6.3",
25
26
  "mock-fs": "^4.4.2",
26
- "rimraf": "^2.6.3"
27
+ "rimraf": "^2.7.1"
27
28
  },
28
29
  "dependencies": {
29
30
  "@babel/runtime-corejs3": "^7.10.5",
30
- "@canopycanopycanopy/b-ber-logger": "1.2.16",
31
- "@canopycanopycanopy/b-ber-shapes-dublin-core": "1.2.16",
32
- "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.16",
33
- "@canopycanopycanopy/b-ber-theme-sans": "1.2.16",
34
- "@canopycanopycanopy/b-ber-theme-serif": "1.2.16",
31
+ "@canopycanopycanopy/b-ber-logger": "2.0.0",
32
+ "@canopycanopycanopy/b-ber-shapes-dublin-core": "2.0.0",
33
+ "@canopycanopycanopy/b-ber-shapes-sequences": "2.0.0",
34
+ "@canopycanopycanopy/b-ber-theme-sans": "2.0.0",
35
+ "@canopycanopycanopy/b-ber-theme-serif": "2.0.0",
35
36
  "command-exists": "^1.2.2",
36
37
  "fs-extra": "^8.1.0",
37
38
  "glob": "^7.1.4",
@@ -76,5 +77,5 @@
76
77
  "url": "https://maxwellsimmer.com"
77
78
  }
78
79
  ],
79
- "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
80
+ "gitHead": "dbeae192709705f5bc211195ff343cbd999f9caf"
80
81
  }
package/utils/index.js CHANGED
@@ -174,14 +174,14 @@ const trimLeadingSlash = s => s.replace(/^\//, '');
174
174
  const resolveIntersectingUrl = (u, p) => {
175
175
  var _context7, _context8;
176
176
 
177
- let url = '';
177
+ let url;
178
178
 
179
179
  try {
180
180
  url = new _url.default(u);
181
181
  } catch (err) {
182
- _bBerLogger.default.warn(err);
182
+ _bBerLogger.default.warn(`${err.message}: "${u}"`);
183
183
 
184
- return url;
184
+ return u;
185
185
  }
186
186
 
187
187
  const {