@skafform/vite-plugin 0.1.5 → 0.1.7

package/dist/index.js

@@ -208,7 +208,9 @@ ${lightVars}
         return `export default ${JSON.stringify({
           ...config,
           customize: { ...themeJson.customize ?? {}, ...config.customize ?? {} },
-          fonts: themeJson.fonts ?? []
+          fonts: themeJson.fonts ?? [],
+          widget_areas: themeJson.widget_areas ?? {},
+          nav_locations: themeJson.nav_locations ?? {}
         })}`;
       }
       if (id === RESOLVED_ADMIN_SECTIONS) {
@@ -245,7 +247,7 @@ ${lightVars}
             const basename = absPath.split("/").pop().replace(/\.[^.]+$/, "");
             const varName = `wr_${i++}`;
             imports.push(`import * as ${varName} from ${JSON.stringify(absPath)}`);
-            items.push(`    { brick: ${JSON.stringify(w.brick)}, basename: ${JSON.stringify(basename)}, Component: ${varName}.default }`);
+            items.push(`    { brick: ${JSON.stringify(w.brick)}, basename: ${JSON.stringify(basename)}, Component: ${varName}.default, schema: ${varName}.schema ?? [] }`);
           }
           entries.push(`  ${JSON.stringify(zone)}: [
 ${items.join(",\n")}
@@ -268,7 +270,7 @@ ${entries.join(",\n")}
             const absPath = norm(resolve(root, widget.component));
             const basename = absPath.split("/").pop().replace(/\.[^.]+$/, "");
             const key = `${widget.zone}:${brickName}:${basename}`;
-            widgets.push({ key, absPath, varName: `wl_${i++}` });
+            widgets.push({ key, absPath, varName: `wl_${i++}`, brickName, basename });
           }
         }
         if (widgets.length === 0) {
@@ -277,13 +279,16 @@ ${entries.join(",\n")}
         return [
           ...widgets.map((w) => `import * as ${w.varName} from ${JSON.stringify(w.absPath)}`),
           `const _loaders = [`,
-          ...widgets.map((w) => `  { key: ${JSON.stringify(w.key)}, fn: ${w.varName}.loader ?? null },`),
+          ...widgets.map((w) => `  { key: ${JSON.stringify(w.key)}, brick: ${JSON.stringify(w.brickName)}, basename: ${JSON.stringify(w.basename)}, fn: ${w.varName}.loader ?? null },`),
           `]`,
-          `export async function runWidgetLoaders(request) {`,
+          `export async function runWidgetLoaders(request, dbWidgets) {`,
+          `  const _all = Object.values(dbWidgets ?? {}).flat()`,
           `  const results = {}`,
           `  await Promise.all(`,
-          `    _loaders.filter(w => w.fn !== null).map(async ({ key, fn }) => {`,
-          `      try { results[key] = await fn({ request }) } catch { results[key] = null }`,
+          `    _loaders.filter(w => w.fn !== null).map(async ({ key, fn, brick, basename }) => {`,
+          `      const _inst = _all.find(w => w.brick === brick && w.component.split('/').pop()?.replace(/\\.[^.]+$/, '') === basename)`,
+          `      const _config = _inst?.config ?? {}`,
+          `      try { results[key] = await fn({ request, config: _config }) } catch { results[key] = null }`,
           `    })`,
           `  )`,
           `  return results`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skafform/vite-plugin",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "exports": {
     ".": {