@canopycanopycanopy/b-ber-tasks 1.2.15 → 2.0.0

package/dist/reader/index.js

@@ -36,6 +36,8 @@ var _recursiveReaddir = _interopRequireDefault(require("recursive-readdir"));
 
 var _has = _interopRequireDefault(require("lodash/has"));
 
+/* eslint-disable camelcase */
+
 /* eslint-disable class-methods-use-this */
 class Reader {
   constructor() {
@@ -45,8 +47,10 @@ class Reader {
     this.epubAssets = ['META-INF', 'OPS', 'mimetype'];
     this.readerModuleName = '@canopycanopycanopy/b-ber-reader';
     this.readerModuleDistDir = 'dist';
-    this.readerAppPath = null;
-    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);
+    this.readerAppPath = null; // eslint-disable-next-line no-constructor-return
+
+    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);
   }
 
   get remoteURL() {
@@ -123,6 +127,7 @@ class Reader {
   }
 
   getBookMetadata(term) {
+    if (!term) return _State.default.metadata.json();
     const entry = (0, _find.default)(_State.default.metadata.json(), {
       term
     });
@@ -134,6 +139,8 @@ class Reader {
   }
 
   getProjectConfig(term) {
+    if (!term) return _State.default.config;
+
     if (!(0, _has.default)(_State.default.config, term)) {
       _bBerLogger.default.warn(`Invalid property for config: ${term}`);
     }
@@ -142,16 +149,26 @@ class Reader {
   }
 
   writeBookManifest() {
-    const identifier = this.getBookMetadata('identifier');
+    // Get metadata for books.json
+    const id = this.getBookMetadata('identifier');
     const title = this.getBookMetadata('title');
-    const url = `${_bBerLib.Url.trimSlashes(this.remoteURL)}/${this.outputDirName}/${this.createDirname(identifier)}`;
-    const cover = `${url}/OPS/images/${this.getBookMetadata('cover')}`;
+    const url = `${_bBerLib.Url.trimSlashes(this.remoteURL)}/${this.outputDirName}/${this.createDirname(id)}`;
+    const cover = `${url}/OPS/images/${this.getBookMetadata('cover')}`; // Get config required by reader for books.json
+
+    const {
+      downloads,
+      ui_options,
+      layout
+    } = this.getProjectConfig();
     const manifest = [{
       title,
       url,
       cover,
-      id: identifier
-    }]; // write to an `api` dir in case the app is being deployed statically
+      id,
+      downloads,
+      ui_options,
+      layout
+    }]; // Write to an `api` dir in case the app is being deployed statically
 
     return _fsExtra.default.writeJson(_path2.default.join(this.apiDir, 'books.json'), manifest);
   }
@@ -210,7 +227,8 @@ class Reader {
     contents = _fsExtra.default.readFileSync(indexHTML, 'utf8');
     contents = contents.replace(/__SERVER_DATA__ = {}/, `__SERVER_DATA__ = ${(0, _stringify.default)(serverData)}`);
     return _fsExtra.default.writeFile(indexHTML, contents);
-  }
+  } // Update URLs in CSS
+
 
   updateLinkedResourcesWithAbsolutePaths() {
     const indexContents = _fsExtra.default.readFileSync(_State.default.dist.root('index.html'), 'utf8');

package/dist/sass/index.js

@@ -42,7 +42,7 @@ var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State
 // running the sass task
 const ASSET_DIRNAMES = ['fonts', 'images'];
 const autoprefixerOptions = _State.default.config.autoprefixer_options || {
-  overrideBrowserslist: ['last 2 versions', '> 2%'],
+  overrideBrowserslist: ['defaults', '> 1%', 'not dead', 'not IE 11'],
   flexbox: 'no-2009'
 }; // Check to see if there's an `application.scss` in `_stylesheets`, and if so
 // load that; else verify that a theme is selected in `config`, and that the
@@ -182,24 +182,26 @@ function resolveImportedModule(importPath) {
   return importedModule;
 }
 
-const renderCSS = scssString => new _promise.default(resolve => _sass.default.render({
-  // Importer allows use of '~' to denote node_modules directory in SCSS files
-  importer: (url, _file, done) => {
-    const file = url[0] === '~' ? resolveImportedModule(url) : url;
-    return done({
-      file
-    });
-  },
-  // Add build vars at runtime with the SCSS buffer (which is transformed
-  // to string in the backticks)
-  data: `$build: "${_State.default.build}";${scssString}`,
-  includePaths: [_State.default.src.stylesheets(), _path.default.dirname(_State.default.theme.entry), _path.default.dirname(_path.default.dirname(_State.default.theme.entry))],
-  outputStyle: _State.default.env === 'production' ? 'compressed' : 'expanded',
-  errLogToConsole: true
-}, (err, result) => {
-  if (err) throw err;
-  resolve(result);
-}));
+const renderCSS = scssString => new _promise.default(resolve => {
+  _sass.default.render({
+    // Importer allows use of '~' to denote node_modules directory in SCSS files
+    importer: (url, _file, done) => {
+      const file = url[0] === '~' ? resolveImportedModule(url) : url;
+      return done({
+        file
+      });
+    },
+    // Add build vars at runtime with the SCSS buffer (which is transformed
+    // to string in the backticks)
+    data: `$build: "${_State.default.build}";${scssString}`,
+    includePaths: [_State.default.src.stylesheets(), _path.default.dirname(_State.default.theme.entry), _path.default.dirname(_path.default.dirname(_State.default.theme.entry))],
+    outputStyle: _State.default.env === 'production' ? 'compressed' : 'expanded',
+    errLogToConsole: true
+  }, (err, result) => {
+    if (err) throw err;
+    resolve(result);
+  });
+});
 
 const applyPostProcessing = ({
   css

package/dist/serve/index.js

@@ -49,47 +49,54 @@ let update = async () => {};
 
 const reload = () => update().then(browserSync.reload);
 
-const init = build => new _promise.default(resolve => browserSync.init({
-  port,
-  open: false,
-  // Opens browser programatically below
-  // reloadDelay: 2000
-  // reloadDebounce: 2000
-  // reloadThrottle: 2000
-  server: {
-    baseDir: _path.default.resolve(`project-${build}`),
-    middleware: (req, res, next) => {
-      // Set headers for XHTML files to allow document.write
-      if (/\.xhtml$/.test(req.url)) {
-        res.setHeader('Content-Type', 'text/html; charset=UTF-8');
-      }
-
-      next();
-    }
-  },
-  plugins: [{
-    module: 'bs-html-injector',
-    options: {
-      files: [{
-        match: [_path.default.resolve('_project', '**', '*.scss'), _path.default.resolve('_project', '**', '*.js'), _path.default.resolve('_project', '**', '*.md')],
-        fn: (0, _debounce.default)(() => reload(), debounceSpeed, {
-          leading: false,
-          trailing: true
-        })
-      }]
-    }
-  }]
-}, resolve));
+const browserSyncPlugins = [{
+  module: 'bs-html-injector',
+  options: {
+    files: [{
+      match: [_path.default.resolve('_project', '**', '*.scss'), _path.default.resolve('_project', '**', '*.js'), _path.default.resolve('_project', '**', '*.md')],
+      fn: (0, _debounce.default)(() => reload(), debounceSpeed, {
+        leading: false,
+        trailing: true
+      })
+    }]
+  }
+}];
+
+const browserSyncMiddleware = (req, res, next) => {
+  // Set headers for XHTML files to allow document.write
+  if (/\.xhtml$/.test(req.url)) {
+    res.setHeader('Content-Type', 'text/html; charset=UTF-8');
+  }
+
+  next();
+};
+
+const init = build => new _promise.default(resolve => {
+  const options = {
+    port,
+    open: false,
+    // Opens browser programatically below
+    // reloadDelay: 2000
+    // reloadDebounce: 2000
+    // reloadThrottle: 2000
+    server: {
+      baseDir: _path.default.resolve(`project-${build}`),
+      middleware: browserSyncMiddleware
+    },
+    plugins: browserSyncPlugins
+  };
+  browserSync.init(options, resolve);
+});
 
 const serve = async ({
-  build,
+  build: buildOption,
   external
 }) => {
   const location = external ? 'external' : 'local';
-  const build_ = build !== null && build !== void 0 ? build : 'reader';
-  await init(build_);
+  const build = buildOption || 'reader';
+  await init(build);
   const url = browserSync.getOption('urls').get(location);
-  update = config(build_)(url);
+  update = config(build)(url);
   await update(); // Update the location in the config object so that a call can be made
   // to openBrowser once the project has been built
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-tasks",
-  "version": "1.2.15",
+  "version": "2.0.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,14 +19,14 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-lib": "1.2.15",
-    "@canopycanopycanopy/b-ber-logger": "1.2.12",
-    "@canopycanopycanopy/b-ber-markdown-renderer": "1.2.15",
-    "@canopycanopycanopy/b-ber-reader": "1.2.15",
-    "@canopycanopycanopy/b-ber-resources": "1.2.12",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.12",
-    "@canopycanopycanopy/b-ber-templates": "1.2.15",
-    "@canopycanopycanopy/b-ber-validator": "1.2.12",
+    "@canopycanopycanopy/b-ber-lib": "2.0.0",
+    "@canopycanopycanopy/b-ber-logger": "2.0.0",
+    "@canopycanopycanopy/b-ber-markdown-renderer": "2.0.0",
+    "@canopycanopycanopy/b-ber-reader": "2.0.0",
+    "@canopycanopycanopy/b-ber-resources": "2.0.0",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "2.0.0",
+    "@canopycanopycanopy/b-ber-templates": "2.0.0",
+    "@canopycanopycanopy/b-ber-validator": "2.0.0",
     "autoprefixer": "^9.6.1",
     "browser-sync": "^2.27.7",
     "bs-html-injector": "^3.0.3",
@@ -54,9 +54,10 @@
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
-    "jest": "^24.8.0",
+    "browserslist": "^4.17.4",
+    "jest": "^26.6.3",
     "mock-fs": "^4.4.2",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.7.1"
   },
   "files": [
     "dist"
@@ -75,5 +76,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "0ae2e14c92c5ceeb7b21563e32cdd8933becc842"
+  "gitHead": "dbeae192709705f5bc211195ff343cbd999f9caf"
 }