@roots/bud-cache 6.12.3 → 6.13.1

package/lib/index.d.ts

@@ -4,6 +4,6 @@
  * @see {@link https://bud.js.org}
  * @see {@link https://github.com/roots/bud}
  */
-import './types.js';
 import Cache from './service/index.js';
+import './types.js';
 export default Cache;

package/lib/index.js

@@ -6,6 +6,6 @@
  * @see {@link https://bud.js.org}
  * @see {@link https://github.com/roots/bud}
  */
-import './types.js';
 import Cache from './service/index.js';
+import './types.js';
 export default Cache;

package/lib/invalidate-cache/index.js

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from "tslib";
-import { join } from 'node:path';
 import { Extension } from '@roots/bud-framework/extension';
 import { bind, label } from '@roots/bud-framework/extension/decorators';
+import { join } from 'node:path';
 import stripAnsi from 'strip-ansi';
 /**
  * Cache invalidation extension
@@ -24,7 +24,7 @@ let InvalidateCacheExtension = class InvalidateCacheExtension extends Extension
      */
     async register(bud) {
         const invalidate = await bud.fs?.exists(this.invalidationFile);
-        if (invalidate || (bud.isCLI() && bud.context.args.force)) {
+        if (invalidate || bud.context.force) {
             await bud.fs.remove(this.invalidationFile);
             await bud.fs.remove(bud.cache.cacheDirectory);
         }
@@ -34,11 +34,11 @@ let InvalidateCacheExtension = class InvalidateCacheExtension extends Extension
                     if (!compiler.hasErrors())
                         return;
                     await bud.fs.json.write(this.invalidationFile, {
-                        hash: compiler.hash,
                         errors: compiler.stats.flatMap(stats => stats
-                            .toString({ preset: `errors-warnings`, colors: false })
+                            .toString({ colors: false, preset: `errors-warnings` })
                             .split(/\n/)
                             .map(stripAnsi)),
+                        hash: compiler.hash,
                     });
                 }
                 catch (e) { }

package/lib/service/index.d.ts

@@ -1,7 +1,7 @@
 import type { Bud } from '@roots/bud-framework';
-import { Service } from '@roots/bud-framework/service';
+import type { Configuration } from '@roots/bud-framework/config';
 import type * as Services from '@roots/bud-framework/services';
-import type { Configuration } from '@roots/bud-support/webpack';
+import { Service } from '@roots/bud-framework/service';
 /**
  * Cache service class
  */
@@ -11,40 +11,40 @@ export default class Cache extends Service implements Services.Cache.Service {
      */
     enabled: boolean;
     /**
-     * Type
+     * {@link Extension.boot}
      */
-    get name(): string;
-    set name(name: string);
+    boot(bud: Bud): Promise<void>;
     /**
-     * Type
-     */
-    get type(): 'memory' | 'filesystem';
-    set type(type: 'memory' | 'filesystem');
-    /**
-     * version
+     * Cache dependencies
      */
-    get version(): string;
-    set version(version: string);
+    get buildDependencies(): Record<string, Array<string>>;
+    set buildDependencies(dependencies: Record<string, Array<string>>);
     /**
      * Cache directory
      */
     get cacheDirectory(): string;
     set cacheDirectory(directory: string);
-    /**
-     * Cache dependencies
-     */
-    get buildDependencies(): Record<string, Array<string>>;
-    set buildDependencies(dependencies: Record<string, Array<string>>);
     /**
      * Webpack configuration
      */
     get configuration(): Configuration[`cache`];
-    /**
-     * {@link Extension.booted}
-     */
-    booted?(bud: Bud): Promise<void>;
     /**
      * Flush cache
      */
     flush(): Promise<void>;
+    /**
+     * Type
+     */
+    get name(): string;
+    set name(name: string);
+    /**
+     * Type
+     */
+    get type(): 'filesystem' | 'memory';
+    set type(type: 'filesystem' | 'memory');
+    /**
+     * version
+     */
+    get version(): string;
+    set version(version: string);
 }

package/lib/service/index.js

@@ -1,64 +1,25 @@
 import { __decorate, __metadata } from "tslib";
-import { createHash } from 'node:crypto';
-import { join } from 'node:path';
 import { Service } from '@roots/bud-framework/service';
 import { bind } from '@roots/bud-support/decorators/bind';
 import isString from '@roots/bud-support/lodash/isString';
 import { hash } from '@roots/bud-support/utilities/args';
+import { createHash } from 'node:crypto';
+import { join } from 'node:path';
 import InvalidateCacheExtension from '../invalidate-cache/index.js';
 /**
  * Cache service class
  */
 export default class Cache extends Service {
-    constructor() {
-        super(...arguments);
-        /**
-         * Enabled
-         */
-        this.enabled = true;
-    }
-    /**
-     * Type
-     */
-    get name() {
-        return this.app.hooks.filter(`build.cache.name`, this.app.hooks.filter(`build.name`, join(`webpack`, this.app.mode)));
-    }
-    set name(name) {
-        this.app.hooks.on(`build.cache.name`, name);
-    }
-    /**
-     * Type
-     */
-    get type() {
-        return this.app.hooks.filter(`build.cache.type`, this.app.isCLI() && isString(this.app.context.args.cache)
-            ? this.app.context.args.cache
-            : `filesystem`);
-    }
-    set type(type) {
-        this.app.hooks.on(`build.cache.type`, type);
-    }
     /**
-     * version
+     * Enabled
      */
-    get version() {
-        const version = createHash(`sha1`);
-        version.update(hash);
-        Object.values(this.app.context.files ?? {})
-            .filter(file => file?.bud || file?.name?.includes(`package.json`))
-            .map(({ sha1 }) => version.update(sha1));
-        return this.app.hooks.filter(`build.cache.version`, version.digest(`base64`));
-    }
-    set version(version) {
-        this.app.hooks.on(`build.cache.version`, version);
-    }
+    enabled = true;
     /**
-     * Cache directory
+     * {@link Extension.boot}
      */
-    get cacheDirectory() {
-        return this.app.hooks.filter(`build.cache.cacheDirectory`, this.app.path(`@storage`, this.app.label, `cache`));
-    }
-    set cacheDirectory(directory) {
-        this.app.hooks.on(`build.cache.cacheDirectory`, directory);
+    async boot(bud) {
+        await bud.extensions.add(InvalidateCacheExtension);
+        this.logger.success(`cache initialized`);
     }
     /**
      * Cache dependencies
@@ -76,6 +37,15 @@ export default class Cache extends Service {
     set buildDependencies(dependencies) {
         this.app.hooks.on(`build.cache.buildDependencies`, dependencies);
     }
+    /**
+     * Cache directory
+     */
+    get cacheDirectory() {
+        return this.app.hooks.filter(`build.cache.cacheDirectory`, this.app.path(`@storage`, this.app.label, `cache`));
+    }
+    set cacheDirectory(directory) {
+        this.app.hooks.on(`build.cache.cacheDirectory`, directory);
+    }
     /**
      * Webpack configuration
      */
@@ -85,38 +55,65 @@ export default class Cache extends Service {
         if (this.type === `memory`)
             return true;
         return {
-            name: this.name,
-            type: this.type,
-            store: `pack`,
             allowCollectingMemory: true,
             buildDependencies: this.buildDependencies,
             cacheDirectory: this.cacheDirectory,
             idleTimeout: 10000,
             idleTimeoutForInitialStore: 0,
-            profile: false,
+            name: this.name,
+            profile: this.app.context.debug === true,
+            store: `pack`,
+            type: this.type,
             version: this.app.hooks.filter(`build.cache.version`, this.version),
         };
     }
-    /**
-     * {@link Extension.booted}
-     */
-    async booted(bud) {
-        await bud.extensions.add(InvalidateCacheExtension);
-        this.logger.success(`cache initialized`);
-    }
     /**
      * Flush cache
      */
     async flush() {
         await this.app.fs.remove(this.cacheDirectory);
     }
+    /**
+     * Type
+     */
+    get name() {
+        return this.app.hooks.filter(`build.cache.name`, this.app.hooks.filter(`build.name`, join(`webpack`, this.app.mode)));
+    }
+    set name(name) {
+        this.app.hooks.on(`build.cache.name`, name);
+    }
+    /**
+     * Type
+     */
+    get type() {
+        return this.app.hooks.filter(`build.cache.type`, isString(this.app.context.cache)
+            ? this.app.context.cache
+            : `filesystem`);
+    }
+    set type(type) {
+        this.app.hooks.on(`build.cache.type`, type);
+    }
+    /**
+     * version
+     */
+    get version() {
+        const version = createHash(`sha1`);
+        version.update(hash);
+        Object.values(this.app.context.files ?? {})
+            .filter(file => file?.bud || file?.name?.includes(`package.json`))
+            .map(({ sha1 }) => version.update(sha1));
+        return this.app.hooks.filter(`build.cache.version`, version.digest(`base64`));
+    }
+    set version(version) {
+        this.app.hooks.on(`build.cache.version`, version);
+    }
 }
 __decorate([
     bind,
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Function]),
     __metadata("design:returntype", Promise)
-], Cache.prototype, "booted", null);
+], Cache.prototype, "boot", null);
 __decorate([
     bind,
     __metadata("design:type", Function),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-cache",
-  "version": "6.12.3",
+  "version": "6.13.1",
   "description": "Config caching",
   "engines": {
     "node": ">=16"
@@ -85,10 +85,10 @@
     "@skypack/package-check": "0.2.2"
   },
   "dependencies": {
-    "@roots/bud-framework": "6.12.3",
-    "@roots/bud-support": "6.12.3",
-    "strip-ansi": "7.0.1",
-    "tslib": "2.5.0"
+    "@roots/bud-framework": "6.13.1",
+    "@roots/bud-support": "6.13.1",
+    "strip-ansi": "7.1.0",
+    "tslib": "2.5.3"
   },
   "volta": {
     "extends": "../../../package.json"

package/src/index.ts

@@ -8,8 +8,7 @@
  * @see {@link https://github.com/roots/bud}
  */
 
-import './types.js'
-
 import Cache from './service/index.js'
+import './types.js'
 
 export default Cache

package/src/invalidate-cache/index.ts

@@ -1,8 +1,8 @@
-import {join} from 'node:path'
-
 import type {Bud} from '@roots/bud-framework'
+
 import {Extension} from '@roots/bud-framework/extension'
 import {bind, label} from '@roots/bud-framework/extension/decorators'
+import {join} from 'node:path'
 import stripAnsi from 'strip-ansi'
 
 /**
@@ -30,7 +30,7 @@ export default class InvalidateCacheExtension extends Extension {
   public override async register(bud: Bud) {
     const invalidate = await bud.fs?.exists(this.invalidationFile)
 
-    if (invalidate || (bud.isCLI() && bud.context.args.force)) {
+    if (invalidate || bud.context.force) {
       await bud.fs.remove(this.invalidationFile)
       await bud.fs.remove(bud.cache.cacheDirectory)
     }
@@ -41,13 +41,13 @@ export default class InvalidateCacheExtension extends Extension {
           if (!compiler.hasErrors()) return
 
           await bud.fs.json.write(this.invalidationFile, {
-            hash: compiler.hash,
             errors: compiler.stats.flatMap(stats =>
               stats
-                .toString({preset: `errors-warnings`, colors: false})
+                .toString({colors: false, preset: `errors-warnings`})
                 .split(/\n/)
                 .map(stripAnsi),
             ),
+            hash: compiler.hash,
           })
         } catch (e) {}
       })

package/src/service/index.ts

@@ -1,13 +1,13 @@
-import {createHash} from 'node:crypto'
-import {join} from 'node:path'
-
 import type {Bud} from '@roots/bud-framework'
-import {Service} from '@roots/bud-framework/service'
+import type {Configuration} from '@roots/bud-framework/config'
 import type * as Services from '@roots/bud-framework/services'
+
+import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
 import isString from '@roots/bud-support/lodash/isString'
 import {hash} from '@roots/bud-support/utilities/args'
-import type {Configuration} from '@roots/bud-support/webpack'
+import {createHash} from 'node:crypto'
+import {join} from 'node:path'
 
 import InvalidateCacheExtension from '../invalidate-cache/index.js'
 
@@ -24,66 +24,13 @@ export default class Cache
   public enabled: boolean = true
 
   /**
-   * Type
-   */
-  public get name(): string {
-    return this.app.hooks.filter(
-      `build.cache.name`,
-      this.app.hooks.filter(`build.name`, join(`webpack`, this.app.mode)),
-    )
-  }
-  public set name(name: string) {
-    this.app.hooks.on(`build.cache.name`, name)
-  }
-
-  /**
-   * Type
+   * {@link Extension.boot}
    */
-  public get type(): 'memory' | 'filesystem' {
-    return this.app.hooks.filter(
-      `build.cache.type`,
-      this.app.isCLI() && isString(this.app.context.args.cache)
-        ? this.app.context.args.cache
-        : `filesystem`,
-    )
-  }
-  public set type(type: 'memory' | 'filesystem') {
-    this.app.hooks.on(`build.cache.type`, type)
-  }
-
-  /**
-   * version
-   */
-  public get version(): string {
-    const version = createHash(`sha1`)
-    version.update(hash)
-
-    Object.values(this.app.context.files ?? {})
-      .filter(file => file?.bud || file?.name?.includes(`package.json`))
-      .map(({sha1}) => version.update(sha1))
-
-    return this.app.hooks.filter(
-      `build.cache.version`,
-      version.digest(`base64`),
-    )
-  }
-  public set version(version: string) {
-    this.app.hooks.on(`build.cache.version`, version)
-  }
-
-  /**
-   * Cache directory
-   */
-  public get cacheDirectory(): string {
-    return this.app.hooks.filter(
-      `build.cache.cacheDirectory`,
-      this.app.path(`@storage`, this.app.label, `cache`),
-    )
-  }
-  public set cacheDirectory(directory: string) {
-    this.app.hooks.on(`build.cache.cacheDirectory`, directory)
+  @bind
+  public override async boot(bud: Bud) {
+    await bud.extensions.add(InvalidateCacheExtension)
+    this.logger.success(`cache initialized`)
   }
-
   /**
    * Cache dependencies
    */
@@ -97,12 +44,25 @@ export default class Cache
       ].filter(Boolean),
     })
   }
+
   public set buildDependencies(
     dependencies: Record<string, Array<string>>,
   ) {
     this.app.hooks.on(`build.cache.buildDependencies`, dependencies)
   }
+  /**
+   * Cache directory
+   */
+  public get cacheDirectory(): string {
+    return this.app.hooks.filter(
+      `build.cache.cacheDirectory`,
+      this.app.path(`@storage`, this.app.label, `cache`),
+    )
+  }
 
+  public set cacheDirectory(directory: string) {
+    this.app.hooks.on(`build.cache.cacheDirectory`, directory)
+  }
   /**
    * Webpack configuration
    */
@@ -111,33 +71,73 @@ export default class Cache
     if (this.type === `memory`) return true
 
     return {
-      name: this.name,
-      type: this.type,
-      store: `pack` as `pack`,
       allowCollectingMemory: true,
       buildDependencies: this.buildDependencies,
       cacheDirectory: this.cacheDirectory,
       idleTimeout: 10000,
       idleTimeoutForInitialStore: 0,
-      profile: false,
+      name: this.name,
+      profile: this.app.context.debug === true,
+      store: `pack` as `pack`,
+      type: this.type,
       version: this.app.hooks.filter(`build.cache.version`, this.version),
     }
   }
 
   /**
-   * {@link Extension.booted}
+   * Flush cache
    */
   @bind
-  public override async booted?(bud: Bud) {
-    await bud.extensions.add(InvalidateCacheExtension)
-    this.logger.success(`cache initialized`)
+  public async flush(): Promise<void> {
+    await this.app.fs.remove(this.cacheDirectory)
+  }
+  /**
+   * Type
+   */
+  public get name(): string {
+    return this.app.hooks.filter(
+      `build.cache.name`,
+      this.app.hooks.filter(`build.name`, join(`webpack`, this.app.mode)),
+    )
   }
 
+  public set name(name: string) {
+    this.app.hooks.on(`build.cache.name`, name)
+  }
   /**
-   * Flush cache
+   * Type
    */
-  @bind
-  public async flush(): Promise<void> {
-    await this.app.fs.remove(this.cacheDirectory)
+  public get type(): 'filesystem' | 'memory' {
+    return this.app.hooks.filter(
+      `build.cache.type`,
+      isString(this.app.context.cache)
+        ? this.app.context.cache
+        : `filesystem`,
+    )
+  }
+
+  public set type(type: 'filesystem' | 'memory') {
+    this.app.hooks.on(`build.cache.type`, type)
+  }
+
+  /**
+   * version
+   */
+  public get version(): string {
+    const version = createHash(`sha1`)
+    version.update(hash)
+
+    Object.values(this.app.context.files ?? {})
+      .filter(file => file?.bud || file?.name?.includes(`package.json`))
+      .map(({sha1}) => version.update(sha1))
+
+    return this.app.hooks.filter(
+      `build.cache.version`,
+      version.digest(`base64`),
+    )
+  }
+
+  public set version(version: string) {
+    this.app.hooks.on(`build.cache.version`, version)
   }
 }