@roots/bud-build 5.7.6 → 5.8.1

package/lib/cjs/Build/config/builder.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
-const builder_unwrap_1 = require("./builder.unwrap");
 const filenameFormat_1 = require("./filenameFormat");
 /**
  * Initializes configuration builder hooks
  *
  * @remarks
  * All hooks in the `build` namespace are initialized here with
- * the exception of `build.cache` which is handled in {@link Framework.cache}
+ * the exception of `build.cache` which is handled in {@link Bud.cache}
  *
- * @param app - the Framework instance
+ * @param app - the Bud instance
  * @returns Promise
  *
  * @public
  */
 async function build(app) {
-    /**
-     * App bound unwrap
-     */
-    const unwrap = builder_unwrap_1.unwrap.bind(app);
     app.hooks
-        .on('build.cache', () => app.cache.configuration)
+        .on('build.bail', () => app.isProduction)
+        .hooks.on('build.cache', () => app.cache.configuration)
         .hooks.on('build.context', () => app.context.projectDir)
-        .hooks.on('build.mode', app.mode)
+        .hooks.on('build.infrastructureLogging', () => ({
+        console: app.hooks.filter('build.infrastructureLogging.console'),
+        level: app.hooks.filter('build.infrastructureLogging.level'),
+    }))
+        .hooks.on('build.mode', () => app.mode)
         .hooks.on('build.module', () => ({
         noParse: app.hooks.filter('build.module.noParse'),
         rules: app.hooks.filter('build.module.rules'),
@@ -46,6 +46,10 @@ async function build(app) {
         path: app.hooks.filter('build.output.path'),
         pathinfo: app.hooks.filter('build.output.pathinfo'),
         publicPath: app.hooks.filter('build.output.publicPath'),
+    }))
+        .hooks.async('build.resolve.alias', async () => ({
+        '@src': app.path('@src'),
+        '@dist': app.path('@dist'),
     }))
         .hooks.on('build.output.assetModuleFilename', () => (0, filenameFormat_1.filenameFormat)(app, '[ext]'))
         .hooks.on('build.output.chunkFilename', () => (0, filenameFormat_1.filenameFormat)(app))
@@ -76,42 +80,7 @@ async function build(app) {
     })
         .hooks.on('build.target', () => app.project.has('manifest.browserslist') &&
         app.project.isArray('manifest.browserslist')
-        ? `browserslist:${app.path('package.json')}`
-        : undefined)
-        .hooks.on('build.infrastructureLogging', () => ({
-        console: app.hooks.filter('build.infrastructureLogging.console'),
-    }));
-    /**
-     * Safe
-     */
-    app.hooks
-        .on('build.bail', unwrap('build.bail'))
-        .hooks.on('build.devtool', unwrap('build.devtool'))
-        .hooks.on('build.loader', unwrap('build.loader'))
-        .hooks.on('build.module.rules.before', unwrap('build.module.rules.before'))
-        .hooks.on('build.module.rules.after', unwrap('build.module.rules.after'))
-        .hooks.on('build.module.unsafeCache', unwrap('build.module.unsafeCache'))
-        .hooks.on('build.module.noParse', unwrap('build.module.noParse'))
-        .hooks.on('build.infrastructureLogging.level', unwrap('build.infrastructureLogging.level'))
-        .hooks.on('build.infrastructureLogging.console', unwrap('build.infrastructureLogging.console'))
-        .hooks.on('build.node', unwrap('build.node'))
-        .hooks.on('build.optimization.emitOnErrors', unwrap('build.optimization.emitOnErrors'))
-        .hooks.on('build.optimization.minimize', unwrap('build.optimization.minimize'))
-        .hooks.on('build.optimization.minimizer', unwrap('build.optimization.minimizer'))
-        .hooks.on('build.optimization.moduleIds', unwrap('build.optimization.moduleIds'))
-        .hooks.on('build.optimization.removeEmptyChunks', unwrap('build.optimization.removeEmptyChunks'))
-        .hooks.on('build.optimization.runtimeChunk', unwrap('build.optimization.runtimeChunk'))
-        .hooks.on('build.optimization.splitChunks', unwrap('build.optimization.splitChunks'))
-        .hooks.on('build.output.clean', unwrap('build.output.clean'))
-        .hooks.on('build.output.pathinfo', unwrap('build.output.pathinfo'))
-        .hooks.on('build.output.publicPath', unwrap('build.output.publicPath', 'auto'))
-        .hooks.on('build.parallelism', unwrap('build.parallelism'))
-        .hooks.on('build.performance', unwrap('build.performance'))
-        .hooks.on('build.profile', unwrap('build.profile'))
-        .hooks.async('build.resolve.alias', unwrap('build.resolve.alias'))
-        .hooks.on('build.resolve.extensions', unwrap('build.resolve.extensions'))
-        .hooks.on('build.stats', unwrap('build.stats'))
-        .hooks.on('build.watch', unwrap('build.watch'))
-        .hooks.on('build.watchOptions', unwrap('build.watchOptions'));
+        ? `browserslist:${app.path('./package.json')}`
+        : undefined);
 }
 exports.build = build;

