@financial-times/dotcom-build-sass 9.3.0 → 9.3.2

package/dist/node/monitored-sass-loader.js

@@ -44,6 +44,7 @@ class SassStats {
         _file.set(this, path_1.default.join(__classPrivateFieldGet(this, _directory), 'sass-stats.json'));
         _startTime.set(this, void 0);
         _endTime.set(this, void 0);
+        this.buildCount = 0;
         this.start = () => {
             __classPrivateFieldGet(this, _read).call(this);
             __classPrivateFieldSet(this, _startTime, performance.now());
@@ -148,12 +149,12 @@ class SassStats {
                     ? `${minutes.toFixed(0)} minutes`
                     : `${seconds.toFixed(0)} seconds`;
             const emoji = hours > 2 ? ['🔥', '😭', '😱'] : hours >= 1 ? ['🔥', '😱'] : minutes > 10 ? ['⏱️', '😬'] : ['⏱️'];
-            let cta = `Share your pain in Slack #sass-to-css, and help fix that! 🎉\n` +
+            let cta = `Share your high score in Slack #sass-to-css 🎉 And help us improve that:\n` +
                 `https://origami.ft.com/blog/2024/01/24/sass-build-times/\n\n`;
             if (!__classPrivateFieldGet(this, _monitorRemotely)) {
                 cta =
                     `Help us improve build times by setting the "FT_SASS_STATS_MONITOR" environment variable.\n` +
-                        `https://github.com/Financial-Times/biz-ops-metrics-api/blob/main/docs/API_DEFINITION.md#sass-build-monitoring \n\n`;
+                        `https://origami.ft.com/blog/2024/01/24/sass-build-times/ \n\n`;
             }
             // eslint-disable-next-line no-console
             console.log(`\n\ndotcom-build-sass:\nYou have spent at least ${emoji.join(' ')} ${time} ${emoji
@@ -161,7 +162,7 @@ class SassStats {
                 .join(' ')} waiting on FT Sass to compile.\n${cta}`);
             __classPrivateFieldGet(this, _write).call(this, { noticeDate: Date.now(), totalTimeAtLastNotice: __classPrivateFieldGet(this, _stats).totalTime });
         });
-        fs_1.default.mkdirSync(path_1.default.dirname(__classPrivateFieldGet(this, _directory)), { recursive: true });
+        fs_1.default.mkdirSync(__classPrivateFieldGet(this, _directory), { recursive: true });
     }
 }
 _monitorRemotely = new WeakMap(), _noticeStrategies = new WeakMap(), _noticeStrategy = new WeakMap(), _noticeThrottleSeconds = new WeakMap(), _noticeThrottlePercentage = new WeakMap(), _stats = new WeakMap(), _directory = new WeakMap(), _file = new WeakMap(), _startTime = new WeakMap(), _endTime = new WeakMap(), _read = new WeakMap(), _write = new WeakMap(), _report = new WeakMap();
