@roots/bud-build 6.20.0 → 6.22.0

package/README.md

@@ -112,9 +112,6 @@ 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 href="https://www.itineris.co.uk/">
+<img src="https://cdn.roots.io/app/uploads/itineris.svg" alt="Itineris" width="200" height="150"/>
 </a>

package/lib/config/bail.js

@@ -1 +1 @@
-export const bail = async ({ hooks, isProduction }) => hooks.filter(`build.bail`, isProduction);
+export const bail = async ({ context, hooks, isProduction, }) => hooks.filter(`build.bail`, isProduction && !context.ignoreErrors);

package/lib/config/infrastructureLogging.js

@@ -1,19 +1,7 @@
-import logger from '@roots/bud-support/logger';
 export const infrastructureLogging = async (bud) => bud.hooks.filter(`build.infrastructureLogging`, {
-    console: bud.hooks.filter(`build.infrastructureLogging.console`, {
-        ...console,
-        error: (...args) => {
-            logger.unscope().error(...args);
-        },
-        info: (...args) => {
-            logger.unscope().info(...args);
-        },
-        log: (...args) => {
-            logger.unscope().log(...args);
-        },
-        warn: (...args) => {
-            logger.unscope().info(...args);
-        },
-    }),
-    level: bud.hooks.filter(`build.infrastructureLogging.level`, `log`),
+    ...(bud.context?.verbose
+        ? { console, level: `verbose` }
+        : bud.context?.log
+            ? { console, level: `log` }
+            : { level: `none` }),
 });

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/config/optimization.js

