@canopycanopycanopy/b-ber-tasks 1.2.12-alpha.5 → 1.2.13-react-reader.5

package/dist/reader/index.js

@@ -46,7 +46,8 @@ class Reader {
     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);
+    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() {
@@ -210,7 +211,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

@@ -145,19 +145,34 @@ const copyThemeAssets = () => {
 };
 
 function resolveImportedModule(importPath) {
-  const trimmedImportPath = (0, _slice.default)(importPath).call(importPath, 1);
+  // Remove preceeding tilde
+  const trimmedImportPath = (0, _slice.default)(importPath).call(importPath, 1); // Get the import path as an array
+
   let importTree = trimmedImportPath.split(_path.default.sep); // Remove empty entries caused by leading/trailing slashes
 
-  importTree = (0, _filter.default)(importTree).call(importTree, Boolean);
-  let moduleName = importTree.shift();
-  if (moduleName[0] === '@') moduleName += `/${importTree.shift()}`; // Allow scoped packages
+  importTree = (0, _filter.default)(importTree).call(importTree, Boolean); // Define both the scope and the name - the scope will be
+  // used to resolve the import and get the necessary path, the
+  // name will be used to construct the final file path
+
+  let moduleScope = '';
+  let moduleName = importTree.shift(); // Allow scoped packages
+
+  if (moduleName[0] === '@') {
+    moduleScope = moduleName;
+    moduleName = importTree.shift();
+  } // @foo/bar | foo
+
+
+  const moduleNameWithScope = _path.default.join(moduleScope, moduleName); // Get the module
+
 
-  const modulePath = require.resolve(moduleName, {
+  const modulePath = require.resolve(moduleNameWithScope, {
     paths: [_path.default.join(_path.default.dirname(_State.default.theme.entry))]
   }); // No path was provided, return the imported node module
 
 
-  if (!importTree.length) return modulePath; // User is importing a specific file, find it and return its location
+  if (!importTree.length) return modulePath; // User is importing a specific file, find it and return its location. Remove
+  // the modules scope from the name when finding the path
 
   const moduleIndex = (0, _indexOf.default)(modulePath).call(modulePath, moduleName) + moduleName.length;
   const packagePath = (0, _slice.default)(modulePath).call(modulePath, 0, moduleIndex);
@@ -169,11 +184,12 @@ function resolveImportedModule(importPath) {
 
 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) => url[0] === '~' ? done({
-    file: resolveImportedModule(url)
-  }) : done({
-    file: url
-  }),
+  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}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-tasks",
-  "version": "1.2.12-alpha.5+9b163735",
+  "version": "1.2.13-react-reader.5+f56709c6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,16 +19,16 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-lib": "1.2.10",
-    "@canopycanopycanopy/b-ber-logger": "1.2.10",
-    "@canopycanopycanopy/b-ber-markdown-renderer": "1.2.10",
-    "@canopycanopycanopy/b-ber-reader": "1.2.12-alpha.5+9b163735",
-    "@canopycanopycanopy/b-ber-resources": "1.2.2",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.2",
-    "@canopycanopycanopy/b-ber-templates": "1.2.10",
-    "@canopycanopycanopy/b-ber-validator": "1.2.2",
+    "@canopycanopycanopy/b-ber-lib": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-logger": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-markdown-renderer": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-reader": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-resources": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-templates": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-validator": "1.2.13-react-reader.5+f56709c6",
     "autoprefixer": "^9.6.1",
-    "browser-sync": "^2.26.12",
+    "browser-sync": "^2.27.7",
     "bs-html-injector": "^3.0.3",
     "cheerio": "^1.0.0-rc.2",
     "css": "^2.2.1",
@@ -37,16 +37,18 @@
     "glob": "^7.1.4",
     "image-size": "^0.8.3",
     "layouts": "^3.0.2",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "lunr": "^2.1.6",
     "postcss": "^7.0.14",
     "pureimage": "^0.1.6",
     "recursive-readdir": "^2.2.2",
     "sass": "^1.49.8",
     "system": "^2.0.1",
+    "tar": "^6.1.11",
     "uglify-js": "^3.10.0",
     "vinyl": "^2.2.0",
-    "webpage": "^0.3.0"
+    "webpage": "^0.3.0",
+    "xmlhttprequest-ssl": "^2.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.5",
@@ -73,5 +75,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "9b1637358089706ee9e8179bb1a234afa0d0e847"
+  "gitHead": "f56709c6bbaa455c0a1f704cf7de19b924ba5b99"
 }