@percy/cli-snapshot 1.0.0-beta.71 → 1.0.0-beta.72

package/README.md

@@ -4,39 +4,46 @@ Snapshot a list or static directory of web pages.
 
 ## Commands
 <!-- commands -->
-* [`percy snapshot DIR|FILE|SITEMAP`](#percy-snapshot-dirfilesitemap)
+* [`percy snapshot`](#percy-snapshot)
 
-## `percy snapshot DIR|FILE|SITEMAP`
+### `percy snapshot`
 
-Take snapshots from a static directory, snapshots file, or sitemap url
+Snapshot a static directory, snapshots file, or sitemap URL
 
 ```
-USAGE
-  $ percy snapshot DIR|FILE|SITEMAP
-
-ARGUMENTS
-  DIR|FILE|SITEMAP  static directory, snapshots file, or sitemap url
-
-OPTIONS
-  -b, --base-url=base-url                          the base url pages are hosted at when snapshotting
-  -c, --config=config                              configuration file path
-  -d, --dry-run                                    print logs only, do not run asset discovery or upload snapshots
-  -h, --allowed-hostname=allowed-hostname          allowed hostnames to capture in asset discovery
-  -q, --quiet                                      log errors only
-  -t, --network-idle-timeout=network-idle-timeout  asset discovery network idle timeout
-  -v, --verbose                                    log everything
-  --clean-urls                                     rewrite static index and filepath URLs to be clean
-  --debug                                          debug asset discovery and do not upload snapshots
-  --disable-cache                                  disable asset discovery caches
-  --exclude=exclude                                one or more globs/patterns matching snapshots to exclude
-  --include=include                                one or more globs/patterns matching snapshots to include
-  --silent                                         log nothing
-
-EXAMPLES
+Usage:
+  $ percy snapshot [options] <dir|file|sitemap>
+
+Arguments:
+  dir|file|sitemap                   Static directory, snapshots file, or sitemap url
+
+Options:
+  -b, --base-url <string>            The base url pages are hosted at when snapshotting
+  --include <pattern>                One or more globs/patterns matching snapshots to include
+  --exclude <pattern>                One or more globs/patterns matching snapshots to exclude
+
+Static options:
+  --clean-urls                       Rewrite static index and filepath URLs to be clean
+
+Percy options:
+  -c, --config <file>                Config file path
+  -d, --dry-run                      Print snapshot names only
+  -h, --allowed-hostname <hostname>  Allowed hostnames to capture in asset discovery
+  -t, --network-idle-timeout <ms>    Asset discovery network idle timeout
+  --disable-cache                    Disable asset discovery caches
+  --debug                            Debug asset discovery and do not upload snapshots
+
+Global options:
+  -v, --verbose                      Log everything
+  -q, --quiet                        Log errors only
+  -s, --silent                       Log nothing
+  --help                             Display command help
+
+Examples:
   $ percy snapshot ./public
   $ percy snapshot snapshots.yml
+  $ percy snapshot https://percy.io/sitemap.xml
 ```
-
 <!-- commandsstop -->
 
 ## Usage

package/dist/config.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.configSchema = exports.cliSchema = void 0;
-exports.migration = migration;
-exports.snapshotListSchema = exports.schemas = void 0;
+exports.commonSchema = void 0;
+exports.configMigration = configMigration;
+exports.snapshotsFileSchema = exports.configSchema = void 0;
 
 var _config = require("@percy/core/dist/config");
 
 // Common schemas referenced by other schemas
-const cliSchema = {
+const commonSchema = {
   $id: '/snapshot/cli',
   $refs: {
     predicate: {
@@ -30,7 +30,7 @@ const cliSchema = {
   }
 }; // Config schema for static directories
 
-exports.cliSchema = cliSchema;
+exports.commonSchema = commonSchema;
 const configSchema = {
   static: {
     type: 'object',
@@ -94,11 +94,11 @@ const configSchema = {
       }
     }
   }
-}; // Page listing schema
+}; // Snapshots file schema
 
 exports.configSchema = configSchema;
-const snapshotListSchema = {
-  $id: '/snapshot/list',
+const snapshotsFileSchema = {
+  $id: '/snapshot/file',
   oneOf: [{
     type: 'array',
     items: {
@@ -131,11 +131,9 @@ const snapshotListSchema = {
     }
   }]
 };
-exports.snapshotListSchema = snapshotListSchema;
-const schemas = [cliSchema, configSchema, snapshotListSchema];
-exports.schemas = schemas;
+exports.snapshotsFileSchema = snapshotsFileSchema;
 
-function migration(config, util) {
+function configMigration(config, util) {
   /* eslint-disable curly */
   if (config.version < 2) {
     // static-snapshots and options were renamed

package/dist/file.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadSnapshotsFile = loadSnapshotsFile;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _config = _interopRequireDefault(require("@percy/config"));
+
+var _utils = require("./utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+// Loads snapshots from a js, json, or yaml file.
+async function loadSnapshotsFile(file, flags, invalid) {
+  var _PercyConfig$validate;
+
+  let ext = _path.default.extname(file);
+
+  let config = {}; // load snapshots file
+
+  if (ext === '.js') {
+    ({
+      default: config
+    } = await Promise.resolve(`${_path.default.resolve(file)}`).then(s => _interopRequireWildcard(require(s))));
+    if (typeof config === 'function') config = await config();
+  } else if (ext === '.json') {
+    config = JSON.parse(_fs.default.readFileSync(file, {
+      encoding: 'utf-8'
+    }));
+  } else if (ext.match(/\.ya?ml$/)) {
+    let YAML = await Promise.resolve().then(() => _interopRequireWildcard(require('yaml')));
+    config = YAML.parse(_fs.default.readFileSync(file, {
+      encoding: 'utf-8'
+    }));
+  } else {
+    throw new Error(`Unsupported filetype: ${file}`);
+  } // validate base-url before config options
+
+
+  if (flags.baseUrl && !flags.baseUrl.startsWith('http')) {
+    throw new Error('The base-url must include a protocol ' + 'and hostname when providing a list of snapshots');
+  } // validate snapshot config options
+
+
+  (_PercyConfig$validate = _config.default.validate(config, '/snapshot/file')) === null || _PercyConfig$validate === void 0 ? void 0 : _PercyConfig$validate.forEach(invalid); // flags override config options
+
+  let {
+    baseUrl,
+    include,
+    exclude
+  } = { ...config,
+    ...flags
+  }; // support config that only contains a list of snapshots
+
+  return (Array.isArray(config) ? config : config.snapshots || []).reduce((snapshots, snap) => {
+    // reduce matching snapshots with default options
+    snap = (0, _utils.withDefaults)(snap, {
+      host: baseUrl
+    });
+    return (0, _utils.snapshotMatches)(snap, include, exclude) ? snapshots.concat(snap) : snapshots;
+  }, []);
+}

package/dist/index.js

@@ -1,3 +1,13 @@
 "use strict";
 
-module.exports = require('./commands/snapshot').Snapshot;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "snapshot", {
+  enumerable: true,
+  get: function () {
+    return _snapshot.snapshot;
+  }
+});
+
+var _snapshot = require("./snapshot");

package/dist/sitemap.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadSitemapSnapshots = loadSitemapSnapshots;
+
+var _static = require("./static");
+
+var _utils = require("@percy/core/dist/utils");
+
+// Fetches and maps sitemap URLs to snapshots.
+async function loadSitemapSnapshots(sitemapUrl, config) {
+  // fetch sitemap URLs
+  let urls = await (0, _utils.request)(sitemapUrl, (body, res) => {
+    // validate sitemap content-type
+    let [contentType] = res.headers['content-type'].split(';');
+
+    if (!/^(application|text)\/xml$/.test(contentType)) {
+      throw new Error('The sitemap must be an XML document, ' + `but the content-type was "${contentType}"`);
+    } // parse XML content into a list of URLs
+
+
+    let urls = body.match(/(?<=<loc>)(.*)(?=<\/loc>)/ig); // filter out duplicate URLs that differ by a trailing slash
+
+    return urls.filter((url, i) => {
+      let match = urls.indexOf(url.replace(/\/$/, ''));
+      return match === -1 || match === i;
+    });
+  }); // map with inherited static options
+
+  return (0, _static.mapStaticSnapshots)(urls, config);
+}

package/dist/snapshot.js

@@ -0,0 +1,147 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.snapshot = exports.default = void 0;
+
+var _fs = require("fs");
+
+var _cliCommand = _interopRequireDefault(require("@percy/cli-command"));
+
+var SnapshotConfig = _interopRequireWildcard(require("./config"));
+
+var _package = _interopRequireDefault(require("../package.json"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 snapshot = (0, _cliCommand.default)('snapshot', {
+  description: 'Snapshot a static directory, snapshots file, or sitemap URL',
+  args: [{
+    name: 'dir|file|sitemap',
+    description: 'Static directory, snapshots file, or sitemap url',
+    required: true,
+    attribute: val => {
+      if (/^https?:\/\//.test(val)) return 'sitemap';
+      if (!(0, _fs.existsSync)(val)) throw new Error(`Not found: ${val}`);
+      return (0, _fs.lstatSync)(val).isDirectory() ? 'dir' : 'file';
+    }
+  }],
+  flags: [{
+    name: 'base-url',
+    description: 'The base url pages are hosted at when snapshotting',
+    type: 'string',
+    short: 'b'
+  }, {
+    name: 'include',
+    description: 'One or more globs/patterns matching snapshots to include',
+    type: 'pattern',
+    multiple: true
+  }, {
+    name: 'exclude',
+    description: 'One or more globs/patterns matching snapshots to exclude',
+    type: 'pattern',
+    multiple: true
+  }, {
+    // static only
+    name: 'clean-urls',
+    description: 'Rewrite static index and filepath URLs to be clean',
+    percyrc: 'static.cleanUrls',
+    group: 'Static'
+  }, {
+    // deprecated
+    name: 'files',
+    deprecated: ['1.0.0', '--include'],
+    percyrc: 'static.include',
+    type: 'pattern'
+  }, {
+    name: 'ignore',
+    deprecated: ['1.0.0', '--exclude'],
+    percyrc: 'static.exclude',
+    type: 'pattern'
+  }],
+  examples: ['$0 ./public', '$0 snapshots.yml', '$0 https://percy.io/sitemap.xml'],
+  percy: {
+    clientInfo: `${_package.default.name}/${_package.default.version}`,
+    environmentInfo: `node/${process.version}`
+  },
+  config: {
+    schemas: [SnapshotConfig.commonSchema, SnapshotConfig.configSchema, SnapshotConfig.snapshotsFileSchema],
+    migrations: [SnapshotConfig.configMigration]
+  }
+}, async function* ({
+  percy,
+  args,
+  flags,
+  log,
+  exit
+}) {
+  if (!percy) exit(0, 'Percy is disabled'); // set and validate static or sitemap config flags
+
+  if (args.dir || args.sitemap) {
+    percy.setConfig({
+      [args.dir ? 'static' : 'sitemap']: {
+        include: flags.include,
+        exclude: flags.exclude
+      }
+    });
+  } // gather snapshots
+
+
+  let snapshots, server;
+
+  try {
+    if (args.sitemap) {
+      let {
+        loadSitemapSnapshots
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('./sitemap')));
+      let config = { ...percy.config.sitemap,
+        ...flags
+      };
+      snapshots = yield loadSitemapSnapshots(args.sitemap, config);
+    } else if (args.dir) {
+      let {
+        serve,
+        loadStaticSnapshots
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('./static')));
+      let config = { ...percy.config.static,
+        ...flags
+      };
+      server = yield serve(args.dir, config);
+      snapshots = yield loadStaticSnapshots(args.dir, { ...config,
+        server
+      });
+    } else {
+      let {
+        loadSnapshotsFile
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('./file')));
+      snapshots = yield loadSnapshotsFile(args.file, flags, (invalid, i) => {
+        if (i === 0) log.warn('Invalid snapshot options:');
+        log.warn(`- ${invalid.path}: ${invalid.message}`);
+      });
+    }
+
+    if (!snapshots.length) {
+      exit(1, 'No snapshots found');
+    } // start processing snapshots
+
+
+    yield* percy.start();
+    percy.snapshot(snapshots);
+    yield* percy.stop();
+  } catch (error) {
+    await percy.stop(true);
+    throw error;
+  } finally {
+    var _server;
+
+    await ((_server = server) === null || _server === void 0 ? void 0 : _server.close());
+  }
+});
+exports.snapshot = snapshot;
+var _default = snapshot;
+exports.default = _default;

package/dist/static.js

@@ -0,0 +1,164 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadStaticSnapshots = loadStaticSnapshots;
+exports.mapStaticSnapshots = mapStaticSnapshots;
+exports.serve = serve;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _http = require("http");
+
+var _serveHandler = _interopRequireDefault(require("serve-handler"));
+
+var pathToRegexp = _interopRequireWildcard(require("path-to-regexp"));
+
+var _utils = require("./utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+// Transforms a source-destination map into an array of source-destination objects
+function mapRewrites(map, arr) {
+  return Object.entries(map).reduce((r, [source, destination]) => {
+    return (r || []).concat({
+      source,
+      destination
+    });
+  }, arr);
+} // Serves a static directory with the provided options and returns an object containing adjusted
+// rewrites (combined with any baseUrl), the server host, a close method, and the server
+// instance. The `dryRun` option will prevent the server from actually starting.
+
+
+async function serve(dir, {
+  dryRun,
+  baseUrl,
+  cleanUrls,
+  rewrites = {}
+}) {
+  let host = 'http://localhost';
+  let connections = new Set(); // coerce any provided base-url into a base-url path
+
+  if (baseUrl && !baseUrl.startsWith('/')) {
+    baseUrl = (0, _utils.validURL)(baseUrl).path;
+  } // map rewrite options with the base-url
+
+
+  rewrites = mapRewrites(rewrites, baseUrl && [{
+    source: _path.default.posix.join(baseUrl, '/:path*'),
+    destination: '/:path*'
+  }]); // start the server
+
+  let server = !dryRun && (await new Promise(resolve => {
+    let server = (0, _http.createServer)((req, res) => (0, _serveHandler.default)(req, res, {
+      public: dir,
+      cleanUrls,
+      rewrites
+    })).listen(() => resolve(server)).on('connection', s => {
+      connections.add(s.on('close', () => connections.delete(s)));
+    });
+  })); // easy clean up
+
+  let close = () => server && new Promise(resolve => {
+    /* istanbul ignore next: sometimes needed when connections are hanging */
+    connections.forEach(s => s.destroy());
+    server.close(resolve);
+  }); // add the port to the host and return
+
+
+  if (server) host += `:${server.address().port}`;
+  return {
+    host,
+    rewrites,
+    server,
+    close
+  };
+} // Maps an array of snapshots or paths to options ready to pass along to the core snapshot
+// method. Paths are normalized before overrides are conditionally applied via their own include and
+// exclude options. Snapshot URLs are then rewritten accordingly before default options are applied,
+// including prepending the appropriate host. The returned set of snapshot options are sorted and
+// filtered by the top-level include and exclude options.
+
+
+function mapStaticSnapshots(snapshots,
+/* istanbul ignore next: safe defaults */
+{
+  host,
+  include,
+  exclude,
+  cleanUrls,
+  rewrites = [],
+  overrides = [],
+  server
+} = {}) {
+  var _server$host, _server$rewrites;
+
+  // prioritize server properties
+  host = (_server$host = server === null || server === void 0 ? void 0 : server.host) !== null && _server$host !== void 0 ? _server$host : host;
+  rewrites = (_server$rewrites = server === null || server === void 0 ? void 0 : server.rewrites) !== null && _server$rewrites !== void 0 ? _server$rewrites : mapRewrites(rewrites, []); // reduce rewrites into a single function
+
+  let applyRewrites = [{
+    test: url => !/^(https?:\/)?\//.test(url) && url,
+    rewrite: url => _path.default.posix.normalize(_path.default.posix.join('/', url))
+  }, ...rewrites.map(({
+    source,
+    destination
+  }) => ({
+    test: pathToRegexp.match(destination),
+    rewrite: pathToRegexp.compile(source)
+  })), {
+    test: url => cleanUrls && url,
+    rewrite: url => url.replace(/(\/index)?\.html$/, '')
+  }].reduceRight((apply, {
+    test,
+    rewrite
+  }) => snap => {
+    var _snap$url, _res$params;
+
+    let res = test((_snap$url = snap.url) !== null && _snap$url !== void 0 ? _snap$url : snap);
+    if (res) snap = rewrite((_res$params = res.params) !== null && _res$params !== void 0 ? _res$params : res);
+    return apply(snap);
+  }, s => s); // reduce overrides into a single function
+
+  let applyOverrides = overrides.reduceRight((apply, {
+    include,
+    exclude,
+    ...opts
+  }) => snap => {
+    if ((0, _utils.snapshotMatches)(snap, include, exclude)) Object.assign(snap, opts);
+    return apply(snap);
+  }, s => s); // sort and reduce snapshots with overrides
+
+  return [...snapshots].sort().reduce((snapshots, snap) => {
+    snap = (0, _utils.withDefaults)(applyRewrites(snap), {
+      host
+    });
+    return (0, _utils.snapshotMatches)(snap, include, exclude) ? snapshots.concat(applyOverrides(snap)) : snapshots;
+  }, []);
+} // Serves a static directory and returns a list of snapshots.
+
+
+async function loadStaticSnapshots(dir, config) {
+  let {
+    default: globby
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require('globby'))); // gather paths with globby, which only accepts string patterns
+
+  let isStr = s => typeof s === 'string';
+
+  let strOr = (a, b) => a.length && a.every(isStr) ? a : b;
+
+  let files = strOr([].concat(config.include || []), '**/*.html');
+  let ignore = strOr([].concat(config.exclude || []), []);
+  let paths = await globby(files, {
+    cwd: dir,
+    ignore
+  }); // map snapshots from paths and config
+
+  return mapStaticSnapshots(paths, config);
+}

package/dist/utils.js

@@ -3,21 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapStaticSnapshots = mapStaticSnapshots;
-exports.serve = serve;
 exports.snapshotMatches = snapshotMatches;
+exports.validURL = validURL;
 exports.withDefaults = withDefaults;
 
-var _path = _interopRequireDefault(require("path"));
-
-var pathToRegexp = _interopRequireWildcard(require("path-to-regexp"));
-
 var _picomatch = _interopRequireDefault(require("picomatch"));
 
-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; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // used to deserialize regular expression strings
@@ -48,59 +39,6 @@ function withDefaults(options, {
 
   options.url = url.href;
   return options;
-}
-
-function mapRewrites(map, arr) {
-  return Object.entries(map).reduce((r, [source, destination]) => {
-    return (r || []).concat({
-      source,
-      destination
-    });
-  }, arr);
-} // Serves a static directory with the provided options and returns an object containing adjusted
-// rewrites (combined with any baseUrl), the server host, a close method, and the server
-// instance. The `dryRun` option will prevent the server from actually starting.
-
-
-async function serve(dir, {
-  dryRun,
-  baseUrl,
-  cleanUrls,
-  rewrites = {}
-}) {
-  let host = 'http://localhost'; // map rewrite options with any base-url
-
-  rewrites = mapRewrites(rewrites, baseUrl && [{
-    source: _path.default.posix.join(baseUrl, '/:path*'),
-    destination: '/:path*'
-  }]); // start the server
-
-  let server = !dryRun && (await new Promise(resolve => {
-    let server = require('http').createServer((req, res) => {
-      require('serve-handler')(req, res, {
-        public: dir,
-        cleanUrls,
-        rewrites
-      });
-    }).listen(() => resolve(server));
-  })); // easy clean up
-
-  let close = () => {
-    if (server) {
-      return new Promise(resolve => {
-        server.close(resolve);
-      });
-    }
-  }; // add the port to the host and return
-
-
-  if (server) host += `:${server.address().port}`;
-  return {
-    host,
-    rewrites,
-    server,
-    close
-  };
 } // Returns true or false if a snapshot matches the provided include and exclude predicates. A
 // predicate can be an array of predicates, a regular expression, a glob pattern, or a function.
 
@@ -119,7 +57,7 @@ function snapshotMatches(snapshot, include, exclude) {
         try {
           let [, parsed = predicate, flags] = RE_REGEXP.exec(predicate) || [];
           result = new RegExp(parsed, flags).test(snapshot.name);
-        } catch (e) {}
+        } catch {}
       }
 
       return result;
@@ -140,64 +78,4 @@ function snapshotMatches(snapshot, include, exclude) {
 
 
   return !test(exclude, false) && test(include, true);
-} // Maps an array of snapshots or paths to options ready to pass along to the core snapshot
-// method. Paths are normalized before overrides are conditionally applied via their own include and
-// exclude options. Snapshot URLs are then rewritten accordingly before default options are applied,
-// including prepending the appropriate host. The returned set of snapshot options are sorted and
-// filtered by the top-level include and exclude options.
-
-
-function mapStaticSnapshots(snapshots, {
-  host,
-  include,
-  exclude,
-  cleanUrls,
-  rewrites = [],
-  overrides = [],
-  server
-} = {}) {
-  var _server$host, _server$rewrites;
-
-  // prioritize server properties
-  host = (_server$host = server === null || server === void 0 ? void 0 : server.host) !== null && _server$host !== void 0 ? _server$host : host;
-  rewrites = (_server$rewrites = server === null || server === void 0 ? void 0 : server.rewrites) !== null && _server$rewrites !== void 0 ? _server$rewrites : mapRewrites(rewrites, []); // reduce rewrites into a single function
-
-  let applyRewrites = [{
-    test: url => !/^(https?:\/)?\//.test(url) && url,
-    rewrite: url => _path.default.posix.normalize(_path.default.posix.join('/', url))
-  }, ...rewrites.map(({
-    source,
-    destination
-  }) => ({
-    test: pathToRegexp.match(destination),
-    rewrite: pathToRegexp.compile(source)
-  })), {
-    test: url => cleanUrls && url,
-    rewrite: url => url.replace(/(\/index)?\.html$/, '')
-  }].reduceRight((apply, {
-    test,
-    rewrite
-  }) => snap => {
-    var _snap$url, _res$params;
-
-    let res = test((_snap$url = snap.url) !== null && _snap$url !== void 0 ? _snap$url : snap);
-    if (res) snap = rewrite((_res$params = res.params) !== null && _res$params !== void 0 ? _res$params : res);
-    return apply(snap);
-  }, s => s); // reduce overrides into a single function
-
-  let applyOverrides = overrides.reduceRight((apply, {
-    include,
-    exclude,
-    ...opts
-  }) => snap => {
-    if (snapshotMatches(snap, include, exclude)) Object.assign(snap, opts);
-    return apply(snap);
-  }, s => s); // sort and reduce snapshots with overrides
-
-  return [...snapshots].sort().reduce((snapshots, snap) => {
-    snap = withDefaults(applyRewrites(snap), {
-      host
-    });
-    return snapshotMatches(snap, include, exclude) ? snapshots.concat(applyOverrides(snap)) : snapshots;
-  }, []);
 }

package/package.json

@@ -1,11 +1,18 @@
 {
   "name": "@percy/cli-snapshot",
-  "version": "1.0.0-beta.71",
+  "version": "1.0.0-beta.72",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/percy/cli",
+    "directory": "packages/cli-snapshot"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "dist/index.js",
   "files": [
-    "dist",
-    "oclif.manifest.json"
+    "dist"
   ],
   "engines": {
     "node": ">=12"
@@ -13,37 +20,24 @@
   "scripts": {
     "build": "node ../../scripts/build",
     "lint": "eslint --ignore-path ../../.gitignore .",
-    "postbuild": "oclif-dev manifest",
-    "readme": "oclif-dev readme",
+    "readme": "percy-cli-readme",
     "test": "node ../../scripts/test",
     "test:coverage": "yarn test --coverage"
   },
-  "publishConfig": {
-    "access": "public"
-  },
-  "oclif": {
-    "bin": "percy",
-    "commands": "./dist/commands",
-    "hooks": {
-      "init": "./dist/hooks/init"
-    }
+  "@percy/cli": {
+    "commands": [
+      "./dist/snapshot.js"
+    ]
   },
   "dependencies": {
-    "@percy/cli-command": "1.0.0-beta.71",
-    "@percy/config": "1.0.0-beta.71",
-    "@percy/core": "1.0.0-beta.71",
-    "@percy/dom": "1.0.0-beta.71",
-    "@percy/logger": "1.0.0-beta.71",
+    "@percy/cli-command": "1.0.0-beta.72",
+    "@percy/config": "1.0.0-beta.72",
+    "@percy/core": "1.0.0-beta.72",
     "globby": "^11.0.4",
     "path-to-regexp": "^6.2.0",
     "picomatch": "^2.3.0",
     "serve-handler": "^6.1.3",
     "yaml": "^1.10.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/percy/cli",
-    "directory": "packages/cli-snapshot"
-  },
-  "gitHead": "364d1df717fb19a26ccb024458df6e78a9c11f99"
+  "gitHead": "6219287e18a0cacb609d0c2696a5785abc9009b9"
 }

package/dist/commands/snapshot.js

@@ -1,249 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Snapshot = void 0;
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _config = _interopRequireDefault(require("@percy/config"));
-
-var _cliCommand = _interopRequireWildcard(require("@percy/cli-command"));
-
-var _request = _interopRequireDefault(require("@percy/client/dist/request"));
-
-var _core = _interopRequireDefault(require("@percy/core"));
-
-var _logger = _interopRequireDefault(require("@percy/logger"));
-
-var _globby = _interopRequireDefault(require("globby"));
-
-var _yaml = _interopRequireDefault(require("yaml"));
-
-var _package = _interopRequireDefault(require("../../package.json"));
-
-var _utils = require("../utils");
-
-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; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class Snapshot extends _cliCommand.default {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "log", (0, _logger.default)('cli:snapshot'));
-  }
-
-  async run() {
-    // skip snapshots
-    if (!this.isPercyEnabled()) {
-      return this.log.info('Percy is disabled. Skipping snapshots');
-    }
-
-    let {
-      'dir|file|sitemap': arg
-    } = this.args;
-    let isSitemap = /^https?:\/\//.test(arg); // validate directory or file existence
-
-    if (!isSitemap && !_fs.default.existsSync(arg)) this.error(`Not found: ${arg}`);
-
-    let isStatic = !isSitemap && _fs.default.lstatSync(arg).isDirectory(); // initialize percy
-
-
-    this.percy = new _core.default({ ...this.percyrc({
-        [isSitemap ? 'sitemap' : 'static']: isSitemap || isStatic ? {
-          include: this.flags.include,
-          exclude: this.flags.exclude
-        } : undefined
-      }),
-      clientInfo: `${_package.default.name}/${_package.default.version}`,
-      environmentInfo: `node/${process.version}`,
-      server: false
-    }); // gather snapshots
-
-    let snapshots = isSitemap && (await this.loadSitemapSnapshots(arg)) || isStatic && (await this.loadStaticSnapshots(arg)) || (await this.loadSnapshotsFile(arg));
-
-    if (!snapshots.length) {
-      this.error('No snapshots found');
-    } // start processing snapshots
-
-
-    await this.percy.start();
-    this.percy.snapshot(snapshots);
-  } // Called on error, interupt, or after running
-
-
-  async finally(error) {
-    var _this$percy, _this$server;
-
-    await ((_this$percy = this.percy) === null || _this$percy === void 0 ? void 0 : _this$percy.stop(!!error));
-    await ((_this$server = this.server) === null || _this$server === void 0 ? void 0 : _this$server.close());
-  } // Fetches and maps sitemap URLs to snapshots.
-
-
-  async loadSitemapSnapshots(sitemap) {
-    let config = this.percy.config.sitemap; // fetch sitemap URLs
-
-    let urls = await (0, _request.default)(sitemap, (body, res) => {
-      // validate sitemap content-type
-      let [contentType] = res.headers['content-type'].split(';');
-
-      if (!/^(application|text)\/xml$/.test(contentType)) {
-        this.error('The sitemap must be an XML document, ' + `but the content-type was "${contentType}"`);
-      } // parse XML content into a list of URLs
-
-
-      let urls = body.match(/(?<=<loc>)(.*)(?=<\/loc>)/ig); // filter out duplicate URLs that differ by a trailing slash
-
-      return urls.filter((url, i) => {
-        let match = urls.indexOf(url.replace(/\/$/, ''));
-        return match === -1 || match === i;
-      });
-    }); // map with inherited static options
-
-    return (0, _utils.mapStaticSnapshots)(urls, config);
-  } // Serves a static directory and returns a list of snapshots.
-
-
-  async loadStaticSnapshots(dir) {
-    let config = this.percy.config.static;
-    let baseUrl = this.flags['base-url'] || config.baseUrl;
-    let dryRun = this.flags['dry-run']; // validate any provided base-url
-
-    if (baseUrl && !baseUrl.startsWith('/')) {
-      this.error('The base-url must begin with a forward slash (/) ' + 'when snapshotting static directories');
-    } // start the server
-
-
-    this.server = await (0, _utils.serve)(dir, { ...config,
-      baseUrl,
-      dryRun
-    }); // gather paths
-
-    let isStr = s => typeof s === 'string';
-
-    let strOr = (a, b) => a.length && a.every(isStr) ? a : b;
-
-    let files = strOr([].concat(config.include || []), '**/*.html');
-    let ignore = strOr([].concat(config.exclude || []), []);
-    let paths = await (0, _globby.default)(files, {
-      cwd: dir,
-      ignore
-    }); // map snapshots from paths and config
-
-    return (0, _utils.mapStaticSnapshots)(paths, { ...config,
-      server: this.server
-    });
-  } // Loads snapshots from a js, json, or yaml file.
-
-
-  async loadSnapshotsFile(file) {
-    let ext = _path.default.extname(file);
-
-    let config = {}; // load snapshots file
-
-    if (ext === '.js') {
-      config = require(_path.default.resolve(file));
-      if (typeof config === 'function') config = await config();
-    } else if (ext === '.json') {
-      config = JSON.parse(_fs.default.readFileSync(file, {
-        encoding: 'utf-8'
-      }));
-    } else if (ext.match(/\.ya?ml$/)) {
-      config = _yaml.default.parse(_fs.default.readFileSync(file, {
-        encoding: 'utf-8'
-      }));
-    } else {
-      this.error(`Unsupported filetype: ${file}`);
-    }
-
-    let {
-      // flags override config options
-      'base-url': baseUrl = config.baseUrl,
-      include = config.include,
-      exclude = config.exclude
-    } = this.flags; // validate base-url before config options
-
-    if (baseUrl && !baseUrl.startsWith('http')) {
-      this.error('The base-url must include a protocol and hostname ' + 'when providing a list of snapshots');
-    } // validate snapshot config options
-
-
-    let errors = _config.default.validate(config, '/snapshot/list');
-
-    if (errors) {
-      this.log.warn('Invalid snapshot options:');
-
-      for (let e of errors) this.log.warn(`- ${e.path}: ${e.message}`);
-    } // support config that only contains a list of snapshots
-
-
-    return (Array.isArray(config) ? config : config.snapshots || []).reduce((snapshots, snap) => {
-      // reduce matching snapshots with default options
-      snap = (0, _utils.withDefaults)(snap, {
-        host: baseUrl
-      });
-      return (0, _utils.snapshotMatches)(snap, include, exclude) ? snapshots.concat(snap) : snapshots;
-    }, []);
-  }
-
-}
-
-exports.Snapshot = Snapshot;
-
-_defineProperty(Snapshot, "description", 'Take snapshots from a static directory, snapshots file, or sitemap url');
-
-_defineProperty(Snapshot, "args", [{
-  name: 'dir|file|sitemap',
-  description: 'static directory, snapshots file, or sitemap url',
-  required: true
-}]);
-
-_defineProperty(Snapshot, "flags", { ..._cliCommand.flags.logging,
-  ..._cliCommand.flags.discovery,
-  ..._cliCommand.flags.config,
-  'base-url': _cliCommand.flags.string({
-    description: 'the base url pages are hosted at when snapshotting',
-    char: 'b'
-  }),
-  include: _cliCommand.flags.string({
-    description: 'one or more globs/patterns matching snapshots to include',
-    multiple: true
-  }),
-  exclude: _cliCommand.flags.string({
-    description: 'one or more globs/patterns matching snapshots to exclude',
-    multiple: true
-  }),
-  // static only flags
-  'clean-urls': _cliCommand.flags.boolean({
-    description: 'rewrite static index and filepath URLs to be clean',
-    percyrc: 'static.cleanUrls'
-  }),
-  // deprecated flags
-  files: _cliCommand.flags.string({
-    deprecated: {
-      map: 'include',
-      until: '1.0.0'
-    },
-    percyrc: 'static.include',
-    hidden: true
-  }),
-  ignore: _cliCommand.flags.string({
-    deprecated: {
-      map: 'exclude',
-      until: '1.0.0'
-    },
-    percyrc: 'static.exclude',
-    hidden: true
-  })
-});
-
-_defineProperty(Snapshot, "examples", ['$ percy snapshot ./public', '$ percy snapshot snapshots.yml']);

package/dist/hooks/init.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _config = _interopRequireDefault(require("@percy/config"));
-
-var CoreConfig = _interopRequireWildcard(require("@percy/core/dist/config"));
-
-var SnapshotConfig = _interopRequireWildcard(require("../config"));
-
-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; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _default() {
-  _config.default.addSchema(CoreConfig.schemas);
-
-  _config.default.addSchema(SnapshotConfig.schemas);
-
-  _config.default.addMigration(SnapshotConfig.migration);
-}

package/oclif.manifest.json

@@ -1 +0,0 @@
-{"version":"1.0.0-beta.71","commands":{"snapshot":{"id":"snapshot","description":"Take snapshots from a static directory, snapshots file, or sitemap url","pluginName":"@percy/cli-snapshot","pluginType":"core","aliases":[],"examples":["$ percy snapshot ./public","$ percy snapshot snapshots.yml"],"flags":{"verbose":{"name":"verbose","type":"boolean","char":"v","description":"log everything","allowNo":false},"quiet":{"name":"quiet","type":"boolean","char":"q","description":"log errors only","allowNo":false},"silent":{"name":"silent","type":"boolean","description":"log nothing","allowNo":false},"allowed-hostname":{"name":"allowed-hostname","type":"option","char":"h","description":"allowed hostnames to capture in asset discovery"},"network-idle-timeout":{"name":"network-idle-timeout","type":"option","char":"t","description":"asset discovery network idle timeout"},"disable-cache":{"name":"disable-cache","type":"boolean","description":"disable asset discovery caches","allowNo":false},"dry-run":{"name":"dry-run","type":"boolean","char":"d","description":"print logs only, do not run asset discovery or upload snapshots","allowNo":false},"debug":{"name":"debug","type":"boolean","description":"debug asset discovery and do not upload snapshots","allowNo":false},"config":{"name":"config","type":"option","char":"c","description":"configuration file path"},"base-url":{"name":"base-url","type":"option","char":"b","description":"the base url pages are hosted at when snapshotting"},"include":{"name":"include","type":"option","description":"one or more globs/patterns matching snapshots to include"},"exclude":{"name":"exclude","type":"option","description":"one or more globs/patterns matching snapshots to exclude"},"clean-urls":{"name":"clean-urls","type":"boolean","description":"rewrite static index and filepath URLs to be clean","allowNo":false},"files":{"name":"files","type":"option","hidden":true},"ignore":{"name":"ignore","type":"option","hidden":true}},"args":[{"name":"dir|file|sitemap","description":"static directory, snapshots file, or sitemap url","required":true}]}}}