@roots/bud-build 5.3.2 → 5.6.0

package/lib/cjs/Build/items.js

@@ -1,117 +1,107 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Item_1 = require("../Item");
+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;
 /**
- * Items
+ * .css handler factory
  *
  * @public
  */
-exports.default = {
-    /**
-     * .css handler factory
-     *
-     * @public
-     */
-    css: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.css,
-        options: ({ hooks }) => ({
-            importLoaders: 1,
-            sourceMap: hooks.filter('build.devtool') ? true : false,
-        }),
-    }),
-    /**
-     * .css handler factory
-     *
-     * @public
-     */
-    cssModule: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.css,
-        options: ({ hooks }) => ({
-            importLoaders: 1,
-            localIdentName: '[name]__[local]___[hash:base64:5]',
-            modules: true,
-            sourceMap: hooks.filter('build.devtool') ? true : false,
-        }),
-    }),
-    /**
-     * .csv handler factory
-     *
-     * @public
-     */
-    csv: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.csv,
-    }),
-    /**
-     * .html handler factory
-     *
-     * @public
-     */
-    html: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.html,
-    }),
-    /**
-     * Factory {@link Item} for style
-     *
-     * @public
-     */
-    style: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.style,
-    }),
-    /**
-     * Factory {@link Item} for markdown
-     *
-     * @public
-     */
-    md: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.md,
-    }),
-    /**
-     * Factory {@link Item} for minicss-extract-plugin
-     *
-     * @public
-     */
-    minicss: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.minicss,
-    }),
-    /**
-     * Factory {@link Item} for raw
-     *
-     * @public
-     */
-    raw: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.raw,
-    }),
-    /**
-     * Factory {@link Item} for file
-     *
-     * @public
-     */
-    file: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.file,
-        options: app => ({
-            name: app.store.is('features.hash', true)
-                ? app.store.get('hashFormat').concat('.[ext]')
-                : app.store.get('fileFormat').concat('.[ext]'),
-        }),
-    }),
-    /**
-     * Factory {@link Item} resolve-url
-     *
-     * @public
-     */
-    [`resolve-url`]: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders['resolve-url'],
-        options: ({ path, hooks }) => ({
-            root: path('src'),
-            sourceMap: hooks.filter('build.devtool') ?? false,
-        }),
-    }),
-    /**
-     * Factory {@link Item} for xml
-     *
-     * @public
-     */
-    xml: () => new Item_1.Item({
-        loader: ({ build }) => build.loaders.xml,
-    }),
-};
+const css = (app) => app.build
+    .makeItem()
+    .setLoader(`css`)
+    .setOptions(({ hooks }) => ({
+    importLoaders: 1,
+    sourceMap: hooks.filter('build.devtool') ?? false,
+}));
+exports.css = css;
+/**
+ * .css handler factory
+ *
+ * @public
+ */
+const cssModule = (app) => app.build
+    .makeItem()
+    .setLoader(`css`)
+    .setOptions(({ hooks }) => ({
+    importLoaders: 1,
+    localIdentName: '[name]__[local]___[hash:base64:5]',
+    modules: true,
+    sourceMap: hooks.filter('build.devtool') ?? false,
+}));
+exports.cssModule = cssModule;
+/**
+ * .csv handler factory
+ *
+ * @public
+ */
+const csv = (app) => app.build.makeItem().setLoader(`csv`);
+exports.csv = csv;
+/**
+ * .html handler factory
+ *
+ * @public
+ */
+const html = (app) => app.build.makeItem().setLoader(`html`);
+exports.html = html;
+/**
+ * Factory {@link Item} for style
+ *
+ * @public
+ */
+const style = (app) => app.build.makeItem().setLoader(`style`);
+exports.style = style;
+/**
+ * Factory {@link Item} for markdown
+ *
+ * @public
+ */
+const md = (app) => app.build.makeItem({ loader: 'md' });
+exports.md = md;
+/**
+ * Factory {@link Item} for minicss-extract-plugin
+ * @public
+ */
+const minicss = (app) => app.build.makeItem().setLoader(`minicss`);
+exports.minicss = minicss;
+/**
+ * CSS rule which accounts for env
+ * @public
+ */
+const precss = (app) => app.build.makeItem().setLoader(app.isProduction ? `minicss` : `style`);
+exports.precss = precss;
+const raw = ({ build }) => build.makeItem().setLoader(`raw`);
+exports.raw = raw;
+/**
+ * Factory {@link Item} for file
+ *
+ * @public
+ */
+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]'),
+}));
+exports.file = file;
+/**
+ * Factory {@link Item} resolve-url
+ *
+ * @public
+ */
+const resolveUrl = (app) => app.build
+    .makeItem()
+    .setLoader(`resolveUrl`)
+    .setOptions(({ path, hooks }) => ({
+    root: path('@src'),
+    sourceMap: hooks.filter('build.devtool') ?? false,
+}));
+exports.resolveUrl = resolveUrl;
+/**
+ * Factory {@link Item} for xml
+ *
+ * @public
+ */
+const xml = (app) => app.build.makeItem().setLoader(`xml`);
+exports.xml = xml;