@@ -1,6 +1,7 @@
 export const optimization = async ({ hooks: { filter }, isDevelopment, isProduction, mode, }) => filter(`build.optimization`, {
     emitOnErrors: filter(`build.optimization.emitOnErrors`, isDevelopment),
     innerGraph: filter(`build.optimization.innerGraph`, isProduction),
+    mangleExports: filter(`build.optimization.mangleExports`, isProduction),
     mergeDuplicateChunks: filter(`build.optimization.mergeDuplicateChunks`, isProduction),
     minimize: filter(`build.optimization.minimize`, isProduction),
     minimizer: filter(`build.optimization.minimizer`, []),

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/lib/loaders/index.js

@@ -1,9 +1,53 @@
 import * as MiniCss from '@roots/bud-support/mini-css-extract-plugin';
-export const css = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/css-loader`, import.meta.url));
-export const csv = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/csv-loader`, import.meta.url));
-export const file = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/file-loader`, import.meta.url));
-export const html = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/html-loader`, import.meta.url));
-export const remark = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/remark-loader`, import.meta.url));
-export const minicss = async ({ makeLoader, resolve }) => makeLoader(MiniCss.loader);
-export const style = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/style-loader`, import.meta.url));
-export const yml = async ({ makeLoader, resolve }) => makeLoader(await resolve(`@roots/bud-support/yml-loader`, import.meta.url));
+export const css = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/css-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/css-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const csv = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/csv-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/csv-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const file = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/file-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/csv-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const html = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/html-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/html-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const remark = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/remark-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/remark-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const minicss = async ({ makeLoader, resolve }) => {
+    return makeLoader(MiniCss.loader);
+};
+export const style = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/style-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/style-loader not found`);
+    }
+    return makeLoader(path);
+};
+export const yml = async ({ makeLoader, resolve }) => {
+    const path = await resolve(`@roots/bud-support/yml-loader`, import.meta.url);
+    if (!path) {
+        throw new Error(`@roots/bud-support/yml-loader not found`);
+    }
+    return makeLoader(path);
+};

package/lib/service/index.js

@@ -59,7 +59,6 @@ class Build extends Service {
             .then(async (records) => await Promise.all(Object.entries(records).map(async ([prop, factory]) => {
             const value = await factory(this.app).catch(this.catch);
             if (isUndefined(value)) {
-                this.logger.success(`omitting:`, prop, `(undefined)`);
                 return;
             }
             Object.defineProperty(this.config, prop, {
@@ -69,12 +68,11 @@ class Build extends Service {
                 writable: true,
             });
             this.logger
-                .success(`defined:`, prop, `(${typeof this.config[prop]})`)
+                .log(`Defined:`, prop, `(${typeof this.config[prop]})`)
                 .info(prop, `info:`, this.config[prop]);
         })))
             .catch(this.catch);
-        this.logger.success(`configuration built`);
-        this.logger.info(this.config);
+        this.logger.scope(this.app.label, `build`).info(`built`, this.config);
         await this.app.hooks.fire(`build.after`, this.app).catch(this.catch);
         return Object.entries(this.config).reduce((a, [k, v]) => {
             if (isUndefined(v))
@@ -104,7 +102,7 @@ class Build extends Service {
      * {@link BudBuild.setItem}
      */
     setItem(ident, definition) {
-        this.logger.log(`build.setItem`, ident);
+        this.logger.log(`Registered item:`, ident);
         const maybeOptionsCallback = isUndefined(definition)
             ? { ident, loader: ident }
             : definition;
@@ -119,7 +117,7 @@ class Build extends Service {
      * {@link BudBuild.setLoader}
      */
     setLoader(name, definition) {
-        this.logger.log(`build.setLoader`, name);
+        this.logger.log(`Registered loader:`, name);
         const loader = isUndefined(definition)
             ? this.makeLoader(name)
             : definition instanceof Loader
@@ -133,7 +131,7 @@ class Build extends Service {
      * {@link BudBuild.setRule}
      */
     setRule(name, definition) {
-        this.logger.log(`build.setRule`, name);
+        this.logger.log(`Registered rule:`, name);
         const rule = definition instanceof Rule
             ? definition
             : isFunction(definition)

package/package.json

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

package/src/config/bail.ts

@@ -1,4 +1,7 @@
 import type {Factory} from '@roots/bud-build/config'
 
-export const bail: Factory<'bail'> = async ({hooks, isProduction}) =>
-  hooks.filter(`build.bail`, isProduction)
+export const bail: Factory<'bail'> = async ({
+  context,
+  hooks,
+  isProduction,
+}) => hooks.filter(`build.bail`, isProduction && !context.ignoreErrors)

package/src/config/infrastructureLogging.ts

@@ -1,25 +1,12 @@
 import type {Factory} from '@roots/bud-build/config'
 
-import logger from '@roots/bud-support/logger'
-
 export const infrastructureLogging: Factory<
   `infrastructureLogging`
 > = async bud =>
   bud.hooks.filter(`build.infrastructureLogging`, {
-    console: bud.hooks.filter(`build.infrastructureLogging.console`, {
-      ...console,
-      error: (...args: any[]) => {
-        logger.unscope().error(...args)
-      },
-      info: (...args: any[]) => {
-        logger.unscope().info(...args)
-      },
-      log: (...args: any[]) => {
-        logger.unscope().log(...args)
-      },
-      warn: (...args: any[]) => {
-        logger.unscope().info(...args)
-      },
-    }),
-    level: bud.hooks.filter(`build.infrastructureLogging.level`, `log`),
+    ...(bud.context?.verbose
+      ? {console, level: `verbose`}
+      : bud.context?.log
+        ? {console, level: `log`}
+        : {level: `none`}),
   })

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/config/optimization.ts

@@ -9,6 +9,10 @@ export const optimization: Factory<`optimization`> = async ({
   filter(`build.optimization`, {
     emitOnErrors: filter(`build.optimization.emitOnErrors`, isDevelopment),
     innerGraph: filter(`build.optimization.innerGraph`, isProduction),
+    mangleExports: filter(
+      `build.optimization.mangleExports`,
+      isProduction,
+    ),
     mergeDuplicateChunks: filter(
       `build.optimization.mergeDuplicateChunks`,
       isProduction,
@@ -21,6 +25,7 @@ export const optimization: Factory<`optimization`> = async ({
       `build.optimization.providedExports`,
       isProduction,
     ),
+
     /**
      * Will be new default in webpack 6
      * @see {@link https://webpack.js.org/configuration/optimization/#optimizationremoveavailablemodules}

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,
   }))
 

package/src/loaders/index.ts

@@ -3,40 +3,83 @@ import type {Loader} from '@roots/bud-framework/services/build'
 
 import * as MiniCss from '@roots/bud-support/mini-css-extract-plugin'
 
-export const css: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/css-loader`, import.meta.url),
+export const css: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/css-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/css-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const csv: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/csv-loader`, import.meta.url),
+export const csv: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/csv-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/csv-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const file: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/file-loader`, import.meta.url),
+export const file: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/file-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/csv-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const html: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/html-loader`, import.meta.url),
+export const html: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/html-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/html-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const remark: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/remark-loader`, import.meta.url),
+export const remark: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/remark-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/remark-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const minicss: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(MiniCss.loader)
+export const minicss: Factory<Loader> = async ({makeLoader, resolve}) => {
+  return makeLoader(MiniCss.loader)
+}
 
