Bump storyboard

guigrpa · Feb 7, 2021 · 398d8ac · 398d8ac
1 parent 7378081
commit 398d8ac
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Bump storyboard.
+
 ## 2.0.0 (2020-7-25)
 
 - **Breaking**: Always publishes _all_ (non-private) sub-packages, irrespective of whether they have been updated.

diff --git a/package.json b/package.json
@@ -51,9 +51,9 @@
     "semver": "5.6.0",
     "shelljs": "0.7.8",
     "split": "1.0.1",
-    "storyboard": "3.1.4",
-    "storyboard-listener-console": "3.1.4",
-    "storyboard-listener-console-parallel": "3.1.4",
+    "storyboard": "^3.3.1",
+    "storyboard-listener-console": "^3.3.1",
+    "storyboard-listener-console-parallel": "^3.3.1",
     "timm": "^1.6.2"
   },
   "devDependencies": {

diff --git a/src/__tests__/__snapshots__/all.test.js.snap b/src/__tests__/__snapshots__/all.test.js.snap
@@ -5,39 +5,34 @@ Array [
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-c",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-d",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-priv",
       "storySrc": undefined,
     },
@@ -50,39 +45,34 @@ Array [
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-c",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-d",
       "storySrc": undefined,
     },
   ],
   Array [
     "ls",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-priv",
       "storySrc": undefined,
     },

diff --git a/src/__tests__/__snapshots__/runScript.test.js.snap b/src/__tests__/__snapshots__/runScript.test.js.snap
@@ -5,39 +5,34 @@ Array [
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-c",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-d",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages3/oao-priv",
       "storySrc": undefined,
     },
@@ -50,15 +45,13 @@ Array [
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-c",
       "storySrc": undefined,
     },
