@roots/bud-build 6.15.2 → 6.16.0

package/lib/index.d.ts

@@ -25,8 +25,8 @@ declare module '@roots/bud-framework' {
         yml: Loader;
     }
     interface Items {
+        [`css-module`]: Item;
         css: Item;
-        cssModule: Item;
         csv: Item;
         file: Item;
         font: Item;
@@ -40,8 +40,8 @@ declare module '@roots/bud-framework' {
         yml: Item;
     }
     interface Rules {
+        [`css-module`]: Rule;
         css: Rule;
-        cssModule: Rule;
         csv: Rule;
         font: Rule;
         html: Rule;

package/lib/items/index.js

@@ -2,12 +2,11 @@ import isBoolean from '@roots/bud-support/lodash/isBoolean';
 /**
  * CSS loader
  */
-export const css = async ({ makeItem }) => makeItem()
-    .setIdent(`css`)
-    .setLoader(`css`)
-    .setOptions(({ build: { rules }, hooks: { filter } }) => ({
-    importLoaders: rules.css.getUse().length - 2,
-    modules: false,
+export const css = async ({ makeItem }) => makeItem({
+    ident: `css`,
+    loader: `css`,
+    options: { modules: false },
+}).setOptions(({ hooks: { filter } }) => ({
     sourceMap: isBoolean(filter(`build.devtool`, false))
         ? filter(`build.devtool`, false)
         : true,
@@ -15,14 +14,14 @@ export const css = async ({ makeItem }) => makeItem()
 /**
  * CSS module loader
  */
-export const cssModule = async ({ makeItem }) => makeItem()
-    .setIdent(`cssModule`)
-    .setLoader(`css`)
-    .setOptions(({ build: { rules }, hooks: { filter } }) => ({
-    importLoaders: rules.cssModule.getUse().length - 2,
-    modules: true,
-    sourceMap: isBoolean(filter(`build.devtool`, false))
-        ? filter(`build.devtool`, false)
+export const cssModule = async ({ makeItem }) => makeItem({
+    ident: `css-module`,
+    loader: `css`,
+    options: { modules: true },
+}).setOptions(({ build, hooks }) => ({
+    importLoaders: build.rules[`css-module`].getUse().length - 2,
+    sourceMap: isBoolean(hooks.filter(`build.devtool`, false))
+        ? hooks.filter(`build.devtool`, false)
         : true,
 }));
 /**

package/lib/registry/index.js

@@ -1,6 +1,7 @@
 import * as items from '@roots/bud-build/items';
 import * as loaders from '@roots/bud-build/loaders';
 import * as rules from '@roots/bud-build/rules';
+import kebabCase from '@roots/bud-support/lodash/kebabCase';
 /**
  * Register built-in {@link loaders}, {@link items} and {@link rules}
  */
@@ -20,7 +21,7 @@ async function register(bud) {
 /**
  * Registry factory
  */
-const makeRegister = ({ build, hooks, isProduction, module: { resolve }, path }, setRule) => async ([key, factory]) => setRule(key, await factory({
+const makeRegister = ({ build, hooks, isProduction, module: { resolve }, path }, setRule) => async ([key, factory]) => setRule(kebabCase(key), await factory({
     filter: hooks.filter,
     isProduction,
     makeItem: build.makeItem,

package/lib/rules/css.module.js

@@ -1,5 +1,5 @@
 const cssModule = async ({ filter, makeRule, path }) => makeRule()
     .setTest(filter(`pattern.cssModule`))
     .setInclude([() => path(`@src`)])
-    .setUse([`precss`, `cssModule`]);
+    .setUse([`precss`, `css-module`]);
 export { cssModule as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-build",
-  "version": "6.15.2",
+  "version": "6.16.0",
   "description": "bud.js core module",
   "engines": {
     "node": ">=16"
@@ -169,15 +169,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "6.15.2",
-    "@roots/bud-hooks": "6.15.2",
+    "@roots/bud-api": "6.16.0",
+    "@roots/bud-hooks": "6.16.0",
     "@skypack/package-check": "0.2.2",
-    "@types/node": "18.17.5"
+    "@types/node": "18.17.9"
   },
   "dependencies": {
-    "@roots/bud-framework": "6.15.2",
-    "@roots/bud-support": "6.15.2",
-    "tslib": "2.6.1"
+    "@roots/bud-framework": "6.16.0",
+    "@roots/bud-support": "6.16.0",
+    "tslib": "2.6.2"
   },
   "volta": {
     "extends": "../../../package.json"

package/src/index.ts

@@ -32,8 +32,8 @@ declare module '@roots/bud-framework' {
   }
 
   interface Items {
+    [`css-module`]: Item
     css: Item
-    cssModule: Item
     csv: Item
     file: Item
     font: Item
@@ -48,8 +48,8 @@ declare module '@roots/bud-framework' {
   }
 
   interface Rules {
+    [`css-module`]: Rule
     css: Rule
-    cssModule: Rule
     csv: Rule
     font: Rule
     html: Rule

package/src/items/index.ts

@@ -7,31 +7,30 @@ import isBoolean from '@roots/bud-support/lodash/isBoolean'
  * CSS loader
  */
 export const css: Factory<Item> = async ({makeItem}) =>
-  makeItem()
-    .setIdent(`css`)
-    .setLoader(`css`)
-    .setOptions(({build: {rules}, hooks: {filter}}) => ({
-      importLoaders: rules.css.getUse().length - 2,
-      modules: false,
-      sourceMap: isBoolean(filter(`build.devtool`, false))
-        ? filter(`build.devtool`, false)
-        : true,
-    }))
+  makeItem({
+    ident: `css`,
+    loader: `css`,
+    options: {modules: false},
+  }).setOptions(({hooks: {filter}}) => ({
+    sourceMap: isBoolean(filter(`build.devtool`, false))
+      ? filter(`build.devtool`, false)
+      : true,
+  }))
 
 /**
  * CSS module loader
  */
 export const cssModule: Factory<Item> = async ({makeItem}) =>
-  makeItem()
-    .setIdent(`cssModule`)
-    .setLoader(`css`)
-    .setOptions(({build: {rules}, hooks: {filter}}) => ({
-      importLoaders: rules.cssModule.getUse().length - 2,
-      modules: true,
-      sourceMap: isBoolean(filter(`build.devtool`, false))
-        ? filter(`build.devtool`, false)
-        : true,
-    }))
+  makeItem({
+    ident: `css-module`,
+    loader: `css`,
+    options: {modules: true},
+  }).setOptions(({build, hooks}) => ({
+    importLoaders: build.rules[`css-module`].getUse().length - 2,
+    sourceMap: isBoolean(hooks.filter(`build.devtool`, false))
+      ? hooks.filter(`build.devtool`, false)
+      : true,
+  }))
 
 /**
  * CSV loader

package/src/registry/index.ts

@@ -4,6 +4,7 @@ import type {Bud} from '@roots/bud-framework'
 import * as items from '@roots/bud-build/items'
 import * as loaders from '@roots/bud-build/loaders'
 import * as rules from '@roots/bud-build/rules'
+import kebabCase from '@roots/bud-support/lodash/kebabCase'
 
 interface Props {
   filter: Bud[`hooks`][`filter`]
@@ -58,7 +59,7 @@ const makeRegister: makeRegister =
   ({build, hooks, isProduction, module: {resolve}, path}, setRule) =>
   async ([key, factory]) =>
     setRule(
-      key,
+      kebabCase(key),
       await factory({
         filter: hooks.filter,
         isProduction,

package/src/rules/css.module.ts

@@ -4,6 +4,6 @@ const cssModule: Factory = async ({filter, makeRule, path}) =>
   makeRule()
     .setTest(filter(`pattern.cssModule`))
     .setInclude([() => path(`@src`)])
-    .setUse([`precss`, `cssModule`])
+    .setUse([`precss`, `css-module`])
 
 export {cssModule as default}