@roots/bud-build 2024.5.3-7 → 2024.5.5-8

package/README.md

@@ -112,9 +112,3 @@ However, the amount of effort needed to maintain and develop new features and pr
 <a href="https://worksitesafety.ca/careers/">
 <img src="https://cdn.roots.io/app/uploads/worksite-safety.svg" alt="Worksite Safety" width="200" height="150"/>
 </a>
-<a href="https://www.copiadigital.com/">
-<img src="https://cdn.roots.io/app/uploads/copia-digital.svg" alt="Copia Digital" width="200" height="150"/>
-</a>
-<a href="https://www.freave.com/">
-<img src="https://cdn.roots.io/app/uploads/freave.svg" alt="Freave" width="200" height="150"/>
-</a>

package/lib/config/module.js

@@ -83,10 +83,10 @@ const DEFINED = [
     `json`,
     `html`,
     `webp`,
-    `scss-module`,
-    `scss`,
     `css-module`,
     `css`,
+    `sass-module`,
+    `sass`,
     `vue`,
     `js`,
     `ts`,
@@ -110,6 +110,20 @@ const makeIssuerRuleSet = ({ filter, path, rules }) => {
             test: filter(`pattern.css`),
             use: rules[`css`].toWebpack?.().use,
         });
+    rules[`sass-module`]?.toWebpack?.().use &&
+        results.push({
+            exclude: [path(`@src`)],
+            issuer: { not: filter(`pattern.sassModule`) },
+            test: filter(`pattern.sassModule`),
+            use: rules[`sass-module`].toWebpack?.().use,
+        });
+    rules[`sass`]?.toWebpack?.().use &&
+        results.push({
+            exclude: [path(`@src`)],
+            issuer: { not: filter(`pattern.sass`) },
+            test: filter(`pattern.sass`),
+            use: rules[`sass`].toWebpack?.().use,
+        });
     return results;
 };
 const getNoParse = (filter) => filter(`build.module.noParse`, undefined);

package/lib/items/index.js

@@ -7,8 +7,8 @@ export const css = async ({ makeItem }) => makeItem({
     loader: `css`,
     options: { modules: false },
 }).setOptions(({ hooks: { filter } }) => ({
-    sourceMap: isBoolean(filter(`build.devtool`, false))
-        ? filter(`build.devtool`, false)
+    sourceMap: isBoolean(filter(`build.devtool`))
+        ? filter(`build.devtool`)
         : true,
 }));
 /**
@@ -17,11 +17,11 @@ export const css = async ({ makeItem }) => makeItem({
 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)
+}).setOptions(({ build, hooks: { filter } }) => ({
+    importLoaders: build.getRule(`css-module`).getUse().length - 2,
+    modules: { namedExport: false },
+    sourceMap: isBoolean(filter(`build.devtool`))
+        ? filter(`build.devtool`)
         : true,
 }));
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-build",
-  "version": "2024.5.3-7",
+  "version": "2024.5.5-8",
   "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.5.3-7",
-    "@roots/bud-hooks": "2024.5.3-7",
+    "@roots/bud-api": "2024.5.5-8",
+    "@roots/bud-hooks": "2024.5.5-8",
     "@skypack/package-check": "0.2.2",
-    "@types/node": "20.10.5"
+    "@types/node": "20.12.8"
   },
   "dependencies": {
-    "@roots/bud-framework": "2024.5.3-7",
-    "@roots/bud-support": "2024.5.3-7",
+    "@roots/bud-framework": "2024.5.5-8",
+    "@roots/bud-support": "2024.5.5-8",
     "tslib": "2.6.2"
   },
   "volta": {

package/src/config/module.ts

@@ -103,10 +103,10 @@ const DEFINED = [
   `json`,
   `html`,
   `webp`,
-  `scss-module`,
-  `scss`,
   `css-module`,
   `css`,
+  `sass-module`,
+  `sass`,
   `vue`,
   `js`,
   `ts`,
@@ -134,6 +134,22 @@ const makeIssuerRuleSet = ({filter, path, rules}: Props) => {
       use: rules[`css`].toWebpack?.().use,
     })
 
+  rules[`sass-module`]?.toWebpack?.().use &&
+    results.push({
+      exclude: [path(`@src`)],
+      issuer: {not: filter(`pattern.sassModule`)},
+      test: filter(`pattern.sassModule`),
+      use: rules[`sass-module`].toWebpack?.().use,
+    })
+
+  rules[`sass`]?.toWebpack?.().use &&
+    results.push({
+      exclude: [path(`@src`)],
+      issuer: {not: filter(`pattern.sass`)},
+      test: filter(`pattern.sass`),
+      use: rules[`sass`].toWebpack?.().use,
+    })
+
   return results
 }
 

package/src/items/index.ts

@@ -12,8 +12,8 @@ export const css: Factory<Item> = async ({makeItem}) =>
     loader: `css`,
     options: {modules: false},
   }).setOptions(({hooks: {filter}}) => ({
-    sourceMap: isBoolean(filter(`build.devtool`, false))
-      ? filter(`build.devtool`, false)
+    sourceMap: isBoolean(filter(`build.devtool`))
+      ? filter(`build.devtool`)
       : true,
   }))
 
@@ -24,11 +24,11 @@ export const cssModule: Factory<Item> = 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)
+  }).setOptions(({build, hooks: {filter}}) => ({
+    importLoaders: build.getRule(`css-module`).getUse().length - 2,
+    modules: {namedExport: false},
+    sourceMap: isBoolean(filter(`build.devtool`))
+      ? filter(`build.devtool`)
       : true,
   }))