@@ -71,23 +64,20 @@ Array [
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start2",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-b",
       "storySrc": undefined,
     },
   ],
   Array [
     "yarn run start",
     Object {
-      "bareLogs": false,
       "cwd": "test/fixtures/packages/oao-c",
       "storySrc": undefined,
     },

diff --git a/src/utils/multiRun.js b/src/utils/multiRun.js
@@ -25,7 +25,6 @@ type Options = {
 type Job = {
   cmd: string,
   cwd: string,
-  bareLogs: boolean,
   storySrc?: ?string,
   status: 'idle' | 'running' | 'done',
   pkg: OaoSpecs,
@@ -73,7 +72,6 @@ const multiRun = async (
         allJobs.push({
           cmd,
           cwd: pkgPath,
-          bareLogs: !!parallelLogs,
           storySrc,
           status: 'idle',
           pkg,
@@ -88,7 +86,6 @@ const multiRun = async (
       allJobs.push({
         cmd: PLACEHOLDER_COMMAND,
         cwd: pkgPath,
-        bareLogs: false,
         status: 'idle',
         pkg,
       });
@@ -175,12 +172,12 @@ const executeJob = (job, { ignoreErrors }) => {
 };
 
 const _executeJob = async (job, { ignoreErrors }) => {
-  const { cmd, cwd, bareLogs, storySrc } = job;
+  const { cmd, cwd, storySrc } = job;
   if (cmd === PLACEHOLDER_COMMAND) {
     job.status = 'done';
     return;
   }
-  const promise = exec(cmd, { cwd, bareLogs, storySrc });
+  const promise = exec(cmd, { cwd, storySrc });
   job.status = 'running';
   try {
     await promise;

diff --git a/src/utils/shell.js b/src/utils/shell.js
@@ -35,7 +35,6 @@ type ExecOptions = {|
   errorLogLevel?: string,
   ignoreErrorCode?: boolean,
   cwd?: string,
-  bareLogs?: boolean,
 |};
 
 type ExecResult = {
@@ -53,7 +52,6 @@ const exec = async (
     logLevel = 'info',
     errorLogLevel = 'error',
     ignoreErrorCode = false,
-    bareLogs = false,
     cwd,
   }: ExecOptions = {}
 ): Promise<ExecResult> => {
@@ -68,7 +66,6 @@ const exec = async (
       story: ownStory,
       storySrc,
       errorLogLevel,
-      bareLogs,
       ignoreErrorCode,
     });
   } finally {
@@ -78,10 +75,9 @@ const exec = async (
 
 const _exec = async (
   cmd,
-  { cwd, story, storySrc, errorLogLevel, bareLogs, ignoreErrorCode }
+  { cwd, story, storySrc, errorLogLevel, ignoreErrorCode }
 ) => {
   try {
-    const prefix = bareLogs ? '' : '| ';
     const src = storySrc || cmd.split(' ')[0].slice(0, 10);
     const child = execa.shell(cmd, {
       cwd: cwd || '.',
@@ -91,10 +87,10 @@ const _exec = async (
         process.platform === 'win32' ? ['ignore', 'pipe', 'pipe'] : undefined,
     });
     child.stdout.pipe(split()).on('data', line => {
-      story.info(src, `${prefix}${line}`);
+      story.info(src, line);
     });
     child.stderr.pipe(split()).on('data', line => {
-      if (line) story[errorLogLevel](src, `${prefix}${line}`);
+      if (line) story[errorLogLevel](src, line);
     });
     const { code, stdout, stderr } = await child;
     if (code !== 0 && !ignoreErrorCode) {

diff --git a/yarn.lock b/yarn.lock
@@ -6009,21 +6009,22 @@ stealthy-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-storyboard-core@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/storyboard-core/-/storyboard-core-3.1.3.tgz#496c6c23021ae40ca2d44832d0276e94b0b51684"
+storyboard-core@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/storyboard-core/-/storyboard-core-3.2.0.tgz#6765e2c71bdc5b8ed1db52faf896df43461bca7c"
+  integrity sha512-v2p3SDYi22go1oLrJPnsiwXgSsjqKL6oryy9B3rz2UEpLwqWArjUoaECciD+/sfwJFJs1etIjUbE4tBx2G+adQ==
   dependencies:
     chalk "1.x"
-    lodash "^4.17.4"
+    lodash "^4.17.10"
     platform "1.3.3"
     semver "^5.3.0"
-    timm "^1.2.3"
+    timm "^1.6.1"
     uuid "^3.0.1"
 
-storyboard-core@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/storyboard-core/-/storyboard-core-3.2.0.tgz#6765e2c71bdc5b8ed1db52faf896df43461bca7c"
-  integrity sha512-v2p3SDYi22go1oLrJPnsiwXgSsjqKL6oryy9B3rz2UEpLwqWArjUoaECciD+/sfwJFJs1etIjUbE4tBx2G+adQ==
+storyboard-core@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/storyboard-core/-/storyboard-core-3.3.1.tgz#e24cc5a82de6bbf400aafcada4828427b8f30a4e"
+  integrity sha512-miF1t9XXIW/RtfZK9EPDmwApoWBGpdO5a5UpLmtZ/UGgobK7n2qJckljRpu3ldXNiqTxdIqj1q+zcF49zrzRgg==
   dependencies:
     chalk "1.x"
     lodash "^4.17.10"
@@ -6032,27 +6033,27 @@ storyboard-core@^3.2.0:
     timm "^1.6.1"
     uuid "^3.0.1"
 
-storyboard-listener-console-parallel@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/storyboard-listener-console-parallel/-/storyboard-listener-console-parallel-3.1.4.tgz#110d4582f4ab924c2ca5c56eb6a3c61fe4d162b3"
-  integrity sha512-VjgpN02DISKSNWNB9eSF3zhWA5nRINQITan/g/CuS45S7YqISKCP3+ztOLLDmfYvrmg6PrjahwLMq0GvQ37ZDA==
+storyboard-listener-console-parallel@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/storyboard-listener-console-parallel/-/storyboard-listener-console-parallel-3.3.1.tgz#4bfc36b21f3fc182658bfd0c597c2eb6b5b9eee2"
+  integrity sha512-ZUIqFb6w40/JSXYjpbccM/ESR815aDVtFUpoJqWVQdu+KBUd9YiVyxZOQ0CRFFq3Lz1smVtOwDiNgZaQcYg/Og==
   dependencies:
     terminal-kit "^0.26.1"
     timm "^1.6.1"
 
-storyboard-listener-console@3.1.4, storyboard-listener-console@^3.1.4:
+storyboard-listener-console@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/storyboard-listener-console/-/storyboard-listener-console-3.1.4.tgz#165c23629721a0327b181d4b926bc2d9787eb661"
   integrity sha512-zP2x0XKXHXGYrz4/RS4kxMp/4JqEvREV3rdkfbb6uqGld9gPKNqAdRDLQPN7cJRycTipTt+qew7RFGDTIVSIVA==
   dependencies:
     timm "^1.6.1"
 
-storyboard@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/storyboard/-/storyboard-3.1.4.tgz#f39a908f168541ffae2af6ed8a06f27e0eed12e2"
-  integrity sha512-YkWhyz6IxvL/+kN9iMtcw3XVppqY/J8wBRDMpKxnkMniD/QKsKnHPMsxloob2B2+ONwASQPbzZkNXeyY2/kXwg==
+storyboard-listener-console@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/storyboard-listener-console/-/storyboard-listener-console-3.3.1.tgz#4ad7508aa364efd005194ad8181552bdfe16dbb1"
+  integrity sha512-YIeIPA2DPZW9brE4kBftmbEHhd3AVxMY6tra0m2hnizsW48FIPhLMb++wHcUjcWE1ZENdQWqeFJuWTsF0no+GA==
   dependencies:
-    storyboard-core "^3.1.1"
+    timm "^1.6.1"
 
 storyboard@^3.2.1:
   version "3.2.1"
@@ -6061,6 +6062,13 @@ storyboard@^3.2.1:
   dependencies:
     storyboard-core "^3.2.0"
 
+storyboard@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/storyboard/-/storyboard-3.3.1.tgz#7336f8dd7b98c3da93dcdacf3c7081494538d2dc"
+  integrity sha512-iINEVl3sXW8VtQ8A3dl/9flOxEkzAogQbbfpFcoh7yIuD+qgtOUpD0WGDSyvdlQRxaOc8gT2JQy4qVpJv9085w==
+  dependencies:
+    storyboard-core "^3.3.1"
+
 string-kit@^0.5.12:
   version "0.5.27"
   resolved "https://registry.yarnpkg.com/string-kit/-/string-kit-0.5.27.tgz#5bd58b7172d7efd7a2981a398967b8dbc78fabe1"
@@ -6299,10 +6307,6 @@ through@2, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-timm@^1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/timm/-/timm-1.2.5.tgz#2892ac9f490a33e2300e5d94797f184cef16748b"
-
 timm@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/timm/-/timm-1.6.1.tgz#5f8aafc932248c76caf2c6af60542a32d3c30701"