package/lib/cjs/Build/loaders.js

@@ -3,57 +3,59 @@ 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;
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
-const Loader_1 = require("../Loader");
-exports.default = {
-    /**
-     * Returns {@link Loader} from `css-loader`
-     * @public
-     */
-    css: () => new Loader_1.Loader(require.resolve('css-loader')),
-    /**
-     * Returns {@link Loader} for `csv-loader`
-     * @public
-     */
-    csv: () => new Loader_1.Loader(require.resolve('csv-loader')),
-    /**
-     * Returns {@link Loader} for `file-loader`
-     * @public
-     */
-    file: () => new Loader_1.Loader(require.resolve('file-loader')),
-    /**
-     * Returns {@link Loader} for `html-loader`
-     * @public
-     */
-    html: () => new Loader_1.Loader(require.resolve('html-loader')),
-    /**
-     * Returns {@link Loader} for `remark-loader`
-     * @public
-     */
-    md: () => new Loader_1.Loader(require.resolve('remark-loader')),
-    /**
-     * Returns {@link Loader} for `mini-css-extract-plugin.loader`
-     * @public
-     */
-    minicss: () => new Loader_1.Loader(mini_css_extract_plugin_1.default.loader),
-    /**
-     * Returns {@link Loader} for `resolve-url-loader`
-     * @public
-     */
-    ['resolve-url']: () => new Loader_1.Loader(require.resolve('resolve-url-loader')),
-    /**
-     * Returns {@link Loader} for `style-loader`
-     * @public
-     */
-    style: () => new Loader_1.Loader(require.resolve('style-loader')),
-    /**
-     * Returns {@link Loader} for `url-loader`
-     * @public
-     */
-    url: () => new Loader_1.Loader(require.resolve('url-loader')),
-    /**
-     * Returns {@link Loader} for `xml-loader`
-     * @public
-     */
-    xml: () => new Loader_1.Loader(require.resolve('xml-loader')),
-};
+/**
+ * css loader
+ */
+const css = (app) => app.build.makeLoader().setSrc(require.resolve('css-loader'));
+exports.css = css;
+/**
+ * csv loader
+ */
+const csv = (app) => app.build.makeLoader().setSrc(require.resolve('csv-loader'));
+exports.csv = csv;
+const file = (app) => app.build.makeLoader().setSrc(require.resolve('file-loader'));
+exports.file = file;
+/**
+ * Returns {@link Loader} for `html-loader`
+ * @public
+ */
+const html = (app) => app.build.makeLoader().setSrc(require.resolve('html-loader'));
+exports.html = html;
+/**
+ * Returns {@link Loader} for `remark-loader`
+ * @public
+ */
+const md = (app) => app.build.makeLoader().setSrc(require.resolve('remark-loader'));
+exports.md = md;
+/**
+ * Returns {@link Loader} for `mini-css-extract-plugin.loader`
+ * @public
+ */
+const minicss = (app) => app.build.makeLoader().setSrc(mini_css_extract_plugin_1.default.loader);
+exports.minicss = minicss;
+/**
+ * Returns {@link Loader} for `resolve-url-loader`
+ * @public
+ */
+const resolveUrl = (app) => app.build.makeLoader().setSrc(require.resolve('resolve-url-loader'));
+exports.resolveUrl = resolveUrl;
+/**
+ * Returns {@link Loader} for `style-loader`
+ * @public
+ */
+const style = (app) => app.build.makeLoader().setSrc(require.resolve('style-loader'));
+exports.style = style;
+/**
+ * Returns {@link Loader} for `url-loader`
+ * @public
+ */
+const url = (app) => app.build.makeLoader().setSrc(require.resolve('url-loader'));
+exports.url = url;
+/**
+ * Returns {@link Loader} for `xml-loader`
+ * @public
+ */
+const xml = (app) => app.build.makeLoader().setSrc(require.resolve('xml-loader'));
+exports.xml = xml;

