@canopycanopycanopy/b-ber-cli 1.2.10 → 1.2.12

package/dist/app.js

@@ -1,10 +1,8 @@
 "use strict";
 
-var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
 
-var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard");
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
@@ -20,10 +18,6 @@ var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State
 
 var commands = _interopRequireWildcard(require("./commands"));
 
-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); }
-
-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; }
-
 const LINE_LENGTH = 70;
 
 function bber() {

package/dist/commands/new.js

@@ -1,31 +1,167 @@
 "use strict";
 
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
+
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
+
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _path = _interopRequireDefault(require("path"));
+
 var _bBerTasks = require("@canopycanopycanopy/b-ber-tasks");
 
 var _utils = require("@canopycanopycanopy/b-ber-lib/utils");
 
+var _YamlAdaptor = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/YamlAdaptor"));
+
+var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
+
+const _excluded = ["_", "$0", "name", "config"];
+
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context; _forEachInstanceProperty(_context = ownKeys(Object(source), true)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context2; _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 const command = 'new <name>';
 const describe = 'Create a new project';
 
 const builder = yargs => yargs.positional('name', {
   describe: 'New project name',
   type: 'string'
+}).option('env', {
+  describe: 'The default build environment',
+  type: 'string' // default: 'development',
+
+}).option('theme', {
+  describe: 'Default theme name',
+  type: 'string' // default: 'b-ber-theme-serif',
+
+}).option('src', {
+  describe: 'The name of the source directory',
+  type: 'string' // default: 'src',
+
+}).option('dist', {
+  describe: 'The name of the dist directory',
+  type: 'string' // default: 'dist',
+
+}).option('cache', {
+  describe: 'Whether to enable caching',
+  type: 'boolean' // default: false,
+
+}).option('themes_directory', {
+  describe: 'Relative or absolute path to the directory for third-party themes',
+  type: 'string' // default: './themes',
+
+}).option('ignore', {
+  describe: 'Array of files or folders to ignore during the build',
+  type: 'array' // default: [],
+
+}).option('base_path', {
+  describe: 'Base path appended to the URL for the reader build',
+  type: 'string' // default: '/',
+
+}).option('remote_url', {
+  describe: 'URL at which the reader build will be made public',
+  type: 'string' // default: 'http://localhost:4000/',
+
+}).option('reader_url', {
+  describe: 'URL that hosts the assets for the reader reader build',
+  type: 'string' // default: 'http://localhost:4000/project-reader',
+
+}).option('bucket_url', {
+  describe: 'The S3 bucket URL where the remote project will be deployed to if hosting on S3',
+  type: 'string' // default: '',
+
+}).option('private', {
+  describe: 'If the web and reader builds should be discoverable by search engines',
+  type: 'boolean' // default: false,
+
+}).option('remote_javascripts', {
+  describe: 'Remotely hosted JavaScript files for the reader',
+  type: 'array' // default: [],
+
+}).option('remote_stylesheets', {
+  describe: 'Remotely hosted stylesheets files for the reader',
+  type: 'array' // default: [],
+
+}).option('config', {
+  describe: 'Path to a JSON or YAML configuration file that will extend the base configuration',
+  type: 'string' // default: '',
+
 }).fail((msg, err) => (0, _utils.fail)(msg, err, yargs)).help('h').alias('h', 'help').usage(`\nUsage: $0 new "My Project"\n\n${describe}`);
 
-const handler = argv => {
+const handler = async argv => {
+  // Extract CLI options and get the config file option in case there is one
   const {
-    name
-  } = argv;
+    _,
+    $0,
+    name,
+    config
+  } = argv,
+        rest = (0, _objectWithoutProperties2.default)(argv, _excluded); // Set up the config object that's going to be passed into the `init` function
+
+  let projectConfig = {}; // Check if a config files has been specified
+
+  if (config) {
+    const ext = _path.default.extname(config);
+
+    const configPath = _path.default.resolve(process.cwd(), config);
+
+    if (!(await _fsExtra.default.pathExists(config))) {
+      _bBerLogger.default.error('Could not find config at %s', configPath);
+    }
+
+    if (/^\.(?:ya?ml|json)/i.test(ext) === false) {
+      _bBerLogger.default.error('Config file must have a .json or .yaml/.yml file extension');
+    }
+
+    const contents = await _fsExtra.default.readFile(config);
+
+    if (/^\.ya?ml/i.test(ext)) {
+      projectConfig = _YamlAdaptor.default.parse(contents);
+    } else {
+      projectConfig = JSON.parse(contents);
+    }
+  } // Override the values specified in the config file with values
+  // that have been explicitly provided on the CLI. Allows using the
+  // config file as a template that can be overridden, e.g.,
+  // bber new foo --config my-generic-conf.yaml --base_path /foo
+
+
+  projectConfig = _objectSpread(_objectSpread({}, projectConfig), rest); // Attributes not currently configurable via the CLI:
+  // ibooks_specified_fonts
+  // autoprefixer_options
+  // base_url
+  // downloads
+  // ui_options
+
   const initializer = new _bBerTasks.init({
-    name
+    name,
+    config: projectConfig
   });
   initializer.start();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-cli",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -22,13 +22,15 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-lib": "1.2.10",
-    "@canopycanopycanopy/b-ber-logger": "1.2.10",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.2",
-    "@canopycanopycanopy/b-ber-tasks": "1.2.10",
-    "@canopycanopycanopy/b-ber-templates": "1.2.10",
+    "@canopycanopycanopy/b-ber-lib": "1.2.12",
+    "@canopycanopycanopy/b-ber-logger": "1.2.12",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.12",
+    "@canopycanopycanopy/b-ber-tasks": "1.2.12",
+    "@canopycanopycanopy/b-ber-templates": "1.2.12",
     "fs-extra": "^8.1.0",
+    "lodash": "^4.17.21",
     "lodash.has": "latest",
+    "tar": "^6.1.11",
     "yargs": "^13.3.0"
   },
   "devDependencies": {
@@ -56,5 +58,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "2851c865a57746417975cedb733f79b42d3f0084"
+  "gitHead": "84df51c85877eeadd71f5b5372e1d5c08580e883"
 }