@schalkneethling/miyagi-core 4.9.0 → 4.9.1

package/lib/cli/perf.js

@@ -59,6 +59,7 @@ export default async function perfCli(args) {
 
   const result = await runPerformance({
     cwd,
+    componentsFolder: global.config.components.folder,
     compression: args.compression,
     warnRatio: warnRatioOverride,
     render: renderPageHtml,

package/lib/init/router.js

@@ -68,6 +68,7 @@ export default function Router() {
   if (!global.config.isBuild) {
     attachPerformanceRoutes(global.app, {
       cwd: process.cwd(),
+      componentsFolder: global.config.components.folder,
       render: renderPageHtml,
     });
   }

package/lib/performance/component.js

@@ -55,6 +55,7 @@ function resolveImportGraph(entryPath) {
  * 50 kB util shows the real reachable size, not just the entry file.
  * @param {{
  *   cwd: string,
+ *   componentsFolder: string,
  *   componentPath: string,
  *   entry: { css?: { budget?: string }, js?: { budget?: string } },
  *   compression: "raw"|"gzip"|"brotli",
@@ -64,12 +65,13 @@ function resolveImportGraph(entryPath) {
  */
 export function measureComponent({
   cwd,
+  componentsFolder = "",
   componentPath,
   entry,
   compression,
   warnRatio,
 }) {
-  const folder = path.join(cwd, componentPath);
+  const folder = path.join(cwd, componentsFolder, componentPath);
   const componentName = path.basename(componentPath);
   const cssPath = path.join(folder, `${componentName}.css`);
   const jsPath = path.join(folder, `${componentName}.js`);

package/lib/performance/index.js

@@ -47,6 +47,7 @@ function tally(statuses) {
  * declared page variation.
  * @param {{
  *   cwd?: string,
+ *   componentsFolder?: string,
  *   compression?: "raw"|"gzip"|"brotli",
  *   warnRatio?: number,
  *   render?: (templatePath: string, variation: string) => Promise<string>,
@@ -60,6 +61,7 @@ export async function runPerformance(options = {}) {
   }
 
   const cwd = options.cwd ?? process.cwd();
+  const componentsFolder = options.componentsFolder ?? "";
   const compression = options.compression ?? config.compression;
   const warnRatio = options.warnRatio ?? config.warnRatio;
 
@@ -68,6 +70,7 @@ export async function runPerformance(options = {}) {
   for (const [componentPath, entry] of Object.entries(config.components)) {
     const measurement = measureComponent({
       cwd,
+      componentsFolder,
       componentPath,
       entry,
       compression,

package/lib/performance/routes.js

@@ -19,6 +19,7 @@ import { runPerformance } from "./index.js";
  * @param {object} app - Express app
  * @param {{
  *   cwd: string,
+ *   componentsFolder?: string,
  *   render?: (templatePath: string, variation: string) => Promise<string>,
  * }} options
  * @returns {boolean} true when the config file exists at registration time
@@ -28,6 +29,7 @@ export function attachPerformanceRoutes(app, options) {
     try {
       const result = await runPerformance({
         cwd: options.cwd,
+        componentsFolder: options.componentsFolder,
         render: options.render,
       });
       if (!result.enabled) {

package/lib/render/views/iframe/component.js

@@ -250,7 +250,10 @@ async function renderVariations({
 
       let perfSection;
       try {
-        const perfResult = await runPerformance({ cwd: process.cwd() });
+        const perfResult = await runPerformance({
+          cwd: process.cwd(),
+          componentsFolder: global.config.components.folder,
+        });
         perfSection = buildComponentPerfSection(
           perfResult,
           component.paths.dir.short,

package/lib/render/views/main/component.js

@@ -45,6 +45,7 @@ export default async function renderMainComponent({
     try {
       const perfResult = await runPerformance({
         cwd: process.cwd(),
+        componentsFolder: global.config.components.folder,
         render: renderPageHtml,
       });
       perfBanner = buildPagePerfBanner(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schalkneethling/miyagi-core",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "miyagi is a component development tool for JavaScript template engines.",
   "main": "index.js",
   "author": "Schalk Neethling <schalkneethling@duck.com>, Michael Großklaus <mail@mgrossklaus.de> (https://www.mgrossklaus.de)",