@roots/bud-build 2023.6.5 → 2023.6.7

package/lib/config/optimization.js

@@ -12,7 +12,7 @@ export const optimization = async ({ hooks: { filter }, isDevelopment, isProduct
      * @see {@link https://webpack.js.org/configuration/optimization/#optimizationremoveavailablemodules}
      */
     removeAvailableModules: filter(`build.optimization.removeAvailableModules`, false),
-    runtimeChunk: filter(`build.optimization.runtimeChunk`, false),
+    runtimeChunk: filter(`build.optimization.runtimeChunk`, `single`),
     sideEffects: filter(`build.optimization.sideEffects`, isProduction),
     splitChunks: filter(`build.optimization.splitChunks`, false),
     providedExports: filter(`build.optimization.providedExports`, isProduction),

package/lib/config/resolve.js

@@ -8,7 +8,7 @@ export const resolve = async (bud) => {
             [`.js`]: [`.ts`, `.tsx`, `.js`],
             [`.mjs`]: [`.mts`, `.mtx`, `.mjs`],
         }),
-        extensions: Array.from(bud.hooks.filter(`build.resolve.extensions`, new Set([`.js`, `.mjs`, `.jsx`, `.cjs`, `.css`]))),
+        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`),

package/lib/handlers/rules/js.js

@@ -1,7 +1,6 @@
 export const js = async ({ filter, makeRule, path }) => makeRule()
     .setTest(filter(`pattern.js`))
     .setInclude([() => path(`@src`)])
-    .setType(`javascript/auto`)
     .setResolve({
     fullySpecified: false,
 });

package/lib/item/index.js

@@ -8,6 +8,19 @@ import Base from '../shared/base.js';
  * Item class
  */
 class Item extends Base {
+    _app;
+    /**
+     * Identifier
+     */
+    ident;
+    /**
+     * Loader
+     */
+    loader;
+    /**
+     * Loader options
+     */
+    options;
     /**
      * Class constructor
      */

package/lib/loader/index.js

@@ -3,6 +3,11 @@ import Base from '../shared/base.js';
  * Bud Loader
  */
 class Loader extends Base {
+    _app;
+    /**
+     * Factory returning the loader path
+     */
+    src;
     /**
      * Class constructor
      *

package/lib/rule/index.js

@@ -7,6 +7,42 @@ import Base from '../shared/base.js';
  * RuleSetRule
  */
 class Rule extends Base {
+    /**
+     * RuleSetRule resolve
+     */
+    resolve;
+    /**
+     * RuleSetRule test
+     */
+    test;
+    /**
+     * RuleSetRule use
+     */
+    use;
+    /**
+     * RuleSetRule include
+     */
+    include;
+    /**
+     * RuleSetRule exclude
+     */
+    exclude;
+    /**
+     * RuleSetRule type
+     */
+    type;
+    /**
+     * RuleSetRule resourceQuery
+     */
+    resourceQuery;
+    /**
+     * RuleSetRule parser
+     */
+    parser;
+    /**
+     * RuleSetRule generator
+     */
+    generator;
     /**
      * Class constructor
      */

package/lib/service.d.ts

@@ -43,14 +43,6 @@ export declare class Build extends Service implements Base.Service {
      * Get rule
      */
     getRule<K extends `${keyof Rules & string}`>(ident: K): Rules[K];
-    /**
-     * Set Rule
-     */
-    setRule<K extends `${keyof Rules & string}`>(name: K, input?: RuleOptions | Rule): this;
-    /**
-     * Make Rule
-     */
-    makeRule(options?: RuleOptions): Rule;
     /**
      * Get loader
      */
@@ -75,4 +67,12 @@ export declare class Build extends Service implements Base.Service {
      * Make item
      */
     makeItem(options?: Partial<Item['options']>): Item;
+    /**
+     * Set Rule
+     */
+    setRule<K extends `${keyof Rules & string}`>(name: K, input?: RuleOptions | Rule): this;
+    /**
+     * Make Rule
+     */
+    makeRule(options?: RuleOptions): Rule;
 }

package/lib/service.js

@@ -12,33 +12,30 @@ import { Rule } from './rule/index.js';
  * Webpack configuration builder class
  */
 export class Build extends Service {
-    constructor() {
-        super(...arguments);
-        /**
-         * Built config object
-         */
-        this.config = {};
-        /**
-         * Registered loaders
-         */
-        this.loaders = {};
-        /**
-         * Registered rules
-         */
-        this.rules = {};
-        /**
-         * Registered items
-         */
-        this.items = {};
-        /**
-         * Service register event
-         *
-         * @remarks
-         * `loaders`, `items`, and `rules` are instantiated dumbly
-         * because it is painful to think about how to map the typings..
-         */
-        this.register = register.bind(this);
-    }
+    /**
+     * Built config object
+     */
+    config = {};
+    /**
+     * Registered loaders
+     */
+    loaders = {};
+    /**
+     * Registered rules
+     */
+    rules = {};
+    /**
+     * Registered items
+     */
+    items = {};
+    /**
+     * Service register event
+     *
+     * @remarks
+     * `loaders`, `items`, and `rules` are instantiated dumbly
+     * because it is painful to think about how to map the typings..
+     */
+    register = register.bind(this);
     /**
      * Make webpack configuration
      */
@@ -67,24 +64,6 @@ export class Build extends Service {
     getRule(ident) {
         return this.rules[ident];
     }
-    /**
-     * Set Rule
-     */
-    setRule(name, input) {
-        this.rules[name] =
-            input instanceof Rule
-                ? input
-                : isFunction(input)
-                    ? input(this.makeRule())
-                    : this.makeRule(input);
-        return this;
-    }
-    /**
-     * Make Rule
-     */
-    makeRule(options) {
-        return new Rule(() => this.app, options);
-    }
     /**
      * Get loader
      */
@@ -110,7 +89,7 @@ export class Build extends Service {
      * Make loader
      */
     makeLoader(src, definition) {
-        return new Loader(() => this.app, src);
+        return new Loader(() => this.app, src, definition);
     }
     /**
      * Get item
@@ -140,6 +119,24 @@ export class Build extends Service {
     makeItem(options) {
         return new Item(() => this.app, options);
     }
+    /**
+     * Set Rule
+     */
+    setRule(name, input) {
+        this.rules[name] =
+            input instanceof Rule
+                ? input
+                : isFunction(input)
+                    ? input(this.makeRule())
+                    : this.makeRule(input);
+        return this;
+    }
+    /**
+     * Make Rule
+     */
+    makeRule(options) {
+        return new Rule(() => this.app, options);
+    }
 }
 __decorate([
     bind,
@@ -153,18 +150,6 @@ __decorate([
     __metadata("design:paramtypes", [typeof (_a = typeof K !== "undefined" && K) === "function" ? _a : Object]),
     __metadata("design:returntype", Object)
 ], Build.prototype, "getRule", null);
-__decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [typeof (_b = typeof K !== "undefined" && K) === "function" ? _b : Object, Object]),
-    __metadata("design:returntype", Object)
-], Build.prototype, "setRule", null);
-__decorate([
-    bind,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Rule)
-], Build.prototype, "makeRule", null);
 __decorate([
     bind,
     __metadata("design:type", Function),
@@ -174,7 +159,7 @@ __decorate([
 __decorate([
     bind,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [typeof (_c = typeof K !== "undefined" && K) === "function" ? _c : Object, Object]),
+    __metadata("design:paramtypes", [typeof (_b = typeof K !== "undefined" && K) === "function" ? _b : Object, Object]),
     __metadata("design:returntype", Object)
 ], Build.prototype, "setLoader", null);
 __decorate([
@@ -192,7 +177,7 @@ __decorate([
 __decorate([
     bind,
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [typeof (_d = typeof K !== "undefined" && K) === "function" ? _d : Object, Object]),
+    __metadata("design:paramtypes", [typeof (_c = typeof K !== "undefined" && K) === "function" ? _c : Object, Object]),
     __metadata("design:returntype", Object)
 ], Build.prototype, "setItem", null);
 __decorate([
@@ -201,3 +186,15 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Item)
 ], Build.prototype, "makeItem", null);
+__decorate([
+    bind,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [typeof (_d = typeof K !== "undefined" && K) === "function" ? _d : Object, Object]),
+    __metadata("design:returntype", Object)
+], Build.prototype, "setRule", null);
+__decorate([
+    bind,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Rule)
+], Build.prototype, "makeRule", null);

package/lib/shared/base.js

@@ -3,6 +3,7 @@ import { __decorate, __metadata } from "tslib";
 import { bind } from '@roots/bud-support/decorators/bind';
 import isFunction from '@roots/bud-support/lodash/isFunction';
 export default class Base {
+    _app;
     /**
      * Application getter
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-build",
-  "version": "2023.6.5",
+  "version": "2023.6.7",
   "description": "bud.js core module",
   "engines": {
     "node": ">=16"
@@ -85,14 +85,14 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "2023.6.5",
-    "@roots/bud-hooks": "2023.6.5",
+    "@roots/bud-api": "2023.6.7",
+    "@roots/bud-hooks": "2023.6.7",
     "@skypack/package-check": "0.2.2",
     "@types/node": "18.16.12"
   },
   "dependencies": {
-    "@roots/bud-framework": "2023.6.5",
-    "@roots/bud-support": "2023.6.5",
+    "@roots/bud-framework": "2023.6.7",
+    "@roots/bud-support": "2023.6.7",
     "tslib": "2.5.0"
   },
   "volta": {

package/src/config/index.test.ts

@@ -1,4 +1,4 @@
-import {Bud, factory} from '@repo/test-kit/bud'
+import {Bud, factory} from '@repo/test-kit'
 import {beforeEach, describe, expect, it} from 'vitest'
 
 import {Build} from '../service.js'
@@ -64,7 +64,7 @@ describe(`bud.build.config`, function () {
   })
 
   it(`should have expected optimization.runtimeChunk default`, async () => {
-    expect(build.config.optimization?.runtimeChunk).toBe(false)
+    expect(build.config.optimization?.runtimeChunk).toBe(`single`)
   })
 
   it(`should have expected profile default`, async () => {
@@ -80,9 +80,7 @@ describe(`bud.build.config`, function () {
   it(`should have expected resolve.extensions default`, async () => {
     expect(build.config.resolve?.extensions?.sort()).toEqual(
       expect.arrayContaining([
-        `.cjs`,
         `.css`,
-        `.cts`,
         `.js`,
         `.jsx`,
         `.mjs`,

package/src/config/optimization.ts

@@ -29,7 +29,7 @@ export const optimization: Factory<`optimization`> = async ({
       `build.optimization.removeAvailableModules`,
       false,
     ),
-    runtimeChunk: filter(`build.optimization.runtimeChunk`, false),
+    runtimeChunk: filter(`build.optimization.runtimeChunk`, `single`),
     sideEffects: filter(`build.optimization.sideEffects`, isProduction),
     splitChunks: filter(`build.optimization.splitChunks`, false),
     providedExports: filter(

package/src/config/resolve.ts

@@ -16,7 +16,7 @@ export const resolve: Factory<`resolve`> = async bud => {
     extensions: Array.from(
       bud.hooks.filter(
         `build.resolve.extensions`,
-        new Set([`.js`, `.mjs`, `.jsx`, `.cjs`, `.css`]),
+        new Set([`.js`, `.mjs`, `.jsx`, `.css`]),
       ),
     ),
     modules: await bud.hooks.filterAsync(`build.resolve.modules`, [

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/js.ts

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

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/xml.test.ts

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

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'

package/src/service.ts

@@ -85,32 +85,6 @@ export class Build extends Service implements Base.Service {
     return this.rules[ident]
   }
 
-  /**
-   * Set Rule
-   */
-  @bind
-  public setRule<K extends `${keyof Rules & string}`>(
-    name: K,
-    input?: RuleOptions | Rule,
-  ): this {
-    this.rules[name] =
-      input instanceof Rule
-        ? input
-        : isFunction(input)
-        ? input(this.makeRule())
-        : this.makeRule(input as any)
-
-    return this
-  }
-
-  /**
-   * Make Rule
-   */
-  @bind
-  public makeRule(options?: RuleOptions): Rule {
-    return new Rule(() => this.app, options)
-  }
-
   /**
    * Get loader
    */
@@ -148,7 +122,7 @@ export class Build extends Service implements Base.Service {
    */
   @bind
   public makeLoader(src?: string, definition?: string): Loader {
-    return new Loader(() => this.app, src)
+    return new Loader(() => this.app, src, definition)
   }
 
   /**
@@ -193,4 +167,30 @@ export class Build extends Service implements Base.Service {
   public makeItem(options?: Partial<Item['options']>): Item {
     return new Item(() => this.app, options)
   }
+
+  /**
+   * Set Rule
+   */
+  @bind
+  public setRule<K extends `${keyof Rules & string}`>(
+    name: K,
+    input?: RuleOptions | Rule,
+  ): this {
+    this.rules[name] =
+      input instanceof Rule
+        ? input
+        : isFunction(input)
+        ? input(this.makeRule())
+        : this.makeRule(input as any)
+
+    return this
+  }
+
+  /**
+   * Make Rule
+   */
+  @bind
+  public makeRule(options?: RuleOptions): Rule {
+    return new Rule(() => this.app, options)
+  }
 }