@roots/bud-build 6.12.3 → 6.13.1

package/src/config/resolve.ts

@@ -1,45 +1,31 @@
-import type {Bud} from '@roots/bud-framework'
-
 import type {Factory} from './index.js'
 
 export const resolve: Factory<`resolve`> = async bud => {
-  const modules = await getModules(bud)
-  const value = {
-    alias: await getAlias(bud),
-    extensions: getExtensions(bud),
-    modules,
-  }
-
-  return await bud.hooks.filterAsync(`build.resolve`, value)
-}
-
-const getAlias = async (bud: Bud) =>
-  await bud.hooks.filterAsync(`build.resolve.alias`, {
-    '@src': bud.path(`@src`),
-  })
-
-const getExtensions = (bud: Bud) =>
-  Array.from(
-    bud.hooks.filter(
-      `build.resolve.extensions`,
-      new Set([
-        `.mjs`,
-        `.js`,
-        `.jsx`,
-        `.css`,
-        `.json`,
-        `.wasm`,
-        `.yml`,
-        `.yaml`,
-        `.xml`,
-        `.toml`,
-        `.csv`,
-      ]),
+  return await bud.hooks.filterAsync(`build.resolve`, {
+    alias: {
+      [`@src`]: bud.path(`@src`),
+      ...(await bud.hooks.filterAsync(`build.resolve.alias`, {})),
+    },
+    extensionAlias: await bud.hooks.filterAsync(
+      `build.resolve.extensionAlias`,
+      {
+        [`.js`]: [`.ts`, `.tsx`, `.js`],
+        [`.mjs`]: [`.mts`, `.mtx`, `.mjs`],
+      },
     ),
-  )
-
-const getModules = async (bud: Bud) =>
-  await bud.hooks.filterAsync(`build.resolve.modules`, [
-    bud.hooks.filter(`location.@src`),
-    bud.hooks.filter(`location.@modules`),
-  ])
+    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`),
+    ]),
+    /**
+     * Leave `undefined` to use webpack default (true in dev, false in production)
+     */
+    unsafeCache: bud.hooks.filter(`build.module.unsafeCache`, undefined),
+  })
+}

package/src/config/resolveLoader.ts

@@ -1,6 +1,6 @@
 import type {Factory} from './index.js'
 
-export const resolveLoader: Factory<`resolveLoader`> = async bud =>
-  bud.hooks.filter(`build.resolveLoader`, {
-    alias: {},
+export const resolveLoader: Factory<`resolveLoader`> = async ({hooks}) =>
+  hooks.filter(`build.resolveLoader`, {
+    alias: hooks.filter(`build.resolveLoader.alias`, {}),
   })

package/src/config/snapshot.ts

@@ -1,8 +1,25 @@
 import type {Factory} from './index.js'
 
-export const snapshot: Factory<`snapshot`> = async app =>
-  app.hooks.filter(`build.snapshot`, {
-    managedPaths: app.hooks.filter(`build.snapshot.managedPaths`, [
-      ...new Set([app.path(`@modules`)]),
+export const snapshot: Factory<`snapshot`> = async ({env, hooks, path}) =>
+  hooks.filter(`build.snapshot`, {
+    buildDependencies: hooks.filter(
+      `build.snapshot.buildDependencies`,
+      env.isTrue(`CI`) ? {hash: true} : {timestamp: true},
+    ),
+    immutablePaths: hooks.filter(`build.snapshot.immutablePaths`, []),
+    managedPaths: hooks.filter(`build.snapshot.managedPaths`, [
+      ...new Set([path(`@modules`)]),
     ]),
+    module: hooks.filter(
+      `build.snapshot.module`,
+      env.isTrue(`CI`) ? {hash: true} : {timestamp: true},
+    ),
+    resolve: hooks.filter(
+      `build.snapshot.resolve`,
+      env.isTrue(`CI`) ? {hash: true} : {timestamp: true},
+    ),
+    resolveBuildDependencies: hooks.filter(
+      `build.snapshot.resolveBuildDependencies`,
+      env.isTrue(`CI`) ? {hash: true} : {timestamp: true},
+    ),
   })

package/src/config/stats.ts

@@ -12,8 +12,8 @@ export const stats: Factory<`stats`> = async app =>
           errors: true,
           errorsCount: true,
           hash: true,
-          outputPath: true,
           modules: true,
+          outputPath: true,
           timings: true,
           warnings: true,
           warningsCount: true,

package/src/handlers/index.ts

@@ -1,6 +1,7 @@
 import type {Bud} from '@roots/bud-framework'
 
 import type {Rule} from '../rule/index.js'
+
 import * as items from './items/items.js'
 import * as loaders from './loaders/loaders.js'
 import {register} from './register.js'
@@ -8,10 +9,10 @@ import {rules} from './rules/index.js'
 
 export interface Props {
   filter: Bud[`hooks`][`filter`]
+  isProduction: Bud[`isProduction`]
   makeItem: Bud[`build`][`makeItem`]
   makeLoader: Bud[`build`][`makeLoader`]
   makeRule: Bud[`build`][`makeRule`]
-  isProduction: Bud[`isProduction`]
   path: Bud[`path`]
   resolve: Bud[`module`][`resolve`]
 }

package/src/handlers/items/items.ts

@@ -1,4 +1,5 @@
 import type {Item} from '@roots/bud-framework/services/build'
+
 import isBoolean from '@roots/bud-support/lodash/isBoolean'
 
 import type {Factory} from '../index.js'
@@ -65,7 +66,7 @@ export const minicss: Factory<Item> = async ({makeItem}) =>
     .setLoader(`minicss`)
     .setIdent(`minicss`)
     .setOptions(app => ({
-      publicPath: app.hooks.filter(`build.output.publicPath`),
+      publicPath: app.publicPath(),
     }))
 
 /**
@@ -75,17 +76,11 @@ export const raw: Factory<Item> = async ({makeItem}) =>
   makeItem().setLoader(`raw`).setIdent(`raw`)
 
 /**
- * File loader
+ * file-loader
  */
 export const file: Factory<Item> = async ({makeItem}) =>
   makeItem().setLoader(`file`).setIdent(`file`)
 
-/**
- * Xml loader
- */
-export const xml: Factory<Item> = async ({makeItem}) =>
-  makeItem().setLoader(`xml`).setIdent(`xml`)
-
 /**
  * Yml loader
  */

package/src/handlers/loaders/loaders.ts

@@ -1,4 +1,5 @@
 import type {Loader} from '@roots/bud-framework/services/build'
+
 import * as MiniCss from '@roots/bud-support/mini-css-extract-plugin'
 
 import type {Factory} from '../index.js'
@@ -36,11 +37,6 @@ export const style: Factory<Loader> = async ({makeLoader, resolve}) =>
     await resolve(`@roots/bud-support/style-loader`, import.meta.url),
   )
 
-export const xml: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/xml-loader`, import.meta.url),
-  )
-
 export const yml: Factory<Loader> = async ({makeLoader, resolve}) =>
   makeLoader(
     await resolve(`@roots/bud-support/yml-loader`, import.meta.url),

package/src/handlers/register.ts

@@ -1,6 +1,7 @@
 import type {Bud} from '@roots/bud-framework'
 
 import type {Factory} from './index.js'
+
 import * as items from './items/items.js'
 import * as loaders from './loaders/loaders.js'
 import {rules} from './rules/index.js'
@@ -34,16 +35,16 @@ export async function register(bud: Bud) {
 }
 
 export const makeRegister: makeRegister =
-  ({build, hooks, isProduction, path, module: {resolve}}, setRule) =>
+  ({build, hooks, isProduction, module: {resolve}, path}, setRule) =>
   async ([key, factory]) =>
     setRule(
       key,
       await factory({
         filter: hooks.filter,
+        isProduction,
         makeItem: build.makeItem,
         makeLoader: build.makeLoader,
         makeRule: build.makeRule,
-        isProduction,
         path,
         resolve,
       }),

package/src/handlers/rules/csv.test.ts

@@ -1,4 +1,4 @@
-import {factory} from '@repo/test-kit/bud'
+import {factory} from '@repo/test-kit'
 import {describe, expect, it} from 'vitest'
 
 import {csv} from './csv.js'

package/src/handlers/rules/csv.ts

@@ -1,6 +1,6 @@
 import type {Factory} from '../index.js'
 
-export const csv: Factory = async ({makeRule, path, filter}) =>
+export const csv: Factory = async ({filter, makeRule, path}) =>
   makeRule()
     .setInclude([path()])
     .setTest(() => filter(`pattern.csv`))

package/src/handlers/rules/index.ts

@@ -12,24 +12,22 @@ import {inlineSvg} from './svg.inline.js'
 import {svg} from './svg.js'
 import {toml} from './toml.js'
 import {webp} from './webp.js'
-import {xml} from './xml.js'
 import {yml} from './yml.js'
 
 export const rules = {
-  toml,
-  xml,
+  css,
+  cssModule,
   csv,
-  yml,
-  html,
-  json,
   font,
-  svg,
-  webp,
+  html,
   image,
   inlineFont,
-  inlineSvg,
   inlineImage,
-  cssModule,
-  css,
+  inlineSvg,
   js,
+  json,
+  svg,
+  toml,
+  webp,
+  yml,
 }

package/src/handlers/rules/js.ts

@@ -4,4 +4,6 @@ export const js: Factory = async ({filter, makeRule, path}) =>
   makeRule()
     .setTest(filter(`pattern.js`))
     .setInclude([() => path(`@src`)])
-    .setUse([])
+    .setResolve({
+      fullySpecified: false,
+    })

package/src/handlers/rules/json.ts

@@ -7,4 +7,6 @@ export const json: Factory = async ({filter, makeRule, path}) =>
     .setType(`json`)
     .setInclude([() => path()])
     .setTest(filter(`pattern.json`))
-    .setParser({parse: json5.parse})
+    .setParser({
+      parse: json5.parse,
+    })

package/src/handlers/rules/svg.inline.test.ts

@@ -4,7 +4,7 @@ import {inlineSvg, dataUrl} from './svg.inline.js'
 
 describe(`svg-inline`, () => {
   it(`should return a rule`, async () => {
-    const bud = await import(`@repo/test-kit/bud`).then(
+    const bud = await import(`@repo/test-kit`).then(
       async ({factory}) => await factory(),
     )
     const result = await inlineSvg({

package/src/handlers/rules/toml.test.ts

@@ -1,4 +1,4 @@
-import {factory} from '@repo/test-kit/bud'
+import {factory} from '@repo/test-kit'
 import {describe, expect, it} from 'vitest'
 
 import {toml} from './toml'

package/src/handlers/rules/toml.ts

@@ -7,4 +7,6 @@ export const toml: Factory = async ({filter, makeRule, path}) =>
     .setType(`json`)
     .setInclude([() => path()])
     .setTest(() => filter(`pattern.toml`))
-    .setParser({parse: tomlParser.parse})
+    .setParser({
+      parse: tomlParser.parse,
+    })

package/src/index.ts

@@ -8,12 +8,11 @@
  * @see https://github.com/roots/bud
  */
 
-import './types.js'
-
 import {Item} from './item/index.js'
 import {Loader} from './loader/index.js'
 import {Rule} from './rule/index.js'
 import {Build} from './service.js'
+import './types.js'
 
 export default Build
 

package/src/item/index.ts

@@ -1,5 +1,6 @@
 import type {Bud, Loaders} from '@roots/bud-framework'
 import type * as Build from '@roots/bud-framework/services/build'
+
 import {bind} from '@roots/bud-support/decorators/bind'
 import isString from '@roots/bud-support/lodash/isString'
 import {basename} from 'path'
@@ -21,7 +22,7 @@ class Item extends Base implements Build.Item {
   /**
    * Loader
    */
-  public loader: Loader | `${keyof Loaders & string}`
+  public loader: `${keyof Loaders & string}` | Loader
 
   /**
    * Loader options
@@ -35,7 +36,7 @@ class Item extends Base implements Build.Item {
     public override _app: () => Bud,
     constructorParams?: {
       ident?: string
-      loader?: Loader | `${keyof Loaders & string}`
+      loader?: `${keyof Loaders & string}` | Loader
       options?: Item['options']
     },
   ) {
@@ -61,12 +62,6 @@ class Item extends Base implements Build.Item {
     return this.ident
   }
 
-  @bind
-  public setIdent(ident: Build.Item['ident']): this {
-    this.ident = ident
-    return this
-  }
-
   /**
    * Get rule set item loader
    */
@@ -78,45 +73,51 @@ class Item extends Base implements Build.Item {
   }
 
   /**
-   * Set rule set item loader
+   * Get rule set item options
    */
   @bind
-  public setLoader(loader: Loader | `${keyof Loaders & string}`): this {
-    this.loader = loader
+  public getOptions(): Item['options'] {
+    return this.unwrap(this.options)
+  }
 
-    if (!this.ident)
-      this.setIdent(basename(isString(loader) ? loader : loader.getSrc()))
+  /**
+   * Merge rule set item options
+   */
+  @bind
+  public mergeOptions(options: Build.Item.Options): this {
+    this.setOptions({
+      ...(this.getOptions() ?? {}),
+      ...options,
+    })
 
     return this
   }
 
-  /**
-   * Get rule set item options
-   */
   @bind
-  public getOptions(): Item['options'] {
-    return this.unwrap(this.options)
+  public setIdent(ident: Build.Item['ident']): this {
+    this.ident = ident
+    return this
   }
 
   /**
-   * Set rule set item options
+   * Set rule set item loader
    */
   @bind
-  public setOptions(options: Item['options']) {
-    this.options = options
+  public setLoader(loader: `${keyof Loaders & string}` | Loader): this {
+    this.loader = loader
+
+    if (!this.ident)
+      this.setIdent(basename(isString(loader) ? loader : loader.getSrc()))
+
     return this
   }
 
   /**
-   * Merge rule set item options
+   * Set rule set item options
    */
   @bind
-  public mergeOptions(options: Build.Item.Options): this {
-    this.setOptions({
-      ...(this.getOptions() ?? {}),
-      ...options,
-    })
-
+  public setOptions(options: Item['options']) {
+    this.options = options
     return this
   }
 

package/src/rule/index.test.ts

@@ -1,4 +1,4 @@
-import {factory} from '@repo/test-kit/bud'
+import {factory} from '@repo/test-kit'
 import {beforeAll, describe, expect, it} from 'vitest'
 
 import {Rule} from './index.js'