@atlaspack/reporter-cli 2.15.1-canary.12 → 2.15.1-canary.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/reporter-cli",
-  "version": "2.15.1-canary.12+143753ba0",
+  "version": "2.15.1-canary.120+22e54c6bd",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -26,14 +26,14 @@
     }
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.12+143753ba0",
-    "@atlaspack/types": "2.14.5-canary.12+143753ba0",
-    "@atlaspack/utils": "2.14.5-canary.12+143753ba0",
+    "@atlaspack/plugin": "2.14.5-canary.120+22e54c6bd",
+    "@atlaspack/types": "2.14.5-canary.120+22e54c6bd",
+    "@atlaspack/utils": "2.14.5-canary.120+22e54c6bd",
     "chalk": "^4.1.0",
     "term-size": "^2.2.1"
   },
   "devDependencies": {
-    "@atlaspack/feature-flags": "2.14.1-canary.80+143753ba0",
+    "@atlaspack/feature-flags": "2.14.1-canary.188+22e54c6bd",
     "filesize": "^6.1.0",
     "nullthrows": "^1.1.1",
     "ora": "^5.2.0",
@@ -41,5 +41,5 @@
     "wrap-ansi": "^7.0.0"
   },
   "type": "commonjs",
-  "gitHead": "143753ba049078d59fbf1a8880f4c4caf2320311"
+  "gitHead": "22e54c6bd98f6c1aa1c74dffb7f54b97e0392740"
 }

package/src/CLIReporter.js

@@ -3,12 +3,15 @@ import type {ReporterEvent, PluginOptions} from '@atlaspack/types';
 import type {Diagnostic} from '@atlaspack/diagnostic';
 import type {Color} from 'chalk';
 
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {Reporter} from '@atlaspack/plugin';
 import {
   getProgressMessage,
+  getPackageProgressMessage,
   prettifyTime,
   prettyDiagnostic,
   throttle,
+  debugTools,
 } from '@atlaspack/utils';
 import chalk from 'chalk';
 
@@ -34,6 +37,27 @@ const seenPhasesGen = new Set();
 
 let phaseStartTimes = {};
 let pendingIncrementalBuild = false;
+let packagingProgress = 0;
+
+let updatePackageProgress = (completeBundles: number, totalBundles: number) => {
+  let updateThreshold = 0;
+  if (totalBundles > 5000) {
+    // If more than 5000 bundles, update every 5%
+    updateThreshold = 5;
+  } else if (totalBundles > 1000) {
+    // If more than 1000 bundles, update every 10%
+    updateThreshold = 10;
+  } else {
+    // othewise update every 25%
+    updateThreshold = 25;
+  }
+
+  let percent = Math.floor((completeBundles / totalBundles) * 100);
+  if (percent - packagingProgress >= updateThreshold) {
+    packagingProgress = percent;
+    updateSpinner(getPackageProgressMessage(completeBundles, totalBundles));
+  }
+};
 
 let statusThrottle = throttle((message: string) => {
   updateSpinner(message);
@@ -99,7 +123,10 @@ export async function _report(
           updateSpinner('Building...');
         } else if (event.phase == 'bundling' && !seenPhases.has('bundling')) {
           updateSpinner('Bundling...');
+        } else if (event.phase === 'packagingAndOptimizing') {
+          updatePackageProgress(event.completeBundles, event.totalBundles);
         } else if (
+          !getFeatureFlag('cliProgressReportingImprovements') &&
           (event.phase == 'packaging' || event.phase == 'optimizing') &&
           !seenPhases.has('packaging') &&
           !seenPhases.has('optimizing')
@@ -134,12 +161,18 @@ export async function _report(
       );
 
       if (options.mode === 'production') {
-        await bundleReport(
-          event.bundleGraph,
-          options.outputFS,
-          options.projectRoot,
-          options.detailedReport?.assetsPerBundle,
-        );
+        if (debugTools['simple-cli-reporter']) {
+          writeOut(
+            `🛠️ Built ${event.bundleGraph.getBundles().length} bundles.`,
+          );
+        } else {
+          await bundleReport(
+            event.bundleGraph,
+            options.outputFS,
+            options.projectRoot,
+            options.detailedReport?.assetsPerBundle,
+          );
+        }
       } else {
         pendingIncrementalBuild = true;
       }