feat(cli): add ora spinners

.pnp.js

@@ -3833,6 +3833,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["jest", "npm:26.6.3"],
             ["js-yaml", "npm:3.14.0"],
             ["opener", "npm:1.5.2"],
+            ["ora", "npm:5.1.0"],
             ["react", "npm:17.0.1"],
             ["react-dom", "virtual:22157ea722f8d6428f1fcf0a6f7f6c7d6b902d9c785256c60a65fe6cd0db76ebccc7c1457ee047df0ba6909ff018e300c4f4957a60f5b670089810dfc417af9b#npm:17.0.1"],
             ["reload", "npm:3.1.1"],
@@ -9012,6 +9013,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["cli-spinners", [
+        ["npm:2.5.0", {
+          "packageLocation": "./.yarn/cache/cli-spinners-npm-2.5.0-31add52b01-a275c35881.zip/node_modules/cli-spinners/",
+          "packageDependencies": [
+            ["cli-spinners", "npm:2.5.0"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["cli-width", [
         ["npm:2.2.1", {
           "packageLocation": "./.yarn/cache/cli-width-npm-2.2.1-4bdb77393c-f7c830bddc.zip/node_modules/cli-width/",
@@ -14835,6 +14845,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["is-interactive", [
+        ["npm:1.0.0", {
+          "packageLocation": "./.yarn/cache/is-interactive-npm-1.0.0-7ff7c6e04a-d79b435e51.zip/node_modules/is-interactive/",
+          "packageDependencies": [
+            ["is-interactive", "npm:1.0.0"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["is-natural-number", [
         ["npm:4.0.1", {
           "packageLocation": "./.yarn/cache/is-natural-number-npm-4.0.1-b5fd86a31d-8b0f8a5f5c.zip/node_modules/is-natural-number/",
@@ -16522,6 +16541,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["log-symbols", [
+        ["npm:4.0.0", {
+          "packageLocation": "./.yarn/cache/log-symbols-npm-4.0.0-7291c4d053-2cbdb0427d.zip/node_modules/log-symbols/",
+          "packageDependencies": [
+            ["log-symbols", "npm:4.0.0"],
+            ["chalk", "npm:4.1.0"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["loglevel", [
         ["npm:1.7.1", {
           "packageLocation": "./.yarn/cache/loglevel-npm-1.7.1-46e39bd115-abee97e346.zip/node_modules/loglevel/",
@@ -18451,6 +18480,23 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["ora", [
+        ["npm:5.1.0", {
+          "packageLocation": "./.yarn/cache/ora-npm-5.1.0-0f7ce18b2d-53aad8d299.zip/node_modules/ora/",
+          "packageDependencies": [
+            ["ora", "npm:5.1.0"],
+            ["chalk", "npm:4.1.0"],
+            ["cli-cursor", "npm:3.1.0"],
+            ["cli-spinners", "npm:2.5.0"],
+            ["is-interactive", "npm:1.0.0"],
+            ["log-symbols", "npm:4.0.0"],
+            ["mute-stream", "npm:0.0.8"],
+            ["strip-ansi", "npm:6.0.0"],
+            ["wcwidth", "npm:1.0.1"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["original", [
         ["npm:1.0.2", {
           "packageLocation": "./.yarn/cache/original-npm-1.0.2-2250635ba0-6918b9d454.zip/node_modules/original/",

packages/cli/package.json

@@ -59,6 +59,7 @@
     "inquirer": "7.3.3",
     "js-yaml": "3.14.0",
     "opener": "1.5.2",
+    "ora": "5.1.0",
     "reload": "3.1.1"
   },
   "devDependencies": {

packages/cli/src/commands/buildNetlify/buildNetlify.js

@@ -24,8 +24,7 @@ import fetchNpmTarball from '../../utils/fetchNpmTarball';
 
 async function buildNetlify(options) {
   if (process.env.NETLIFY === 'true') {
-    options.printTimestamp = false;
-    options.printColor = false;
+    options.basicPrint = true;
   }
 
   const context = await createContext(options);

packages/cli/src/utils/context.js

@@ -23,8 +23,7 @@ async function createContext(options = {}) {
   const context = {};
 
   context.print = createPrint({
-    timestamp: options.printTimestamp != null ? options.printTimestamp : true,
-    color: options.printColor != null ? options.color : true,
+    basic: options.basicPrint,
   });
 
   context.baseDirectory = path.resolve(options.baseDirectory || process.cwd());

packages/cli/src/utils/print.js

@@ -14,30 +14,48 @@
   limitations under the License.
 */
 
+import ora from 'ora';
 import chalk from 'chalk';
 
-const printToTerminal = (color, options = {}) => (text) => {
-  let message = text;
-  if (options.color) {
-    message = color(message);
-  }
-  if (options.timestamp) {
-    const time = new Date(Date.now());
-    const h = time.getHours();
-    const m = time.getMinutes();
-    const s = time.getSeconds();
-    const timeString = `${h > 9 ? '' : '0'}${h}:${m > 9 ? '' : '0'}${m}:${s > 9 ? '' : '0'}${s}`;
-    message = `${chalk.dim(timeString)} - ${message}`;
-  }
-  // eslint-disable-next-line no-console
-  console.log(message);
-};
+function getTime() {
+  const time = new Date(Date.now());
+  const h = time.getHours();
+  const m = time.getMinutes();
+  const s = time.getSeconds();
+  return `${h > 9 ? '' : '0'}${h}:${m > 9 ? '' : '0'}${m}:${s > 9 ? '' : '0'}${s}`;
+}
 
-const createPrint = (options) => ({
-  info: printToTerminal(chalk.blue, options),
-  log: printToTerminal(chalk.green, options),
-  warn: printToTerminal(chalk.yellow, options),
-  error: printToTerminal(chalk.red, options),
-});
+function createOraPrint() {
+  const spinner = ora({
+    spinner: 'random',
+    prefixText: () => chalk.dim(getTime()),
+    color: 'blue',
+  });
+  return {
+    error: (text) => spinner.fail(chalk.red(text)),
+    info: (text) => spinner.info(text),
+    log: (text) => spinner.start(text).stopAndPersist({ symbol: '∙' }),
+    spin: (text) => spinner.start(text),
+    succeed: (text) => spinner.succeed(chalk.green(text)),
+    warn: (text) => spinner.warn(chalk.yellow(text)),
+  };
+}
+
+function createBasicPrint() {
+  const { info, warn, error, log } = console;
+  return {
+    error,
+    info,
+    log,
+    spin: log,
+    succeed: log,
+    warn,
+  };
+}
+
+function createPrint({ basic } = {}) {
+  if (basic) return createBasicPrint();
+  return createOraPrint();
+}
 
 export default createPrint;

yarn.lock

@@ -2995,6 +2995,7 @@ __metadata:
     jest: 26.6.3
     js-yaml: 3.14.0
     opener: 1.5.2
+    ora: 5.1.0
     react: 17.0.1
     react-dom: 17.0.1
     reload: 3.1.1
@@ -6860,6 +6861,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-spinners@npm:^2.4.0":
+  version: 2.5.0
+  resolution: "cli-spinners@npm:2.5.0"
+  checksum: a275c3588179de0a07579742e1fedb508caa6840516761dac1f8544886d4aa025fc2d536323ac9c325624349203010e149ca8b0028be239fc45ed3a1c1252677
+  languageName: node
+  linkType: hard
+
 "cli-width@npm:^2.0.0":
   version: 2.2.1
   resolution: "cli-width@npm:2.2.1"
@@ -11567,6 +11575,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-interactive@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-interactive@npm:1.0.0"
+  checksum: d79b435e5134ccd60dfe035117b1cddd5c5100e90b2d33428adfe1667e26f0114cc1bc7b3ff84a1b107de8ef27f155e3ecc3bb08c0e502a15c66300b4a45d9e5
+  languageName: node
+  linkType: hard
+
 "is-natural-number@npm:^4.0.1":
   version: 4.0.1
   resolution: "is-natural-number@npm:4.0.1"
@@ -13081,6 +13096,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"log-symbols@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "log-symbols@npm:4.0.0"
+  dependencies:
+    chalk: ^4.0.0
+  checksum: 2cbdb0427d1853f2bd36645bff42aaca200902284f28aadacb3c0fa4c8c43fe6bfb71b5d61ab08b67063d066d7c55b8bf5fbb43b03e4a150dbcdd643e9cd1dbf
+  languageName: node
+  linkType: hard
+
 "loglevel@npm:^1.6.7, loglevel@npm:^1.6.8":
   version: 1.7.1
   resolution: "loglevel@npm:1.7.1"
@@ -14856,6 +14880,22 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"ora@npm:5.1.0":
+  version: 5.1.0
+  resolution: "ora@npm:5.1.0"
+  dependencies:
+    chalk: ^4.1.0
+    cli-cursor: ^3.1.0
+    cli-spinners: ^2.4.0
+    is-interactive: ^1.0.0
+    log-symbols: ^4.0.0
+    mute-stream: 0.0.8
+    strip-ansi: ^6.0.0
+    wcwidth: ^1.0.1
+  checksum: 53aad8d2996056eebb8f68ae874d101d079c05a8251ab281734b37c0252955c82f758d649b5757e54f867bbc98549545dd88b061033487af0b598d4da92d1a82
+  languageName: node
+  linkType: hard
+
 "original@npm:^1.0.0":
   version: 1.0.2
   resolution: "original@npm:1.0.2"
@@ -19946,7 +19986,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"wcwidth@npm:^1.0.0":
+"wcwidth@npm:^1.0.0, wcwidth@npm:^1.0.1":
   version: 1.0.1
   resolution: "wcwidth@npm:1.0.1"
   dependencies: