@roots/bud-build 6.13.1 → 6.14.1

package/lib/config/experiments.js

@@ -1,3 +1,7 @@
-export const experiments = async ({ hooks }) => hooks.filter(`build.experiments`, {
+export const experiments = async ({ hooks, isDevelopment, }) => hooks.filter(`build.experiments`, {
     backCompat: false,
+    lazyCompilation: isDevelopment
+        ? { entries: false, imports: true }
+        : false,
+    topLevelAwait: true,
 });

package/lib/config/infrastructureLogging.js

@@ -1,4 +1,4 @@
-import logger from '@roots/bud-support/utilities/logger';
+import logger from '@roots/bud-support/logger';
 export const infrastructureLogging = async (bud) => bud.hooks.filter(`build.infrastructureLogging`, {
     console: bud.hooks.filter(`build.infrastructureLogging.console`, {
         ...console,

package/lib/config/output/index.js

@@ -1,17 +1,22 @@
 import { isMjs } from '../../helpers/isMjs.js';
 import { assetModuleFilename } from './assetModuleFilename.js';
-import { chunkFilename } from './chunkFilename.js';
 import { filename } from './filename.js';
 export const output = async ({ hooks: { filter }, isProduction, path, relPath, }) => filter(`build.output`, {
     assetModuleFilename: assetModuleFilename({ filter, relPath }),
-    chunkFilename: chunkFilename({ filter, relPath }),
+    /**
+     * This should be kept undefined as documented here:
+     * {@see https://webpack.js.org/plugins/split-chunks-plugin/#splitchunkscachegroupscachegroupfilename}
+     */
+    // chunkFilename: chunkFilename({filter, relPath}),
     clean: filter(`build.output.clean`, isProduction),
     environment: filter(`build.output.environment`, undefined),
     filename: filename({ filter, relPath }),
+    hashFunction: filter(`build.output.hashFunction`, `xxhash64`),
+    iife: filter(`build.output.iife`, undefined),
     module: filter(`build.output.module`, false),
     path: filter(`build.output.path`, path(`@dist`)),
     pathinfo: filter(`build.output.pathinfo`, false),
     publicPath: filter(`build.output.publicPath`, `auto`),
-    scriptType: filter(`build.output.scriptType`, isMjs(filter) ? `module` : false),
+    scriptType: filter(`build.output.scriptType`, isMjs(filter) ? `module` : `text/javascript`),
     uniqueName: filter(`build.output.uniqueName`, `@roots/bud`),
 });

package/lib/config/parallelism.js

@@ -1,2 +1,9 @@
 import { cpus } from 'node:os';
-export const parallelism = async ({ hooks }) => hooks.filter(`build.parallelism`, 10 * Math.max(cpus().length - 1, 1));
+export const parallelism = async ({ hooks, root, }) => {
+    const factor = 10;
+    const procs = Math.min(cpus().length - 1, 1);
+    const comps = root.hasChildren
+        ? Math.min(Object.keys(root.children).length)
+        : 1;
+    return hooks.filter(`build.parallelism`, (procs * factor) / comps);
+};

package/lib/config/resolve.js

@@ -1,3 +1,4 @@
+import isString from '@roots/bud-support/lodash/isString';
 export const resolve = async (bud) => {
     return await bud.hooks.filterAsync(`build.resolve`, {
         alias: {
@@ -12,7 +13,7 @@ export const resolve = async (bud) => {
         modules: await bud.hooks.filterAsync(`build.resolve.modules`, [
             bud.hooks.filter(`location.@src`),
             bud.hooks.filter(`location.@modules`),
-        ]),
+        ].filter(v => isString(v) && v.length > 0)),
         /**
          * Leave `undefined` to use webpack default (true in dev, false in production)
          */

package/lib/config/resolveLoader.js

@@ -1,3 +1,11 @@
-export const resolveLoader = async ({ hooks }) => hooks.filter(`build.resolveLoader`, {
-    alias: hooks.filter(`build.resolveLoader.alias`, {}),
+export const resolveLoader = async ({ hooks, module, }) => hooks.filter(`build.resolveLoader`, {
+    alias: hooks.filter(`build.resolveLoader.alias`, {
+        'css-loader': await module.resolve(`@roots/bud-support/css-loader`),
+        'file-loader': await module.resolve(`@roots/bud-support/file-loader`),
+        'html-loader': await module.resolve(`@roots/bud-support/html-loader`),
+        json5: await module.resolve(`@roots/bud-support/json5`),
+        'mini-svg-data-uri': await module.resolve(`mini-svg-data-uri`),
+        'style-loader': await module.resolve(`@roots/bud-support/style-loader`),
+        toml: await module.resolve(`@roots/bud-support/toml`),
+    }),
 });

package/lib/config/stats.js

@@ -2,7 +2,10 @@ export const stats = async (app) => app.hooks.filter(`build.stats`, app.isProduc
     ? {
         all: false,
         assets: true,
+        assetsSort: `size`,
+        builtAt: false,
         children: false,
+        chunks: false,
         entrypoints: true,
         errors: true,
         errorsCount: true,

package/lib/item/index.js

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from "tslib";
+import { basename } from 'path';
 import { bind } from '@roots/bud-support/decorators/bind';
 import isString from '@roots/bud-support/lodash/isString';
-import { basename } from 'path';
 import { Loader } from '../loader/index.js';
 import Base from '../shared/base.js';
 /**

package/lib/service.d.ts

@@ -1,6 +1,6 @@
+import type { Bud, Build as BudBuild } from '@roots/bud-framework';
 import type { Items, Loaders, Rules } from '@roots/bud-framework';
 import type { Configuration } from '@roots/bud-framework/config';
-import type * as Base from '@roots/bud-framework/services/build';
 import { Service } from '@roots/bud-framework/service';
 import type { Options as RuleOptions } from './rule/index.js';
 import { register } from './handlers/register.js';
@@ -10,7 +10,7 @@ import { Rule } from './rule/index.js';
 /**
  * Webpack configuration builder class
  */
-export declare class Build extends Service implements Base.Service {
+export declare class Build extends Service implements BudBuild {
     /**
      * Built config object
      */
@@ -24,17 +24,14 @@ export declare class Build extends Service implements Base.Service {
      */
     loaders: Loaders;
     /**
-     * Service register event
-     *
-     * @remarks
-     * `loaders`, `items`, and `rules` are instantiated dumbly
-     * because it is painful to think about how to map the typings..
+     * {@link BudBuild.register}
      */
-    register: typeof register;
+    register?: typeof register;
     /**
      * Registered rules
      */
     rules: Rules;
+    bootstrap?(app: Bud): Promise<void>;
     /**
      * Get item
      */

package/lib/service.js

@@ -17,25 +17,14 @@ export class Build extends Service {
      */
     config = {};
     /**
-     * Registered items
-     */
-    items = {};
-    /**
-     * Registered loaders
-     */
-    loaders = {};
-    /**
-     * Service register event
-     *
-     * @remarks
-     * `loaders`, `items`, and `rules` are instantiated dumbly
-     * because it is painful to think about how to map the typings..
+     * {@link BudBuild.register}
      */
     register = register.bind(this);
-    /**
-     * Registered rules
-     */
-    rules = {};
+    async bootstrap(app) {
+        this.items = {};
+        this.loaders = {};
+        this.rules = {};
+    }
     /**
      * Get item
      */

package/lib/types.d.ts

@@ -1,7 +1,11 @@
-import type { Item } from './item/index.js';
-import type { Loader } from './loader/index.js';
-import type { Rule } from './rule/index.js';
+import type { Item } from '@roots/bud-build/item';
+import type { Loader } from '@roots/bud-build/loader';
+import type { Rule } from '@roots/bud-build/rule';
+import type { Build } from './service.js';
 declare module '@roots/bud-framework' {
+    interface Services {
+        build: Build;
+    }
     interface Loaders {
         css: Loader;
         csv: Loader;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@roots/bud-build",
-  "version": "6.13.1",
+  "version": "6.14.1",
   "description": "bud.js core module",
   "engines": {
     "node": ">=16"
   },
   "contributors": [
     {
-      "name": "Kelly Mears",
       "email": "developers@tinypixel.dev",
+      "name": "Kelly Mears",
       "url": "https://github.com/kellymears"
     },
     {
-      "name": "Ben Word",
       "email": "ben@benword.com",
+      "name": "Ben Word",
       "url": "https://github.com/retlehs"
     },
     {
@@ -21,8 +21,8 @@
       "url": "https://github.com/QWp6t"
     },
     {
-      "name": "Brandon",
       "email": "brandon@tendency.me",
+      "name": "Brandon",
       "url": "https://github.com/Log1x"
     }
   ],
@@ -85,15 +85,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "6.13.1",
-    "@roots/bud-hooks": "6.13.1",
+    "@roots/bud-api": "6.14.1",
+    "@roots/bud-hooks": "6.14.1",
     "@skypack/package-check": "0.2.2",
-    "@types/node": "18.16.16"
+    "@types/node": "18.16.18"
   },
   "dependencies": {
-    "@roots/bud-framework": "6.13.1",
-    "@roots/bud-support": "6.13.1",
-    "tslib": "2.5.3"
+    "@roots/bud-framework": "6.14.1",
+    "@roots/bud-support": "6.14.1",
+    "tslib": "2.6.0"
   },
   "volta": {
     "extends": "../../../package.json"

package/src/config/experiments.ts

@@ -1,6 +1,13 @@
 import type {Factory} from './index.js'
 
-export const experiments: Factory<`experiments`> = async ({hooks}) =>
+export const experiments: Factory<`experiments`> = async ({
+  hooks,
+  isDevelopment,
+}) =>
   hooks.filter(`build.experiments`, {
     backCompat: false,
+    lazyCompilation: isDevelopment
+      ? {entries: false, imports: true}
+      : false,
+    topLevelAwait: true,
   })

package/src/config/index.test.ts

@@ -8,7 +8,7 @@ describe(`bud.build.config`, function () {
   let build: Build
 
   beforeEach(async () => {
-    bud = await factory()
+    bud = await factory({cache: `filesystem`})
     build = new Build(() => bud)
     await build.register(bud)
     await build.make()
@@ -28,7 +28,7 @@ describe(`bud.build.config`, function () {
 
     expect(cache.type).toStrictEqual(`filesystem`)
 
-    expect(cache.version).toStrictEqual(expect.any(String))
+    expect(cache.version).toStrictEqual(undefined)
   })
 
   it(`should have expected context default`, async () => {

package/src/config/infrastructureLogging.ts

@@ -1,4 +1,4 @@
-import logger from '@roots/bud-support/utilities/logger'
+import logger from '@roots/bud-support/logger'
 
 import type {Factory} from './index.js'
 

package/src/config/output/index.ts

@@ -2,7 +2,6 @@ import type {Factory} from '../index.js'
 
 import {isMjs} from '../../helpers/isMjs.js'
 import {assetModuleFilename} from './assetModuleFilename.js'
-import {chunkFilename} from './chunkFilename.js'
 import {filename} from './filename.js'
 
 export const output: Factory<`output`> = async ({
@@ -13,17 +12,23 @@ export const output: Factory<`output`> = async ({
 }) =>
   filter(`build.output`, {
     assetModuleFilename: assetModuleFilename({filter, relPath}),
-    chunkFilename: chunkFilename({filter, relPath}),
+    /**
+     * This should be kept undefined as documented here:
+     * {@see https://webpack.js.org/plugins/split-chunks-plugin/#splitchunkscachegroupscachegroupfilename}
+     */
+    // chunkFilename: chunkFilename({filter, relPath}),
     clean: filter(`build.output.clean`, isProduction),
     environment: filter(`build.output.environment`, undefined),
     filename: filename({filter, relPath}),
+    hashFunction: filter(`build.output.hashFunction`, `xxhash64`),
+    iife: filter(`build.output.iife`, undefined),
     module: filter(`build.output.module`, false),
     path: filter(`build.output.path`, path(`@dist`)),
     pathinfo: filter(`build.output.pathinfo`, false),
     publicPath: filter(`build.output.publicPath`, `auto`),
     scriptType: filter(
       `build.output.scriptType`,
-      isMjs(filter) ? `module` : false,
+      isMjs(filter) ? `module` : `text/javascript`,
     ),
     uniqueName: filter(`build.output.uniqueName`, `@roots/bud`),
   })

package/src/config/parallelism.ts

@@ -2,5 +2,15 @@ import {cpus} from 'node:os'
 
 import type {Factory} from './index.js'
 
-export const parallelism: Factory<`parallelism`> = async ({hooks}) =>
-  hooks.filter(`build.parallelism`, 10 * Math.max(cpus().length - 1, 1))
+export const parallelism: Factory<`parallelism`> = async ({
+  hooks,
+  root,
+}) => {
+  const factor = 10
+  const procs = Math.min(cpus().length - 1, 1)
+  const comps = root.hasChildren
+    ? Math.min(Object.keys(root.children).length)
+    : 1
+
+  return hooks.filter(`build.parallelism`, (procs * factor) / comps)
+}

package/src/config/resolve.ts

@@ -1,3 +1,5 @@
+import isString from '@roots/bud-support/lodash/isString'
+
 import type {Factory} from './index.js'
 
 export const resolve: Factory<`resolve`> = async bud => {
@@ -6,6 +8,7 @@ export const resolve: Factory<`resolve`> = async bud => {
       [`@src`]: bud.path(`@src`),
       ...(await bud.hooks.filterAsync(`build.resolve.alias`, {})),
     },
+
     extensionAlias: await bud.hooks.filterAsync(
       `build.resolve.extensionAlias`,
       {
@@ -13,16 +16,22 @@ export const resolve: Factory<`resolve`> = async bud => {
         [`.mjs`]: [`.mts`, `.mtx`, `.mjs`],
       },
     ),
+
     extensions: Array.from(
       bud.hooks.filter(
         `build.resolve.extensions`,
         new Set([`.js`, `.mjs`, `.jsx`, `.css`]),
       ),
     ),
-    modules: await bud.hooks.filterAsync(`build.resolve.modules`, [
-      bud.hooks.filter(`location.@src`),
-      bud.hooks.filter(`location.@modules`),
-    ]),
+
+    modules: await bud.hooks.filterAsync(
+      `build.resolve.modules`,
+      [
+        bud.hooks.filter(`location.@src`),
+        bud.hooks.filter(`location.@modules`),
+      ].filter(v => isString(v) && v.length > 0),
+    ),
+
     /**
      * Leave `undefined` to use webpack default (true in dev, false in production)
      */

package/src/config/resolveLoader.ts

@@ -1,6 +1,23 @@
 import type {Factory} from './index.js'
 
-export const resolveLoader: Factory<`resolveLoader`> = async ({hooks}) =>
+export const resolveLoader: Factory<`resolveLoader`> = async ({
+  hooks,
+  module,
+}) =>
   hooks.filter(`build.resolveLoader`, {
-    alias: hooks.filter(`build.resolveLoader.alias`, {}),
+    alias: hooks.filter(`build.resolveLoader.alias`, {
+      'css-loader': await module.resolve(`@roots/bud-support/css-loader`),
+      'file-loader': await module.resolve(
+        `@roots/bud-support/file-loader`,
+      ),
+      'html-loader': await module.resolve(
+        `@roots/bud-support/html-loader`,
+      ),
+      json5: await module.resolve(`@roots/bud-support/json5`),
+      'mini-svg-data-uri': await module.resolve(`mini-svg-data-uri`),
+      'style-loader': await module.resolve(
+        `@roots/bud-support/style-loader`,
+      ),
+      toml: await module.resolve(`@roots/bud-support/toml`),
+    }),
   })

package/src/config/stats.ts

@@ -7,7 +7,10 @@ export const stats: Factory<`stats`> = async app =>
       ? {
           all: false,
           assets: true,
+          assetsSort: `size`,
+          builtAt: false,
           children: false,
+          chunks: false,
           entrypoints: true,
           errors: true,
           errorsCount: true,

package/src/item/index.ts

@@ -1,9 +1,10 @@
 import type {Bud, Loaders} from '@roots/bud-framework'
 import type * as Build from '@roots/bud-framework/services/build'
 
+import {basename} from 'path'
+
 import {bind} from '@roots/bud-support/decorators/bind'
 import isString from '@roots/bud-support/lodash/isString'
-import {basename} from 'path'
 
 import {Loader} from '../loader/index.js'
 import Base from '../shared/base.js'

package/src/service.ts

@@ -1,6 +1,6 @@
+import type {Bud, Build as BudBuild} from '@roots/bud-framework'
 import type {Items, Loaders, Rules} from '@roots/bud-framework'
 import type {Configuration} from '@roots/bud-framework/config'
-import type * as Base from '@roots/bud-framework/services/build'
 
 import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
@@ -18,7 +18,7 @@ import {Rule} from './rule/index.js'
 /**
  * Webpack configuration builder class
  */
-export class Build extends Service implements Base.Service {
+export class Build extends Service implements BudBuild {
   /**
    * Built config object
    */
@@ -27,26 +27,28 @@ export class Build extends Service implements Base.Service {
   /**
    * Registered items
    */
-  public items: Items = {} as Items
+  public declare items: Items
 
   /**
    * Registered loaders
    */
-  public loaders: Loaders = {} as Loaders
+  public declare loaders: Loaders
 
   /**
-   * Service register event
-   *
-   * @remarks
-   * `loaders`, `items`, and `rules` are instantiated dumbly
-   * because it is painful to think about how to map the typings..
+   * {@link BudBuild.register}
    */
-  public override register = register.bind(this)
+  public override register? = register.bind(this)
 
   /**
    * Registered rules
    */
-  public rules: Rules = {} as Rules
+  public declare rules: Rules
+
+  public override async bootstrap?(app: Bud) {
+    this.items = {} as Items
+    this.loaders = {} as Loaders
+    this.rules = {} as Rules
+  }
 
   /**
    * Get item

package/src/types.ts

@@ -1,8 +1,14 @@
-import type {Item} from './item/index.js'
-import type {Loader} from './loader/index.js'
-import type {Rule} from './rule/index.js'
+import type {Item} from '@roots/bud-build/item'
+import type {Loader} from '@roots/bud-build/loader'
+import type {Rule} from '@roots/bud-build/rule'
+
+import type {Build} from './service.js'
 
 declare module '@roots/bud-framework' {
+  interface Services {
+    build: Build
+  }
+
   interface Loaders {
     css: Loader
     csv: Loader

package/lib/config/output/chunkFilename.d.ts

@@ -1,7 +0,0 @@
-import type { Bud } from '@roots/bud-framework';
-interface Props {
-    filter: Bud[`hooks`][`filter`];
-    relPath: Bud[`relPath`];
-}
-export declare const chunkFilename: ({ filter, relPath }: Props) => string | ((pathData: import("webpack").PathData, assetInfo?: import("webpack").AssetInfo) => string);
-export {};

package/lib/config/output/chunkFilename.js

@@ -1,3 +0,0 @@
-import { join } from 'node:path';
-import { scriptExtension } from '../../helpers/scriptExtension.js';
-export const chunkFilename = ({ filter, relPath }) => filter(`build.output.chunkFilename`, join(`js`, `dynamic`, relPath(`@name.chunk`)).concat(scriptExtension(filter, `.mjs`, `.js`)));

package/src/config/output/chunkFilename.ts

@@ -1,18 +0,0 @@
-import type {Bud} from '@roots/bud-framework'
-
-import {join} from 'node:path'
-
-import {scriptExtension} from '../../helpers/scriptExtension.js'
-
-interface Props {
-  filter: Bud[`hooks`][`filter`]
-  relPath: Bud[`relPath`]
-}
-
-export const chunkFilename = ({filter, relPath}: Props) =>
-  filter(
-    `build.output.chunkFilename`,
-    join(`js`, `dynamic`, relPath(`@name.chunk`)).concat(
-      scriptExtension(filter, `.mjs`, `.js`),
-    ),
-  )