@merkur/create-widget 0.29.3 → 0.29.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/create-widget",
-  "version": "0.29.3",
+  "version": "0.29.5",
   "description": "CLI for creating merkur widget easily.",
   "bin": {
     "merkur-create-widget": "./bin/createWidget.mjs"
@@ -44,5 +44,5 @@
     "inquirer": "^8.2.2",
     "yargs": "^17.4.1"
   },
-  "gitHead": "fedf28cbd8039902181fb996c4b072942c2dabf9"
+  "gitHead": "e3f312b9cfaf7f9b1d8c1ec28650cb66c848bda3"
 }

package/template/server/routes/widgetAPI/widgetAPI.js

@@ -1,7 +1,7 @@
 const config = require('config');
 const express = require('express');
 
-const { createAssets, memo } = require('@merkur/integration/server/');
+const { createAssets, memo } = require('@merkur/integration/server');
 const memoCreateAssets = memo(createAssets);
 
 const widgetEnvironment = config.get('widget');

package/template/src/lib/utils.js

@@ -1,25 +1,38 @@
-async function mapViews(widget, factoryFn, callback) {
-  const { View, slot = {} } = await factoryFn(widget);
-  const { containerSelector } = widget;
+function mapViews(widget, factoryFn, callback) {
+  if (widget.$external.resolvedViews) {
+    return mapResolvedViews(widget, callback);
+  }
 
-  // Add container selectors defined on widget instance after creation
-  Object.keys(widget.slot).forEach((slotName) => {
-    slot[slotName].isSlot = true;
-    slot[slotName].containerSelector = widget.slot[slotName].containerSelector;
-  });
-
-  return [
-    { View, containerSelector, isSlot: false },
-    ...Object.values(slot),
-  ].map(({ View, containerSelector, isSlot }) => {
-    callback({
-      View,
-      isSlot,
-      containerSelector,
-      container:
-        containerSelector && document?.querySelector(containerSelector),
+  return factoryFn(widget).then(({ View, slot = {} }) => {
+    const { containerSelector } = widget;
+    // Add container selectors defined on widget instance after creation
+    Object.keys(widget.slot).forEach((slotName) => {
+      slot[slotName].isSlot = true;
+      slot[slotName].containerSelector =
+        widget.slot[slotName].containerSelector;
     });
+
+    widget.$external.resolvedViews = [
+      { View, containerSelector, isSlot: false },
+      ...Object.values(slot),
+    ];
+
+    return mapResolvedViews(widget, callback);
   });
 }
 
+function mapResolvedViews(widget, callback) {
+  return widget.$external.resolvedViews.map(
+    ({ View, containerSelector, isSlot }) => {
+      callback({
+        View,
+        isSlot,
+        containerSelector,
+        container:
+          containerSelector && document?.querySelector(containerSelector),
+      });
+    }
+  );
+}
+
 export { mapViews };