@roots/bud-build 2024.7.23-8 → 2024.7.24-9

package/lib/config/module.js

@@ -1,7 +1,7 @@
 export const module = async ({ build: { rules }, hooks: { filter }, path, }) => filter(`build.module`, {
-    noParse: getNoParse(filter),
+    noParse: filter(`build.module.noParse`, undefined),
     rules: getRules({ filter, path, rules }),
-    unsafeCache: getUnsafeCache(filter),
+    unsafeCache: filter(`build.module.unsafeCache`, undefined),
 });
 /**
  * Get all module.rules
@@ -18,7 +18,7 @@ const getRules = ({ filter, path, rules }) => {
                 ? {
                     oneOf: [
                         rules[`inline-image`]?.toWebpack?.(),
-                        rules.image.toWebpack?.(),
+                        rules.image?.toWebpack?.(),
                     ].filter(Boolean),
                     test: filter(`pattern.image`),
                 }
@@ -27,7 +27,7 @@ const getRules = ({ filter, path, rules }) => {
                 ? {
                     oneOf: [
                         rules[`inline-font`]?.toWebpack?.(),
-                        rules.font.toWebpack(),
+                        rules.font?.toWebpack?.(),
                     ].filter(Boolean),
                     test: filter(`pattern.font`),
                 }
@@ -36,61 +36,38 @@ const getRules = ({ filter, path, rules }) => {
                 ? {
                     oneOf: [
                         rules[`inline-svg`]?.toWebpack?.(),
-                        rules.svg.toWebpack(),
+                        rules.svg?.toWebpack?.(),
                     ].filter(Boolean),
                     test: filter(`pattern.svg`),
                 }
                 : undefined,
         ]),
-        {
-            oneOf: [
-                ...filter(`build.module.rules.oneOf`, [
-                    ...getDefinedRules({ rules }),
-                    ...makeIssuerRuleSet({ filter, path, rules }),
-                ]),
-            ].filter(Boolean),
-        },
+        ...filter(`build.module.rules.oneOf`, [
+            ...makeDefinedRuleSet({ rules }),
+            ...makeIssuerRuleSet({ filter, path, rules }),
+        ]).filter(Boolean),
         ...filter(`build.module.rules.after`, []),
     ].filter(Boolean);
 };
 /**
- * Get the standard rules defined in the bud config, extensions, etc.
+ * Make defined rule set
  */
-const getDefinedRules = ({ rules }) => {
-    return [
-        ...Object.entries(rules)
-            .filter(([key, _]) => {
-            return !DEFINED.includes(key) && !RESOURCES.includes(key);
-        })
-            .map(([_, value]) => value),
-        ...DEFINED.map(key => rules[key]),
-    ]
+const makeDefinedRuleSet = ({ rules }) => {
+    return Object.entries(rules)
+        .filter(([key]) => ![
+        `font`,
+        `image`,
+        `inline-font`,
+        `inline-image`,
+        `inline-svg`,
+        `svg`,
+    ].includes(key))
+        .map(([, rule]) => rule)
         .filter(Boolean)
-        .map(rule => (`toWebpack` in rule ? rule.toWebpack() : rule));
+        .map(rule => {
+        return `toWebpack` in rule ? rule.toWebpack() : rule;
+    });
 };
-const RESOURCES = [
-    `image`,
-    `font`,
-    `svg`,
-    `inline-font`,
-    `inline-image`,
-    `inline-svg`,
-];
-const DEFINED = [
-    `csv`,
-    `toml`,
-    `yml`,
-    `json`,
-    `html`,
-    `webp`,
-    `css-module`,
-    `css`,
-    `sass-module`,
-    `sass`,
-    `vue`,
-    `js`,
-    `ts`,
-];
 /**
  * Get rules for css and css-module imports issued by non-css files.
  */
@@ -126,9 +103,3 @@ const makeIssuerRuleSet = ({ filter, path, rules }) => {
         });
     return results;
 };
-const getNoParse = (filter) => filter(`build.module.noParse`, undefined);
-/**
- * By leaving undefined, webpack will strongly cache parsed modules from node_modules
- * but leave the rest. This is the default behavior.
- */
-const getUnsafeCache = (filter) => filter(`build.module.unsafeCache`, undefined);

package/lib/items/index.js