-export const style: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/style-loader`, import.meta.url),
+export const style: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/style-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/style-loader not found`)
+  }
+  return makeLoader(path)
+}
 
-export const yml: Factory<Loader> = async ({makeLoader, resolve}) =>
-  makeLoader(
-    await resolve(`@roots/bud-support/yml-loader`, import.meta.url),
+export const yml: Factory<Loader> = async ({makeLoader, resolve}) => {
+  const path = await resolve(
+    `@roots/bud-support/yml-loader`,
+    import.meta.url,
   )
+  if (!path) {
+    throw new Error(`@roots/bud-support/yml-loader not found`)
+  }
+  return makeLoader(path)
+}

package/src/service/index.ts

@@ -98,8 +98,8 @@ class Build extends Service implements BudBuild {
           await Promise.all(
             Object.entries(records).map(async ([prop, factory]) => {
               const value = await factory(this.app).catch(this.catch)
+
               if (isUndefined(value)) {
-                this.logger.success(`omitting:`, prop, `(undefined)`)
                 return
               }
 
@@ -111,16 +111,14 @@ class Build extends Service implements BudBuild {
               })
 
               this.logger
-                .success(`defined:`, prop, `(${typeof this.config[prop]})`)
+                .log(`Defined:`, prop, `(${typeof this.config[prop]})`)
                 .info(prop, `info:`, this.config[prop])
             }),
           ),
       )
       .catch(this.catch)
 
-    this.logger.success(`configuration built`)
-    this.logger.info(this.config)
-
+    this.logger.scope(this.app.label, `build`).info(`built`, this.config)
     await this.app.hooks.fire(`build.after`, this.app).catch(this.catch)
 
     return Object.entries(this.config).reduce((a, [k, v]) => {
@@ -161,7 +159,8 @@ class Build extends Service implements BudBuild {
     ident: K,
     definition?: ((item: Items[K]) => Items[K]) | Items[K],
   ): this {
-    this.logger.log(`build.setItem`, ident)
+    this.logger.log(`Registered item:`, ident)
+
     const maybeOptionsCallback = isUndefined(definition)
       ? {ident, loader: ident}
       : definition
@@ -184,7 +183,8 @@ class Build extends Service implements BudBuild {
     name: K,
     definition?: any,
   ): this {
-    this.logger.log(`build.setLoader`, name)
+    this.logger.log(`Registered loader:`, name)
+
     const loader = isUndefined(definition)
       ? this.makeLoader(name)
       : definition instanceof Loader
@@ -205,7 +205,7 @@ class Build extends Service implements BudBuild {
     name: K,
     definition?: Rule | RuleOptions,
   ): this {
-    this.logger.log(`build.setRule`, name)
+    this.logger.log(`Registered rule:`, name)
     const rule =
       definition instanceof Rule
         ? definition