@percy/cli-snapshot 1.0.0-beta.68 → 1.0.0-beta.69

package/README.md

@@ -20,7 +20,7 @@ ARGUMENTS
 OPTIONS
   -b, --base-url=base-url                          the base url pages are hosted at when snapshotting
   -c, --config=config                              configuration file path
-  -d, --dry-run                                    prints a list of snapshots without processing them
+  -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

package/dist/commands/snapshot.js

@@ -70,26 +70,14 @@ class Snapshot extends _cliCommand.default {
     }); // gather snapshots
 
     let snapshots = isSitemap && (await this.loadSitemapSnapshots(arg)) || isStatic && (await this.loadStaticSnapshots(arg)) || (await this.loadSnapshotsFile(arg));
-    let l = snapshots.length;
-    if (!l) this.error('No snapshots found'); // start processing snapshots
-
-    let dry = this.flags['dry-run'];
-    if (!dry) await this.percy.start();else this.log.info(`Found ${l} snapshot${l === 1 ? '' : 's'}`);
-
-    for (let snap of snapshots) {
-      if (dry) {
-        this.log.info(`Snapshot found: ${snap.name}`);
-        this.log.debug(`-> url: ${snap.url}`);
-
-        for (let s of snap.additionalSnapshots || []) {
-          let name = s.name || `${s.prefix || ''}${snap.name}${s.suffix || ''}`;
-          this.log.info(`Snapshot found: ${name}`);
-          this.log.debug(`-> url: ${snap.url}`);
-        }
-      } else {
-        this.percy.snapshot(snap);
-      }
-    }
+
+    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
 
 
@@ -128,7 +116,7 @@ class Snapshot extends _cliCommand.default {
   async loadStaticSnapshots(dir) {
     let config = this.percy.config.static;
     let baseUrl = this.flags['base-url'] || config.baseUrl;
-    let dry = this.flags['dry-run']; // validate any provided base-url
+    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');
@@ -137,12 +125,8 @@ class Snapshot extends _cliCommand.default {
 
     this.server = await (0, _utils.serve)(dir, { ...config,
       baseUrl,
-      dry
-    });
-    let {
-      host,
-      rewrites
-    } = this.server; // gather paths and map snapshots
+      dryRun
+    }); // gather paths
 
     let isStr = s => typeof s === 'string';
 
@@ -153,10 +137,10 @@ class Snapshot extends _cliCommand.default {
     let paths = await (0, _globby.default)(files, {
       cwd: dir,
       ignore
-    });
+    }); // map snapshots from paths and config
+
     return (0, _utils.mapStaticSnapshots)(paths, { ...config,
-      host,
-      rewrites
+      server: this.server
     });
   } // Loads snapshots from a js, json, or yaml file.
 
@@ -238,10 +222,6 @@ _defineProperty(Snapshot, "flags", { ..._cliCommand.flags.logging,
     description: 'one or more globs/patterns matching snapshots to exclude',
     multiple: true
   }),
-  'dry-run': _cliCommand.flags.boolean({
-    description: 'prints a list of snapshots without processing them',
-    char: 'd'
-  }),
   // static only flags
   'clean-urls': _cliCommand.flags.boolean({
     description: 'rewrite static index and filepath URLs to be clean',

package/dist/config.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.configSchema = exports.cliSchema = void 0;
 exports.migration = migration;
-exports.schemas = exports.snapshotListSchema = exports.configSchema = exports.cliSchema = void 0;
+exports.snapshotListSchema = exports.schemas = void 0;
 
 var _config = require("@percy/core/dist/config");
 

package/dist/utils.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withDefaults = withDefaults;
+exports.mapStaticSnapshots = mapStaticSnapshots;
 exports.serve = serve;
 exports.snapshotMatches = snapshotMatches;
-exports.mapStaticSnapshots = mapStaticSnapshots;
+exports.withDefaults = withDefaults;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -48,28 +48,34 @@ 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 `dry` option will prevent the server from actually starting.
+// instance. The `dryRun` option will prevent the server from actually starting.
 
 
 async function serve(dir, {
-  dry,
+  dryRun,
   baseUrl,
   cleanUrls,
   rewrites = {}
 }) {
-  let host = 'http://localhost'; // reduce rewrite options with any base-url
+  let host = 'http://localhost'; // map rewrite options with any base-url
 
-  rewrites = Object.entries(rewrites).reduce((rewrites, [source, destination]) => (rewrites || []).concat({
-    source,
-    destination
-  }), baseUrl ? [{
+  rewrites = mapRewrites(rewrites, baseUrl && [{
     source: _path.default.posix.join(baseUrl, '/:path*'),
     destination: '/:path*'
-  }] : undefined); // start the server
+  }]); // start the server
 
-  let server = !dry && (await new Promise(resolve => {
+  let server = !dryRun && (await new Promise(resolve => {
     let server = require('http').createServer((req, res) => {
       require('serve-handler')(req, res, {
         public: dir,
@@ -147,9 +153,15 @@ function mapStaticSnapshots(snapshots, {
   exclude,
   cleanUrls,
   rewrites = [],
-  overrides = []
+  overrides = [],
+  server
 } = {}) {
-  // reduce rewrites into a single function
+  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))

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.0.0-beta.68","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},"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"},"dry-run":{"name":"dry-run","type":"boolean","char":"d","description":"prints a list of snapshots without processing them","allowNo":false},"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}]}}}
+{"version":"1.0.0-beta.69","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}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/cli-snapshot",
-  "version": "1.0.0-beta.68",
+  "version": "1.0.0-beta.69",
   "license": "MIT",
   "main": "dist/index.js",
   "files": [
@@ -29,11 +29,11 @@
     }
   },
   "dependencies": {
-    "@percy/cli-command": "1.0.0-beta.68",
-    "@percy/config": "1.0.0-beta.68",
-    "@percy/core": "1.0.0-beta.68",
-    "@percy/dom": "1.0.0-beta.68",
-    "@percy/logger": "1.0.0-beta.68",
+    "@percy/cli-command": "1.0.0-beta.69",
+    "@percy/config": "1.0.0-beta.69",
+    "@percy/core": "1.0.0-beta.69",
+    "@percy/dom": "1.0.0-beta.69",
+    "@percy/logger": "1.0.0-beta.69",
     "globby": "^11.0.4",
     "path-to-regexp": "^6.2.0",
     "picomatch": "^2.3.0",
@@ -45,5 +45,5 @@
     "url": "https://github.com/percy/cli",
     "directory": "packages/cli-snapshot"
   },
-  "gitHead": "32ffd12d1db407b7c2b4ca8364f99f90b2cfa862"
+  "gitHead": "99b0617016a07c9d7d4ca37c1442011c904cf860"
 }