@@ -5,8 +5,8 @@ import isBoolean from '@roots/bud-support/isBoolean';
 export const css = async ({ makeItem }) => makeItem({
     ident: `css`,
     loader: `css`,
-    options: { modules: false },
 }).setOptions(({ hooks: { filter } }) => ({
+    modules: false,
     sourceMap: isBoolean(filter(`build.devtool`))
         ? filter(`build.devtool`)
         : true,

package/lib/rules/css.module.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-build",
-  "version": "2024.7.23-8",
+  "version": "2024.7.24-9",
   "description": "bud.js core module",
   "engines": {
     "node": ">=16"
@@ -169,14 +169,14 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "2024.7.23-8",
-    "@roots/bud-hooks": "2024.7.23-8",
+    "@roots/bud-api": "2024.7.24-9",
+    "@roots/bud-hooks": "2024.7.24-9",
     "@skypack/package-check": "0.2.2",
     "@types/node": "20.14.9"
   },
   "dependencies": {
-    "@roots/bud-framework": "2024.7.23-8",
-    "@roots/bud-support": "2024.7.23-8",
+    "@roots/bud-framework": "2024.7.24-9",
+    "@roots/bud-support": "2024.7.24-9",
     "tslib": "2.6.3"
   },
   "volta": {

package/src/config/module.ts

@@ -13,9 +13,9 @@ export const module: Factory<`module`> = async ({
   path,
 }) =>
   filter(`build.module`, {
-    noParse: getNoParse(filter),
+    noParse: filter(`build.module.noParse`, undefined),
     rules: getRules({filter, path, rules}),
-    unsafeCache: getUnsafeCache(filter),
+    unsafeCache: filter(`build.module.unsafeCache`, undefined),
   })
 
 /**
@@ -33,7 +33,7 @@ const getRules = ({filter, path, rules}: Props): Array<RuleSetRule> => {
         ? {
             oneOf: [
               rules[`inline-image`]?.toWebpack?.(),
-              rules.image.toWebpack?.(),
+              rules.image?.toWebpack?.(),
             ].filter(Boolean),
             test: filter(`pattern.image`),
           }
@@ -43,7 +43,7 @@ const getRules = ({filter, path, rules}: Props): Array<RuleSetRule> => {
         ? {
             oneOf: [
               rules[`inline-font`]?.toWebpack?.(),
-              rules.font.toWebpack(),
+              rules.font?.toWebpack?.(),
             ].filter(Boolean),
             test: filter(`pattern.font`),
           }
@@ -53,65 +53,45 @@ const getRules = ({filter, path, rules}: Props): Array<RuleSetRule> => {
         ? {
             oneOf: [
               rules[`inline-svg`]?.toWebpack?.(),
-              rules.svg.toWebpack(),
+              rules.svg?.toWebpack?.(),
             ].filter(Boolean),
             test: filter(`pattern.svg`),
           }
         : undefined,
     ]),
-    {
-      oneOf: [
-        ...filter(`build.module.rules.oneOf`, [
-          ...getDefinedRules({rules}),
-          ...makeIssuerRuleSet({filter, path, rules}),
-        ]),
-      ].filter(Boolean),
-    },
+
+    ...filter(`build.module.rules.oneOf`, [
+      ...makeDefinedRuleSet({rules}),
+      ...makeIssuerRuleSet({filter, path, rules}),
+    ]).filter(Boolean),
+
     ...filter(`build.module.rules.after`, []),
   ].filter(Boolean)
 }
 
 /**
- * Get the standard rules defined in the bud config, extensions, etc.
+ * Make defined rule set
  */
-const getDefinedRules = ({rules}: Partial<Props>) => {
-  return [
-    ...Object.entries(rules)
-      .filter(([key, _]) => {
-        return !DEFINED.includes(key) && !RESOURCES.includes(key)
-      })
-      .map(([_, value]) => value),
-    ...DEFINED.map(key => rules[key]),
-  ]
+const makeDefinedRuleSet = ({rules}: {rules: Props['rules']}) => {
+  return Object.entries(rules)
+    .filter(
+      ([key]) =>
+        ![
+          `font`,
+          `image`,
+          `inline-font`,
+          `inline-image`,
+          `inline-svg`,
+          `svg`,
+        ].includes(key),
+    )
+    .map(([, rule]) => rule)
     .filter(Boolean)
-    .map(rule => (`toWebpack` in rule ? rule.toWebpack() : rule))
+    .map(rule => {
+      return `toWebpack` in rule ? rule.toWebpack() : rule
+    })
 }
 
-const RESOURCES = [
-  `image`,
-  `font`,
-  `svg`,
-  `inline-font`,
-  `inline-image`,
-  `inline-svg`,
-]
-
-const DEFINED = [
-  `csv`,
-  `toml`,
-  `yml`,
-  `json`,
-  `html`,
-  `webp`,
-  `css-module`,
-  `css`,
-  `sass-module`,
-  `sass`,
-  `vue`,
-  `js`,
-  `ts`,
-]
-
 /**
  * Get rules for css and css-module imports issued by non-css files.
  */
@@ -152,13 +132,3 @@ const makeIssuerRuleSet = ({filter, path, rules}: Props) => {
 
   return results
 }
-
-const getNoParse = (filter: Props[`filter`]) =>
-  filter(`build.module.noParse`, undefined)
-
-/**
- * By leaving undefined, webpack will strongly cache parsed modules from node_modules
- * but leave the rest. This is the default behavior.
- */
-const getUnsafeCache = (filter: Props[`filter`]) =>
-  filter(`build.module.unsafeCache`, undefined)

package/src/items/index.ts

@@ -10,8 +10,8 @@ export const css: Factory<Item> = async ({makeItem}) =>
   makeItem({
     ident: `css`,
     loader: `css`,
-    options: {modules: false},
   }).setOptions(({hooks: {filter}}) => ({
+    modules: false,
     sourceMap: isBoolean(filter(`build.devtool`))
       ? filter(`build.devtool`)
       : true,

package/src/rules/css.module.ts

@@ -3,7 +3,7 @@ import type {Factory} from '@roots/bud-build/registry'
 const cssModule: Factory = async ({filter, makeRule, path}) =>
   makeRule()
     .setTest(filter(`pattern.cssModule`))
-    .setInclude([() => path(`@src`)])
+    .setInclude([({path}) => path(`@src`)])
     .setUse([`precss`, `css-module`])
 
 export {cssModule as default}