@@ -182,9 +183,12 @@ const forgivingProxy = (target, task) => {
 };
 const stats = new SassStats();
 const monitoredSassLoaderProxy = forgivingProxy(sass_loader_1.default, (target, sassLoaderThis, argumentsList) => {
+    stats.buildCount++;
     // Start the timer, sass-loader has been called with Sass content.
     // https://github.com/webpack-contrib/sass-loader/blob/03773152760434a2dd845008c504a09c0eb3fd91/src/index.js#L19
-    stats.start();
+    if (stats.buildCount === 1) {
+        stats.start();
+    }
     // Assign our proxy to sass-loaders async function.
     // https://github.com/webpack-contrib/sass-loader/blob/03773152760434a2dd845008c504a09c0eb3fd91/src/index.js#L29
     const sassLoaderAsyncProxy = forgivingProxy(sassLoaderThis.async, (target, thisArg, argumentsList) => {
@@ -195,9 +199,12 @@ const monitoredSassLoaderProxy = forgivingProxy(sass_loader_1.default, (target,
         return forgivingProxy(sassLoaderCallback, (target, thisArg, argumentsList) => {
             // sass-loader's callback has been... called.
             // Either we have sass, or the build failed.
-            stats.end();
-            stats.reportAccordingToNoticeStrategy();
-            stats.sendMetric();
+            stats.buildCount--;
+            if (stats.buildCount === 0) {
+                stats.end();
+                stats.reportAccordingToNoticeStrategy();
+                stats.sendMetric();
+            }
             return Reflect.apply(target, thisArg, argumentsList);
         });
     });

package/dist/tsconfig.tsbuildinfo

@@ -457,7 +457,7 @@
         "affectsGlobalScope": false
       },
       "../src/monitored-sass-loader.ts": {
-        "version": "284b63b2fe068813dab4f81fa6016322237f4fe86ec49632102784ebd8bb291e",
+        "version": "7792194c38b38dc79682dd8bdc9ad91ddce6a578bad9a06065292208ddd75d48",
         "signature": "d6c7e7fe7e8f3b80e77d715b5d0d632a6bdb41bfa6c96d464997d2f698366e9b",
         "affectsGlobalScope": false
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/dotcom-build-sass",
-  "version": "9.3.0",
+  "version": "9.3.2",
   "description": "",
   "main": "dist/node/index.js",
   "types": "dist/node/index.d.ts",

package/src/monitored-sass-loader.ts

@@ -30,9 +30,10 @@ class SassStats {
   #file = path.join(this.#directory, 'sass-stats.json')
   #startTime
   #endTime
+  buildCount: number = 0
 
   constructor() {
-    fs.mkdirSync(path.dirname(this.#directory), { recursive: true })
+    fs.mkdirSync(this.#directory, { recursive: true })
   }
 
   start = () => {
@@ -165,13 +166,13 @@ class SassStats {
       hours > 2 ? ['🔥', '😭', '😱'] : hours >= 1 ? ['🔥', '😱'] : minutes > 10 ? ['⏱️', '😬'] : ['⏱️']
 
     let cta =
-      `Share your pain in Slack #sass-to-css, and help fix that! 🎉\n` +
+      `Share your high score in Slack #sass-to-css 🎉 And help us improve that:\n` +
       `https://origami.ft.com/blog/2024/01/24/sass-build-times/\n\n`
 
     if (!this.#monitorRemotely) {
       cta =
         `Help us improve build times by setting the "FT_SASS_STATS_MONITOR" environment variable.\n` +
-        `https://github.com/Financial-Times/biz-ops-metrics-api/blob/main/docs/API_DEFINITION.md#sass-build-monitoring \n\n`
+        `https://origami.ft.com/blog/2024/01/24/sass-build-times/ \n\n`
     }
 
     // eslint-disable-next-line no-console
@@ -202,9 +203,13 @@ const forgivingProxy = (target, task) => {
 
 const stats = new SassStats()
 const monitoredSassLoaderProxy = forgivingProxy(sassLoader, (target, sassLoaderThis, argumentsList) => {
+  stats.buildCount++
   // Start the timer, sass-loader has been called with Sass content.
   // https://github.com/webpack-contrib/sass-loader/blob/03773152760434a2dd845008c504a09c0eb3fd91/src/index.js#L19
-  stats.start()
+  if (stats.buildCount === 1) {
+    stats.start()
+  }
+
   // Assign our proxy to sass-loaders async function.
   // https://github.com/webpack-contrib/sass-loader/blob/03773152760434a2dd845008c504a09c0eb3fd91/src/index.js#L29
   const sassLoaderAsyncProxy = forgivingProxy(sassLoaderThis.async, (target, thisArg, argumentsList) => {
@@ -215,9 +220,12 @@ const monitoredSassLoaderProxy = forgivingProxy(sassLoader, (target, sassLoaderT
     return forgivingProxy(sassLoaderCallback, (target, thisArg, argumentsList) => {
       // sass-loader's callback has been... called.
       // Either we have sass, or the build failed.
-      stats.end()
-      stats.reportAccordingToNoticeStrategy()
-      stats.sendMetric()
+      stats.buildCount--
+      if (stats.buildCount === 0) {
+        stats.end()
+        stats.reportAccordingToNoticeStrategy()
+        stats.sendMetric()
+      }
       return Reflect.apply(target, thisArg, argumentsList)
     })
   })