package/lib/cjs/Build/config/filenameFormat.js

@@ -4,14 +4,14 @@ exports.filenameFormat = void 0;
 /**
  * Filename
  *
- * @param app - Framework
+ * @param app - Bud
  * @param ext - Filename extension
  *
  * @returns filename format
  *
  * @public
  */
-const filenameFormat = (app, ext) => app.store.is('features.hash', true)
-    ? app.store.get('hashFormat').concat(ext ?? '.js')
-    : app.store.get('fileFormat').concat(ext ?? '.js');
+const filenameFormat = (app, ext) => app.hooks.filter('feature.hash')
+    ? app.hooks.filter('value.hashFormat').concat(ext ?? '.js')
+    : app.hooks.filter('value.fileFormat').concat(ext ?? '.js');
 exports.filenameFormat = filenameFormat;

package/lib/cjs/Build/index.js

@@ -28,18 +28,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Build = void 0;
-const Framework = __importStar(require("@roots/bud-framework"));
+const Bud = __importStar(require("@roots/bud-framework"));
 const bud_support_1 = require("@roots/bud-support");
 const lodash_1 = require("lodash");
-const Item_1 = require("../Item");
-const Loader_1 = require("../Loader");
-const Rule_1 = require("../Rule");
+const Item_1 = __importDefault(require("../Item"));
+const items = __importStar(require("../items"));
+const Loader_1 = __importDefault(require("../Loader"));
+const loaders = __importStar(require("../loaders"));
+const Rule_1 = __importDefault(require("../Rule"));
+const rules = __importStar(require("../rules"));
 const config = __importStar(require("./config"));
-const items = __importStar(require("./items"));
-const loaders = __importStar(require("./loaders"));
-const rules = __importStar(require("./rules"));
 const { isUndefined } = bud_support_1.lodash;
 const { ensureFile, writeFile } = bud_support_1.fs;
 /**
@@ -47,7 +50,7 @@ const { ensureFile, writeFile } = bud_support_1.fs;
  *
  * @public
  */