package/lib/cjs/Build/rules.js

@@ -10,7 +10,7 @@ const bud_support_1 = require("@roots/bud-support");
 const js = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.js'))
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setUse([]);
 exports.js = js;
 /**
@@ -21,11 +21,8 @@ exports.js = js;
 const css = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.css'))
-    .setInclude(({ path }) => path('src'))
-    .setUse(({ isProduction, build }) => [
-    isProduction ? build.items.minicss : build.items.style,
-    build.items.css,
-]);
+    .setInclude(({ path }) => [path('@src')])
+    .setUse([`precss`, `css`]);
 exports.css = css;
 /**
  * .module.css rule
@@ -35,11 +32,8 @@ exports.css = css;
 const cssModule = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.cssModule'))
-    .setInclude(({ path }) => path('src'))
-    .setUse(({ isProduction, build }) => [
-    isProduction ? build.items.minicss : build.items.style,
-    build.items.cssModule,
-]);
+    .setInclude(({ path }) => [path('@src')])
+    .setUse([`precss`, `cssModule`]);
 exports.cssModule = cssModule;
 /**
  * .jpg, .jpeg, .png, .gif rule
@@ -49,7 +43,7 @@ exports.cssModule = cssModule;
 const image = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.image'))
-    .setExclude(({ store }) => store.get('patterns.modules'))
+    .setInclude(({ path }) => [path('@src')])
     .setType('asset/resource')
     .setGenerator(app => ({
     filename: app.store.is('features.hash', true)
@@ -68,7 +62,7 @@ exports.image = image;
 const webp = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.webp'))
-    .setExclude(({ store }) => store.get('patterns.modules'))
+    .setInclude(({ path }) => [path('@src')])
     .setType('asset/resource')
     .setGenerator(app => ({
     filename: app.store.is('features.hash', true)
@@ -85,7 +79,7 @@ exports.webp = webp;
 const svg = (app) => app.build
     .makeRule()
     .setTest(({ store }) => store.get('patterns.svg'))
-    .setExclude(({ store }) => store.get('patterns.modules'))
+    .setInclude(({ path }) => [path('@src')])
     .setType('asset/resource')
     .setGenerator(app => ({
     filename: app.store.is('features.hash', true)
@@ -102,8 +96,7 @@ const font = (app) => app.build
     .makeRule()
     .setType('asset')
     .setTest(({ store }) => store.get('patterns.font'))
-    .setExclude(({ store }) => store.get('patterns.modules'))
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setGenerator(app => ({
     filename: app.store.is('features.hash', true)
         ? 'fonts/'.concat(app.store.get('hashFormat')).concat('[ext]')
@@ -118,7 +111,7 @@ exports.font = font;
 const json = (app) => app.build
     .makeRule()
     .setType('json')
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.json'))
     .setParser({ parse: bud_support_1.json5.parse });
 exports.json = json;
@@ -130,7 +123,7 @@ exports.json = json;
 const yml = (app) => app.build
     .makeRule()
     .setType('json')
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.yml'))
     .setParser({ parse: bud_support_1.yaml.parse });
 exports.yml = yml;
@@ -141,9 +134,9 @@ exports.yml = yml;
  */
 const html = (app) => app.build
     .makeRule()
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.html'))
-    .setUse(({ build }) => [build.items.html]);
+    .setUse([`html`]);
 exports.html = html;
 /**
  * Returns {@link Rule} for `.csv` handling
@@ -152,9 +145,9 @@ exports.html = html;
  */
 const csv = (app) => app.build
     .makeRule()
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.csv'))
-    .setUse(({ build }) => [build.items.csv]);
+    .setUse([`csv`]);
 exports.csv = csv;
 /**
  * Returns {@link Rule} for `.xml` handling
@@ -163,9 +156,9 @@ exports.csv = csv;
  */
 const xml = (app) => app.build
     .makeRule()
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.xml'))
-    .setUse(({ build }) => [build.items.xml]);
+    .setUse([`xml`]);
 exports.xml = xml;
 /**
  * Returns {@link Rule} for `.toml` handling
@@ -175,7 +168,7 @@ exports.xml = xml;
 const toml = (app) => app.build
     .makeRule()
     .setType('json')
-    .setInclude(({ path }) => path('src'))
+    .setInclude(({ path }) => [path('@src')])
     .setTest(({ store }) => store.get('patterns.html'))
     .setParser({ parse: bud_support_1.toml.parse });
 exports.toml = toml;

package/lib/cjs/Item/index.js

@@ -7,23 +7,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Item = void 0;
-const item_dependencies_1 = require("./item.dependencies");
-const item_interface_1 = require("./item.interface");
+const bud_support_1 = require("@roots/bud-support");
+const Base_1 = require("../shared/Base");
 /**
  * Item class
  *
  * @public
  */
