@canopycanopycanopy/b-ber-tasks 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 (10) hide show
  1. package/dist/cover/index.js +23 -23
  2. package/dist/deploy/index.js +18 -16
  3. package/dist/loi/index.js +18 -20
  4. package/dist/reader/index.js +26 -8
  5. package/dist/sass/index.js +21 -19
  6. package/dist/serialize.js +7 -1
  7. package/dist/serve/index.js +42 -35
  8. package/dist/validate/index.js +7 -1
  9. package/dist/web/index.js +18 -18
  10. package/package.json +13 -12
package/dist/cover/index.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 _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
 
@@ -18,21 +32,7 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
18
32
 
19
33
  var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
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 _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
28
-
29
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
30
-
31
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
32
-
33
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
34
-
35
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
35
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
36
36
 
37
37
  var _path = _interopRequireDefault(require("path"));
38
38
 
@@ -54,23 +54,23 @@ var _Xhtml = _interopRequireDefault(require("@canopycanopycanopy/b-ber-templates
54
54
 
55
55
  var _utils = require("@canopycanopycanopy/b-ber-lib/utils");
56
56
 
57
- 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; }
57
+ 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; }
58
58
 
59
- 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, _defineProperty3.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, _defineProperty2.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
59
+ 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; }
60
60
 