-class Build extends Framework.Service {
+class Build extends Bud.Service {
     constructor() {
         super(...arguments);
         /**
@@ -62,10 +65,7 @@ class Build extends Framework.Service {
      * @decorator `@bind`
      */
     async registered() {
-        this.app.hooks
-            .action('event.build.before', async (app) => app.time(`build.make`))
-            .hooks.action('event.build.after', async (app) => app.timeEnd(`build.make`))
-            .hooks.action('event.build.after', this.writeFinalConfig);
+        this.app.hooks.action('event.build.after', this.writeFinalConfig);
     }
     /**
      * Make webpack configuration
@@ -76,7 +76,7 @@ class Build extends Framework.Service {
     async make() {
         await this.app.hooks.fire('event.build.before');
         await Promise.all([
-            ['entry', true],
+            ['entry'],
             ['plugins', true],
             ['resolve', true],
             ['bail'],
@@ -101,29 +101,18 @@ class Build extends Framework.Service {
             ['target'],
             ['watch'],
             ['watchOptions'],
-        ]
-            .map(this.memoMap)
-            .filter(Boolean)
-            .map(this.memoMapValue));
+        ].map(async ([propKey, isAsync]) => {
+            const propValue = isAsync === true
+                ? await this.app.hooks.filterAsync(`build.${propKey}`)
+                : this.app.hooks.filter(`build.${propKey}`);
+            if (isUndefined(propValue))
+                return;
+            Object.assign(this.config, { [propKey]: propValue });
+            return Promise.resolve();
+        }));
         await this.app.hooks.fire('event.build.after');
         return this.config;
     }
-    memoMap(...args) {
-        const [[key, ...rest]] = args;
-        if (!this.app.hooks.has(`build.${key}`))
-            return false;
-        const type = rest.length && rest.shift() ? true : false;
-        const count = this.app.hooks.count(`build.${key}`);
-        return [key, type, count];
-    }
-    async memoMapValue([propKey, isAsync, _count]) {
-        const propValue = isAsync === true
-            ? await this.app.hooks.filterAsync(`build.${propKey}`)
-            : this.app.hooks.filter(`build.${propKey}`);
-        if (isUndefined(propValue))
-            return;
-        Object.assign(this.config, { [propKey]: propValue });
-    }
     /**
      * Service register event
      *
@@ -175,7 +164,7 @@ class Build extends Framework.Service {
      * @decorator `@bind`
      */
     makeRule(options) {
-        return new Rule_1.Rule(() => this.app, options);
+        return new Rule_1.default(() => this.app, options);
     }
     /**
      * Set a rule
@@ -201,7 +190,7 @@ class Build extends Framework.Service {
      * @decorator `@bind`
      */
     makeLoader(options) {
-        return new Loader_1.Loader(() => this.app, options);
+        return new Loader_1.default(() => this.app, options);
     }
     /**
      * Set a rule
@@ -230,7 +219,7 @@ class Build extends Framework.Service {
      * @decorator `@bind`
      */
     makeItem(options) {
-        return new Item_1.Item(() => this.app, options);
+        return new Item_1.default(() => this.app, options);
     }
     /**
      * Write final configuration to storage directory
@@ -255,13 +244,6 @@ __decorate([
 __decorate([
     bud_support_1.bind
 ], Build.prototype, "make", null);
-__decorate([
-    bud_support_1.bind
-], Build.prototype, "memoMap", null);
-__decorate([
-    bud_support_1.bind,
-    (0, bud_support_1.memo)()
-], Build.prototype, "memoMapValue", null);
 __decorate([
     bud_support_1.bind
 ], Build.prototype, "register", null);

package/lib/cjs/Item/index.js

@@ -5,20 +5,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Item = void 0;
+exports.default = void 0;
 const bud_support_1 = require("@roots/bud-support");
-const Base_1 = require("../shared/Base");
+const Base_1 = __importDefault(require("../shared/Base"));
 /**
  * Item class
  *
  * @public
  */
-class Item extends Base_1.Base {
+class Item extends Base_1.default {
     /**
      * Class constructor
      *
-     * @param options - {@link Contract.Options}
+     * @param options - {@link Build.Item.Options}
      */
     constructor(_app, options) {
         super(_app);
@@ -26,7 +29,7 @@ class Item extends Base_1.Base {
         options?.options && this.setOptions(options.options);
     }
     /**
-     * {@inheritDoc @roots/Framework-Framework#Item.Abstract.getLoader}
+     * {@inheritDoc @roots/Bud-Bud#Item.Abstract.getLoader}
      *
      * @public
      * @decorator `@bind`
@@ -100,4 +103,4 @@ __decorate([
 __decorate([
     bud_support_1.bind
 ], Item.prototype, "toWebpack", null);
-exports.Item = Item;
+exports.default = Item;

package/lib/cjs/Loader/index.js

@@ -1,13 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Loader = void 0;
-const Base_1 = require("../shared/Base");
+exports.default = void 0;
+const Base_1 = __importDefault(require("../shared/Base"));
 /**
- * Framework Loader
+ * Bud Loader
  *
  * @public
  */
-class Loader extends Base_1.Base {
+class Loader extends Base_1.default {
     /**
      * Class constructor
      *
@@ -27,4 +30,4 @@ class Loader extends Base_1.Base {
         return this;
     }
 }
-exports.Loader = Loader;
+exports.default = Loader;

package/lib/cjs/Rule/index.js

@@ -5,17 +5,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Rule = void 0;
+exports.default = void 0;
 const bud_support_1 = require("@roots/bud-support");
-const Base_1 = require("../shared/Base");
+const Base_1 = __importDefault(require("../shared/Base"));
 const { isFunction, isString } = bud_support_1.lodash;
 /**
- * Framework Rule
+ * Bud Rule
  *
  * @public
  */
-class Rule extends Base_1.Base {
+class Rule extends Base_1.default {
     /**
      * Class constructor
      *
@@ -36,7 +39,7 @@ class Rule extends Base_1.Base {
     /**
      * Test value
      *
-     * @param app - Framework instance
+     * @param app - Bud instance
      *
      * @public
      * @decorator `@bind`
@@ -95,22 +98,27 @@ class Rule extends Base_1.Base {
         return this;
     }
     /**
-     * Get exclude value
+     * Get include value
      *
      * @public
      * @decorator `@bind`
      */
     getInclude() {
-        return this.unwrap(this.include);
+        return this.include.map(this.unwrap);
     }
     /**
-     * Set exclude value
+     * Set include value
      *
      * @public
      * @decorator `@bind`
      */
-    setInclude(include) {
-        this.include = this.wrap(include);
+    setInclude(includes) {
+        if (!this.include)
+            this.include = [];
+        if (typeof includes === 'function')
+            this.include = includes(this.include);
+        else
+            this.include = includes;
         return this;
     }
     /**
@@ -120,7 +128,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getExclude() {
-        return this.unwrap(this.exclude);
+        return this.exclude.map(this.unwrap);
     }
     /**
      * Set exclude value
@@ -128,8 +136,13 @@ class Rule extends Base_1.Base {
      * @public
      * @decorator `@bind`
      */
-    setExclude(exclude) {
-        this.exclude = this.wrap(exclude);
+    setExclude(excludes) {
+        if (!this.exclude)
+            this.exclude = [];
+        if (typeof excludes === 'function')
+            this.exclude = excludes(this.exclude);
+        else
+            this.exclude = excludes;
         return this;
     }
     /**
@@ -173,7 +186,7 @@ class Rule extends Base_1.Base {
     /**
      * Produce final Base output
      *
-     * @param app - {@link @roots/bud-framework#Framework}
+     * @param app - {@link @roots/bud-framework#Bud}
      * @returns finalized rule
      *
      * @public
@@ -239,4 +252,4 @@ __decorate([
 __decorate([
     bud_support_1.bind
 ], Rule.prototype, "toWebpack", null);
-exports.Rule = Rule;
+exports.default = Rule;

package/lib/cjs/index.js

@@ -24,27 +24,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rules = exports.loaders = exports.items = exports.Rule = exports.Item = exports.Loader = exports.Build = void 0;
 /**
- * Compiler configuration builder
+ * Configuration builder
  *
- * @see https://roots.io/bud
+ * @see https://bud.js.org
  * @see https://github.com/roots/bud
  *
  * @packageDocumentation
  */
 var Build_1 = require("./Build");
 Object.defineProperty(exports, "Build", { enumerable: true, get: function () { return Build_1.Build; } });
-var Loader_1 = require("./Loader");
-Object.defineProperty(exports, "Loader", { enumerable: true, get: function () { return Loader_1.Loader; } });
-var Item_1 = require("./Item");
-Object.defineProperty(exports, "Item", { enumerable: true, get: function () { return Item_1.Item; } });
-var Rule_1 = require("./Rule");
-Object.defineProperty(exports, "Rule", { enumerable: true, get: function () { return Rule_1.Rule; } });
-const items = __importStar(require("./Build/items"));
-exports.items = items;
-const loaders = __importStar(require("./Build/loaders"));
-exports.loaders = loaders;
-const rules = __importStar(require("./Build/rules"));
-exports.rules = rules;
+const Item_1 = __importDefault(require("./Item"));
+exports.Item = Item_1.default;
+const Loader_1 = __importDefault(require("./Loader"));
+exports.Loader = Loader_1.default;
+const Rule_1 = __importDefault(require("./Rule"));
+exports.Rule = Rule_1.default;
+exports.items = __importStar(require("./items"));
+exports.loaders = __importStar(require("./loaders"));
+exports.rules = __importStar(require("./rules"));

package/lib/cjs/{Build/items.js → items.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xml = exports.resolveUrl = exports.file = exports.raw = exports.precss = exports.minicss = exports.md = exports.style = exports.html = exports.csv = exports.cssModule = exports.css = void 0;
+exports.yml = exports.xml = exports.resolveUrl = exports.file = exports.raw = exports.precss = exports.minicss = exports.md = exports.style = exports.html = exports.csv = exports.cssModule = exports.css = void 0;
 /**
  * .css handler factory
  *
@@ -11,7 +11,7 @@ const css = (app) => app.build
     .setLoader(`css`)
     .setOptions(({ hooks }) => ({
     importLoaders: 1,
-    sourceMap: hooks.filter('build.devtool') ?? false,
+    sourceMap: hooks.filter('build.devtool') ? true : false,
 }));
 exports.css = css;
 /**
@@ -26,7 +26,7 @@ const cssModule = (app) => app.build
     importLoaders: 1,
     localIdentName: '[name]__[local]___[hash:base64:5]',
     modules: true,
-    sourceMap: hooks.filter('build.devtool') ?? false,
+    sourceMap: hooks.filter('build.devtool') ? true : false,
 }));
 exports.cssModule = cssModule;
 /**
@@ -80,9 +80,9 @@ const file = (app) => app.build
     .makeItem()
     .setLoader(`file`)
     .setOptions(app => ({
-    name: app.store.is('features.hash', true)
-        ? app.store.get('hashFormat').concat('.[ext]')
-        : app.store.get('fileFormat').concat('.[ext]'),
+    name: app.hooks.filter('feature.hash')
+        ? app.hooks.filter('value.hashFormat').concat('.[ext]')
+        : app.hooks.filter('value.fileFormat').concat('.[ext]'),
 }));
 exports.file = file;
 /**
@@ -95,7 +95,7 @@ const resolveUrl = (app) => app.build
     .setLoader(`resolveUrl`)
     .setOptions(({ path, hooks }) => ({
     root: path('@src'),
-    sourceMap: hooks.filter('build.devtool') ?? false,
+    sourceMap: hooks.filter('build.devtool') ? true : false,
 }));
 exports.resolveUrl = resolveUrl;
 /**
@@ -105,3 +105,10 @@ exports.resolveUrl = resolveUrl;
  */
 const xml = (app) => app.build.makeItem().setLoader(`xml`);
 exports.xml = xml;
+/**
+ * Factory {@link Item} for yml
+ *
+ * @public
+ */
+const yml = (app) => app.build.makeItem().setLoader(`yml`);
+exports.yml = yml;

package/lib/cjs/{Build/loaders.js → loaders.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xml = exports.url = exports.style = exports.resolveUrl = exports.minicss = exports.md = exports.html = exports.file = exports.csv = exports.css = void 0;
+exports.yml = exports.xml = exports.url = exports.style = exports.resolveUrl = exports.minicss = exports.md = exports.html = exports.file = exports.csv = exports.css = void 0;
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 /**
  * css loader
@@ -59,3 +59,5 @@ exports.url = url;
  */
 const xml = (app) => app.build.makeLoader().setSrc(require.resolve('xml-loader'));
 exports.xml = xml;
+const yml = (app) => app.build.makeLoader().setSrc(require.resolve('js-yaml-loader'));
+exports.yml = yml;