-class Item extends item_interface_1.Base.Abstract {
+class Item extends Base_1.Base {
     /**
      * Class constructor
      *
-     * @param options - {@link Base.Options}
+     * @param options - {@link Contract.Options}
      */
-    constructor({ loader, options }) {
-        super();
-        this.setLoader(loader);
-        options && this.setOptions(options);
+    constructor(_app, options) {
+        super(_app);
+        options?.loader && this.setLoader(options.loader);
+        options?.options && this.setOptions(options.options);
     }
     /**
      * {@inheritDoc @roots/Framework-Framework#Item.Abstract.getLoader}
@@ -31,61 +31,73 @@ class Item extends item_interface_1.Base.Abstract {
      * @public
      * @decorator `@bind`
      */
-    getLoader(app) {
-        return this.loader(app);
+    getLoader() {
+        return this.app.build.loaders[this.unwrap(this.loader)];
     }
     /**
      * @public
      * @decorator `@bind`
      */
     setLoader(loader) {
-        this.loader = (0, item_dependencies_1.isFunction)(loader) ? loader : () => loader;
+        this.loader = loader;
+        return this;
     }
     /**
      * @public
      * @decorator `@bind`
      */
     setOptions(options) {
-        this.options = (0, item_dependencies_1.isFunction)(options) ? options : () => options;
+        this.options = this.wrap(options);
+        return this;
+    }
+    getOptions() {
+        return this.unwrap(this.options);
     }
     /**
      * @public
      * @decorator `@bind`
      */
-    mergeOptions(options, app) {
+    mergeOptions(options) {
         options = {
-            ...this.options(app),
+            ...(this.getOptions() ?? {}),
             ...options,
         };
-        this.setOptions((app) => options);
+        this.setOptions(options);
+        return this;
     }
     /**
      * @public
      * @decorator `@bind`
      */
-    make(app) {
+    toWebpack() {
+        const loader = this.getLoader();
+        if (!loader)
+            this.app.error(loader, `missing`, this);
         const output = {
-            loader: this.loader(app).make(app),
+            loader: this.getLoader().getSrc(),
         };
         if (this.options) {
-            output.options = this.options(app);
+            output.options = this.getOptions();
         }
         return output;
     }
 }
 __decorate([
-    item_dependencies_1.bind
+    bud_support_1.bind
 ], Item.prototype, "getLoader", null);
 __decorate([
-    item_dependencies_1.bind
+    bud_support_1.bind
 ], Item.prototype, "setLoader", null);
 __decorate([
-    item_dependencies_1.bind
+    bud_support_1.bind
 ], Item.prototype, "setOptions", null);
 __decorate([
-    item_dependencies_1.bind
+    bud_support_1.bind
+], Item.prototype, "getOptions", null);
+__decorate([
+    bud_support_1.bind
 ], Item.prototype, "mergeOptions", null);
 __decorate([
-    item_dependencies_1.bind
-], Item.prototype, "make", null);
+    bud_support_1.bind
+], Item.prototype, "toWebpack", null);
 exports.Item = Item;