61
61
  class Cover {
62
62
  constructor() {
63
- (0, _defineProperty3.default)(this, "getPosY", () => {
63
+ (0, _defineProperty2.default)(this, "getPosY", () => {
64
64
  this.posY = this.posY ? this.posY + this.lineHeight : this.marginTop + this.fontSize;
65
65
  return this.posY;
66
66
  });
67
- (0, _defineProperty3.default)(this, "loadInitialState", async () => {
67
+ (0, _defineProperty2.default)(this, "loadInitialState", async () => {
68
68
  this.posY = 0;
69
69
  this.coverXHTMLContent = '';
70
70
  this.coverEntry = '';
71
71
  this.coverImagePath = '';
72
72
  });
73
- (0, _defineProperty3.default)(this, "writeCoverXHTML", async () => {
73
+ (0, _defineProperty2.default)(this, "writeCoverXHTML", async () => {
74
74
  // Omit cover.xhtml from the PDF build to allow users to define special
75
75
  // treatment for the cover in config.yml
76
76
  if (_State.default.build === 'pdf') return;
@@ -84,7 +84,7 @@ class Cover {
84
84
 
85
85
  _bBerLogger.default.info('cover wrote XML [cover.xhtml]');
86
86
  });
87
- (0, _defineProperty3.default)(this, "init", () => this.loadInitialState().then(() => this.createCoverImage()).then(() => this.writeCoverXHTML()).catch(_bBerLogger.default.error));
87
+ (0, _defineProperty2.default)(this, "init", () => this.loadInitialState().then(() => this.createCoverImage()).then(() => this.writeCoverXHTML()).catch(_bBerLogger.default.error));
88
88
  const defaultMetadata = {
89
89
  title: '',
90
90
  creator: '',
package/dist/deploy/index.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
 
@@ -24,18 +38,6 @@ var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
24
38
 
25
39
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
26
40
 
27
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
28
-
29
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
30
-
31
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
32
-
33
- var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
34
-
35
- var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
36
-
37
- var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
38
-
39
41
  var _path = _interopRequireDefault(require("path"));
40
42
 
41
43
  var _readline = _interopRequireDefault(require("readline"));
@@ -46,9 +48,9 @@ var _YamlAdaptor = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib
46
48
 
47
49
  var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
48
50
 
49
- 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; }
51
+ 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; }
50
52
 
51
- 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; }
53
+ 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; }
52
54
 
53
55
  const cwd = process.cwd();
54
56
  const defaultBuilds = ['epub', 'mobi', 'reader'];
package/dist/loi/index.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 _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
 
@@ -22,22 +36,6 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
22
36
 
23
37
  var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
24
38
 
25
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
26
-
27
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
28
-
29
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
30
-
31
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
32
-
33
- var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
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
39
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
42
40
 
43
41
  var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
@@ -52,9 +50,9 @@ var _figures = _interopRequireDefault(require("@canopycanopycanopy/b-ber-templat
52
50
 
53
51
  var _Xhtml = _interopRequireDefault(require("@canopycanopycanopy/b-ber-templates/Xhtml"));
54
52
 
55
- 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; }
53
+ 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; }
56
54
 
57
- 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; }
55
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
58
56
 
59
57
  const createLOILeader = () => {
60
58
  const baseName = 'figures-titlepage';
package/dist/reader/index.js CHANGED
@@ -36,6 +36,8 @@ var _recursiveReaddir = _interopRequireDefault(require("recursive-readdir"));
36
36
 
37
37
  var _has = _interopRequireDefault(require("lodash/has"));
38
38
 
39
+ /* eslint-disable camelcase */
40
+
39
41
  /* eslint-disable class-methods-use-this */
40
42
  class Reader {
41
43
  constructor() {
@@ -45,8 +47,10 @@ class Reader {
45
47
  this.epubAssets = ['META-INF', 'OPS', 'mimetype'];
46
48
  this.readerModuleName = '@canopycanopycanopy/b-ber-reader';
47
49
  this.readerModuleDistDir = 'dist';
48
- this.readerAppPath = null;
49
- return this.createOutputDirs().then(() => this.ensureReaderModuleExists()).then(() => this.copyEpubToOutputDir()).then(() => this.writeBookManifest()).then(() => this.writeWebpubManifest()).then(() => this.copyReaderAppToOutputDir()).then(() => this.injectServerDataIntoTemplate()).then(() => this.updateLinkedResourcesWithAbsolutePaths()).then(() => this.updateAssetURLsWithAbsolutePaths()).then(() => this.injectWebpubManifestLink()).catch(_bBerLogger.default.error);
50
+ this.readerAppPath = null; // eslint-disable-next-line no-constructor-return
51
+
52
+ return this.createOutputDirs().then(() => this.ensureReaderModuleExists()).then(() => this.copyEpubToOutputDir()).then(() => this.writeBookManifest()).then(() => this.writeWebpubManifest()).then(() => this.copyReaderAppToOutputDir()).then(() => this.injectServerDataIntoTemplate()) // .then(() => this.updateLinkedResourcesWithAbsolutePaths())
53
+ .then(() => this.updateAssetURLsWithAbsolutePaths()).then(() => this.injectWebpubManifestLink()).catch(_bBerLogger.default.error);
50
54
  }
51
55
 
52
56
  get remoteURL() {
@@ -123,6 +127,7 @@ class Reader {
123
127
  }
124
128
 
125
129
  getBookMetadata(term) {
130
+ if (!term) return _State.default.metadata.json();
126
131
  const entry = (0, _find.default)(_State.default.metadata.json(), {
127
132
  term
128
133
  });
@@ -134,6 +139,8 @@ class Reader {
134
139
  }
135
140
 
136
141
  getProjectConfig(term) {
142
+ if (!term) return _State.default.config;
143
+
137
144
  if (!(0, _has.default)(_State.default.config, term)) {
138
145
  _bBerLogger.default.warn(`Invalid property for config: ${term}`);
139
146
  }
@@ -142,16 +149,26 @@ class Reader {
142
149
  }
143
150
 
144
151
  writeBookManifest() {
145
- const identifier = this.getBookMetadata('identifier');
152
+ // Get metadata for books.json
153
+ const id = this.getBookMetadata('identifier');
146
154
  const title = this.getBookMetadata('title');
147
- const url = `${_bBerLib.Url.trimSlashes(this.remoteURL)}/${this.outputDirName}/${this.createDirname(identifier)}`;
148
- const cover = `${url}/OPS/images/${this.getBookMetadata('cover')}`;
155
+ const url = `${_bBerLib.Url.trimSlashes(this.remoteURL)}/${this.outputDirName}/${this.createDirname(id)}`;
156
+ const cover = `${url}/OPS/images/${this.getBookMetadata('cover')}`; // Get config required by reader for books.json
157
+
158
+ const {
159
+ downloads,
160
+ ui_options,
161
+ layout
162
+ } = this.getProjectConfig();
149
163
  const manifest = [{
150
164
  title,
151
165
  url,
152
166
  cover,
153
- id: identifier
154
- }]; // write to an `api` dir in case the app is being deployed statically
167
+ id,
168
+ downloads,
169
+ ui_options,
170
+ layout
171
+ }]; // Write to an `api` dir in case the app is being deployed statically
155
172
 
156
173
  return _fsExtra.default.writeJson(_path2.default.join(this.apiDir, 'books.json'), manifest);
157
174
  }
@@ -210,7 +227,8 @@ class Reader {
210
227
  contents = _fsExtra.default.readFileSync(indexHTML, 'utf8');
211
228
  contents = contents.replace(/__SERVER_DATA__ = {}/, `__SERVER_DATA__ = ${(0, _stringify.default)(serverData)}`);
212
229
  return _fsExtra.default.writeFile(indexHTML, contents);
213
- }
230
+ } // Update URLs in CSS
231
+
214
232
 
215
233
  updateLinkedResourcesWithAbsolutePaths() {
216
234
  const indexContents = _fsExtra.default.readFileSync(_State.default.dist.root('index.html'), 'utf8');
package/dist/sass/index.js CHANGED
@@ -42,7 +42,7 @@ var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State
42
42
  // running the sass task
43
43
  const ASSET_DIRNAMES = ['fonts', 'images'];
44
44
  const autoprefixerOptions = _State.default.config.autoprefixer_options || {
45
- overrideBrowserslist: ['last 2 versions', '> 2%'],
45
+ overrideBrowserslist: ['defaults', '> 1%', 'not dead', 'not IE 11'],
46
46
  flexbox: 'no-2009'
47
47
  }; // Check to see if there's an `application.scss` in `_stylesheets`, and if so
48
48
  // load that; else verify that a theme is selected in `config`, and that the
@@ -182,24 +182,26 @@ function resolveImportedModule(importPath) {
182
182
  return importedModule;
183
183
  }
184
184
 
185
- const renderCSS = scssString => new _promise.default(resolve => _sass.default.render({
186
- // Importer allows use of '~' to denote node_modules directory in SCSS files
187
- importer: (url, _file, done) => {
188
- const file = url[0] === '~' ? resolveImportedModule(url) : url;
189
- return done({
190
- file
191
- });
192
- },
193
- // Add build vars at runtime with the SCSS buffer (which is transformed
194
- // to string in the backticks)
195
- data: `$build: "${_State.default.build}";${scssString}`,
196
- includePaths: [_State.default.src.stylesheets(), _path.default.dirname(_State.default.theme.entry), _path.default.dirname(_path.default.dirname(_State.default.theme.entry))],
197
- outputStyle: _State.default.env === 'production' ? 'compressed' : 'expanded',
198
- errLogToConsole: true
199
- }, (err, result) => {
200
- if (err) throw err;
201
- resolve(result);
202
- }));
185
+ const renderCSS = scssString => new _promise.default(resolve => {
186
+ _sass.default.render({
187
+ // Importer allows use of '~' to denote node_modules directory in SCSS files
188
+ importer: (url, _file, done) => {
189
+ const file = url[0] === '~' ? resolveImportedModule(url) : url;
190
+ return done({
191
+ file
192
+ });
193
+ },
194
+ // Add build vars at runtime with the SCSS buffer (which is transformed
195
+ // to string in the backticks)
196
+ data: `$build: "${_State.default.build}";${scssString}`,
197
+ includePaths: [_State.default.src.stylesheets(), _path.default.dirname(_State.default.theme.entry), _path.default.dirname(_path.default.dirname(_State.default.theme.entry))],
198
+ outputStyle: _State.default.env === 'production' ? 'compressed' : 'expanded',
199
+ errLogToConsole: true
200
+ }, (err, result) => {
201
+ if (err) throw err;
202
+ resolve(result);
203
+ });
204
+ });
203
205
 
204
206
  const applyPostProcessing = ({
205
207
  css
package/dist/serialize.js CHANGED
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
 
3
+ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
4
+
3
5
  var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
4
6
 
5
- var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard");
7
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
6
8
 
7
9
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
8
10
 
@@ -22,6 +24,10 @@ var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State
22
24
 
23
25
  var tasks = _interopRequireWildcard(require(".."));
24
26
 
27
+ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
28
+
29
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
30
+
25
31
  // This is basically the engine of our application. `serialize` is responsible
26
32
  // for taking in the list of tasks that need to be run, calling their
27
33
  // associated handlers, handling errors if any are encountered, and then
package/dist/serve/index.js CHANGED
@@ -49,47 +49,54 @@ let update = async () => {};
49
49
 
50
50
  const reload = () => update().then(browserSync.reload);
51
51
 
52
- const init = build => new _promise.default(resolve => browserSync.init({
53
- port,
54
- open: false,
55
- // Opens browser programatically below
56
- // reloadDelay: 2000
57
- // reloadDebounce: 2000
58
- // reloadThrottle: 2000
59
- server: {
60
- baseDir: _path.default.resolve(`project-${build}`),
61
- middleware: (req, res, next) => {
62
- // Set headers for XHTML files to allow document.write
63
- if (/\.xhtml$/.test(req.url)) {
64
- res.setHeader('Content-Type', 'text/html; charset=UTF-8');
65
- }
66
-
67
- next();
68
- }
69
- },
70
- plugins: [{
71
- module: 'bs-html-injector',
72
- options: {
73
- files: [{
74
- match: [_path.default.resolve('_project', '**', '*.scss'), _path.default.resolve('_project', '**', '*.js'), _path.default.resolve('_project', '**', '*.md')],
75
- fn: (0, _debounce.default)(() => reload(), debounceSpeed, {
76
- leading: false,
77
- trailing: true
78
- })
79
- }]
80
- }
81
- }]
82
- }, resolve));
52
+ const browserSyncPlugins = [{
53
+ module: 'bs-html-injector',
54
+ options: {
55
+ files: [{
56
+ match: [_path.default.resolve('_project', '**', '*.scss'), _path.default.resolve('_project', '**', '*.js'), _path.default.resolve('_project', '**', '*.md')],
57
+ fn: (0, _debounce.default)(() => reload(), debounceSpeed, {
58
+ leading: false,
59
+ trailing: true
60
+ })
61
+ }]
62
+ }
63
+ }];
64
+
65
+ const browserSyncMiddleware = (req, res, next) => {
66
+ // Set headers for XHTML files to allow document.write
67
+ if (/\.xhtml$/.test(req.url)) {
68
+ res.setHeader('Content-Type', 'text/html; charset=UTF-8');
69
+ }
70
+
71
+ next();
72
+ };
73
+
74
+ const init = build => new _promise.default(resolve => {
75
+ const options = {
76
+ port,
77
+ open: false,
78
+ // Opens browser programatically below
79
+ // reloadDelay: 2000
80
+ // reloadDebounce: 2000
81
+ // reloadThrottle: 2000
82
+ server: {
83
+ baseDir: _path.default.resolve(`project-${build}`),
84
+ middleware: browserSyncMiddleware
85
+ },
86
+ plugins: browserSyncPlugins
87
+ };
88
+ browserSync.init(options, resolve);
89
+ });
83
90
 
84
91
  const serve = async ({
85
- build,
92
+ build: buildOption,
86
93
  external
87
94
  }) => {
88
95
  const location = external ? 'external' : 'local';
89
- const build_ = build !== null && build !== void 0 ? build : 'reader';
90
- await init(build_);
96
+ const build = buildOption || 'reader';
97
+ await init(build);
91
98
  const url = browserSync.getOption('urls').get(location);
92
- update = config(build_)(url);
99
+ update = config(build)(url);
93
100
  await update(); // Update the location in the config object so that a call can be made
94
101
  // to openBrowser once the project has been built
95
102
 
package/dist/validate/index.js CHANGED
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
 
3
+ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
4
+
3
5
  var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
4
6
 
5
- var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard");
7
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
6
8
 
7
9
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
8
10
 
@@ -30,6 +32,10 @@ var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logg
30
32
 
31
33
  var _bBerValidator = _interopRequireWildcard(require("@canopycanopycanopy/b-ber-validator"));
32
34
 
35
+ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
36
+
37
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
38
+
33
39
  const validate = async ({
34
40
  project
35
41
  }) => {
package/dist/web/index.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 _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
 
@@ -24,20 +38,6 @@ var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
24
38
 
25
39
  var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
26
40
 
27
- var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
28
-
29
- var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
30
-
31
- var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
32
-
33
- var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
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
41
  var _path = _interopRequireDefault(require("path"));
42
42
 
43
43
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
@@ -64,9 +64,9 @@ var _recursiveReaddir = _interopRequireDefault(require("recursive-readdir"));
64
64
 
65
65
  var _Template = _interopRequireDefault(require("./Template"));
66
66
 
67
- 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; }
67
+ 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; }
68
68
 
69
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context7; (0, _forEach.default)(_context7 = ownKeys(Object(source), true)).call(_context7, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context8; (0, _forEach.default)(_context8 = ownKeys(Object(source))).call(_context8, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
69
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context7, _context8; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context7 = ownKeys(Object(source), !0)).call(_context7, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context8 = ownKeys(Object(source))).call(_context8, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
70
70
 
71
71
  let ASSETS_TO_UNLINK;
72
72
  let DIST_PATH;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@canopycanopycanopy/b-ber-tasks",
3
- "version": "1.2.16",
3
+ "version": "2.0.0",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -19,14 +19,14 @@
19
19
  },
20
20
  "dependencies": {
21
21
  "@babel/runtime-corejs3": "^7.10.5",
22
- "@canopycanopycanopy/b-ber-lib": "1.2.16",
23
- "@canopycanopycanopy/b-ber-logger": "1.2.16",
24
- "@canopycanopycanopy/b-ber-markdown-renderer": "1.2.16",
25
- "@canopycanopycanopy/b-ber-reader": "1.2.16",
26
- "@canopycanopycanopy/b-ber-resources": "1.2.16",
27
- "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.16",
28
- "@canopycanopycanopy/b-ber-templates": "1.2.16",
29
- "@canopycanopycanopy/b-ber-validator": "1.2.16",
22
+ "@canopycanopycanopy/b-ber-lib": "2.0.0",
23
+ "@canopycanopycanopy/b-ber-logger": "2.0.0",
24
+ "@canopycanopycanopy/b-ber-markdown-renderer": "2.0.0",
25
+ "@canopycanopycanopy/b-ber-reader": "2.0.0",
26
+ "@canopycanopycanopy/b-ber-resources": "2.0.0",
27
+ "@canopycanopycanopy/b-ber-shapes-sequences": "2.0.0",
28
+ "@canopycanopycanopy/b-ber-templates": "2.0.0",
29
+ "@canopycanopycanopy/b-ber-validator": "2.0.0",
30
30
  "autoprefixer": "^9.6.1",
31
31
  "browser-sync": "^2.27.7",
32
32
  "bs-html-injector": "^3.0.3",
@@ -54,9 +54,10 @@
54
54
  "@babel/cli": "^7.10.5",
55
55
  "@babel/core": "^7.10.5",
56
56
  "@babel/preset-env": "^7.10.4",
57
- "jest": "^24.8.0",
57
+ "browserslist": "^4.17.4",
58
+ "jest": "^26.6.3",
58
59
  "mock-fs": "^4.4.2",
59
- "rimraf": "^2.6.3"
60
+ "rimraf": "^2.7.1"
60
61
  },
61
62
  "files": [
62
63
  "dist"
@@ -75,5 +76,5 @@
75
76
  "url": "https://maxwellsimmer.com"
76
77
  }
77
78
  ],
78
- "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
79
+ "gitHead": "dbeae192709705f5bc211195ff343cbd999f9caf"
79
80
  }