@symbo.ls/create 2.34.20 → 2.34.22

package/dist/cjs/createDomql.js

@@ -63,6 +63,9 @@ const prepareContext = async (app, context = {}) => {
   context.routerOptions = (0, import_router.initRouter)(app, context);
   context.defaultExtends = [uikit.Box];
   context.version = import_package.version;
+  if (context.sharedLibraries) {
+    (0, import_prepare.prepareSharedLibs)(context);
+  }
   if (context.forceDomql3) {
     for (const key2 in context.components) {
       if (!key2.includes("smbls.") && context.components.hasOwnProperty(key2)) {

package/dist/cjs/prepare.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var prepare_exports = {};
 __export(prepare_exports, {
-  UIkitWithPrefix: () => UIkitWithPrefix,
   getCDNUrl: () => getCDNUrl,
   prepareComponents: () => prepareComponents,
   prepareDependencies: () => prepareDependencies,
@@ -36,6 +35,7 @@ __export(prepare_exports, {
   prepareMethods: () => prepareMethods,
   preparePages: () => preparePages,
   prepareRequire: () => prepareRequire,
+  prepareSharedLibs: () => prepareSharedLibs,
   prepareState: () => prepareState,
   prepareUtils: () => prepareUtils,
   prepareWindow: () => prepareWindow
@@ -79,12 +79,12 @@ const getCDNUrl = (packageName, version = "latest", provider = "skypack") => {
   const cdnConfig = CDN_PROVIDERS[provider] || CDN_PROVIDERS.skypack;
   return cdnConfig.formatUrl(packageName, version);
 };
-const UIkitWithPrefix = () => {
+const UIkitWithPrefix = (prefix = "smbls") => {
   const newObj = {};
   for (const key in uikit) {
     if (Object.prototype.hasOwnProperty.call(uikit, key)) {
       if ((0, import_utils.checkIfKeyIsComponent)(key)) {
-        newObj[`smbls.${key}`] = uikit[key];
+        newObj[`${prefix}.${key}`] = uikit[key];
       } else {
         newObj[key] = uikit[key];
       }
@@ -139,9 +139,14 @@ const prepareDependencies = async ({
         try {
           const fallbackUrl = getCDNUrl(dependency, version, "symbols") + random;
           await utils.loadRemoteScript(fallbackUrl, { document: document2 });
-          console.log(`Successfully loaded ${dependency} from fallback (symbols.ls)`);
+          console.log(
+            `Successfully loaded ${dependency} from fallback (symbols.ls)`
+          );
         } catch (fallbackError) {
-          console.error(`Failed to load ${dependency} from fallback:`, fallbackError);
+          console.error(
+            `Failed to load ${dependency} from fallback:`,
+            fallbackError
+          );
         }
       }
     }
@@ -239,3 +244,15 @@ const preparePages = (app, context) => {
     return pages2;
   }, pages);
 };
+const prepareSharedLibs = (context) => {
+  const sharedLibraries = context.sharedLibraries;
+  for (let i = 0; i < sharedLibraries.length; i++) {
+    const sharedLib = sharedLibraries[i];
+    if (context.type === "template") {
+      (0, import_utils.overwriteShallow)(context.designSystem, sharedLib.designSystem);
+      (0, import_utils.deepMerge)(context, sharedLib, ["designSystem"], 1);
+    } else {
+      (0, import_utils.deepMerge)(context, sharedLib, [], 1);
+    }
+  }
+};

package/dist/esm/createDomql.js

@@ -35,7 +35,8 @@ import {
   preparePages,
   prepareState,
   prepareUtils,
-  prepareMethods
+  prepareMethods,
+  prepareSharedLibs
 } from "./prepare.js";
 import { temporaryDomqlHackReverse } from "@symbo.ls/utils";
 const prepareContext = async (app, context = {}) => {
@@ -59,6 +60,9 @@ const prepareContext = async (app, context = {}) => {
   context.routerOptions = initRouter(app, context);
   context.defaultExtends = [uikit.Box];
   context.version = version;
+  if (context.sharedLibraries) {
+    prepareSharedLibs(context);
+  }
   if (context.forceDomql3) {
     for (const key2 in context.components) {
       if (!key2.includes("smbls.") && context.components.hasOwnProperty(key2)) {

package/dist/esm/prepare.js

@@ -23,7 +23,8 @@ import {
   deepClone,
   merge,
   checkIfKeyIsComponent,
-  isDevelopment
+  isDevelopment,
+  overwriteShallow
 } from "@domql/utils";
 import { initEmotion } from "./initEmotion.js";
 import * as uikit from "@symbo.ls/uikit";
@@ -62,12 +63,12 @@ const getCDNUrl = (packageName, version = "latest", provider = "skypack") => {
   const cdnConfig = CDN_PROVIDERS[provider] || CDN_PROVIDERS.skypack;
   return cdnConfig.formatUrl(packageName, version);
 };
-const UIkitWithPrefix = () => {
+const UIkitWithPrefix = (prefix = "smbls") => {
   const newObj = {};
   for (const key in uikit) {
     if (Object.prototype.hasOwnProperty.call(uikit, key)) {
       if (checkIfKeyIsComponent(key)) {
-        newObj[`smbls.${key}`] = uikit[key];
+        newObj[`${prefix}.${key}`] = uikit[key];
       } else {
         newObj[key] = uikit[key];
       }
@@ -114,9 +115,14 @@ const prepareDependencies = async ({
         try {
           const fallbackUrl = getCDNUrl(dependency, version, "symbols") + random;
           await utils.loadRemoteScript(fallbackUrl, { document: document2 });
-          console.log(`Successfully loaded ${dependency} from fallback (symbols.ls)`);
+          console.log(
+            `Successfully loaded ${dependency} from fallback (symbols.ls)`
+          );
         } catch (fallbackError) {
-          console.error(`Failed to load ${dependency} from fallback:`, fallbackError);
+          console.error(
+            `Failed to load ${dependency} from fallback:`,
+            fallbackError
+          );
         }
       }
     }
@@ -214,8 +220,19 @@ const preparePages = (app, context) => {
     return pages2;
   }, pages);
 };
+const prepareSharedLibs = (context) => {
+  const sharedLibraries = context.sharedLibraries;
+  for (let i = 0; i < sharedLibraries.length; i++) {
+    const sharedLib = sharedLibraries[i];
+    if (context.type === "template") {
+      overwriteShallow(context.designSystem, sharedLib.designSystem);
+      deepMerge(context, sharedLib, ["designSystem"], 1);
+    } else {
+      deepMerge(context, sharedLib, [], 1);
+    }
+  }
+};
 export {
-  UIkitWithPrefix,
   getCDNUrl,
   prepareComponents,
   prepareDependencies,
@@ -223,6 +240,7 @@ export {
   prepareMethods,
   preparePages,
   prepareRequire,
+  prepareSharedLibs,
   prepareState,
   prepareUtils,
   prepareWindow

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.34.20",
+  "version": "2.34.22",
   "license": "MIT",
-  "gitHead": "ee2e9cb9831ae904b984868e68219e95fd9ceeaf",
+  "gitHead": "7c230f00e3044681e6ab652e1f638eeea8dac1ec",
   "type": "module",
   "module": "src/index.js",
   "main": "src/index.js",
@@ -29,17 +29,17 @@
     "prepublish": "npm run build; npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/emotion": "^2.34.20",
-    "@domql/event": "^2.34.20",
-    "@domql/report": "^2.34.20",
-    "@domql/router": "^2.34.20",
-    "@symbo.ls/fetch": "^2.34.20",
-    "@symbo.ls/init": "^2.34.20",
-    "@symbo.ls/scratch": "^2.34.20",
-    "@symbo.ls/sync": "^2.34.20",
-    "@symbo.ls/uikit": "^2.34.20",
-    "@symbo.ls/utils": "^2.34.20",
-    "domql": "^2.34.20"
+    "@domql/emotion": "^2.34.22",
+    "@domql/event": "^2.34.22",
+    "@domql/report": "^2.34.22",
+    "@domql/router": "^2.34.22",
+    "@symbo.ls/fetch": "^2.34.22",
+    "@symbo.ls/init": "^2.34.22",
+    "@symbo.ls/scratch": "^2.34.22",
+    "@symbo.ls/sync": "^2.34.22",
+    "@symbo.ls/uikit": "^2.34.22",
+    "@symbo.ls/utils": "^2.34.22",
+    "domql": "^2.34.22"
   },
   "devDependencies": {
     "@babel/core": "^7.27.1"

package/src/createDomql.js

@@ -23,7 +23,8 @@ import {
   preparePages,
   prepareState,
   prepareUtils,
-  prepareMethods
+  prepareMethods,
+  prepareSharedLibs
 } from './prepare.js'
 
 import { temporaryDomqlHackReverse } from '@symbo.ls/utils'
@@ -50,6 +51,10 @@ export const prepareContext = async (app, context = {}) => {
   context.defaultExtends = [uikit.Box]
   context.version = version
 
+  if (context.sharedLibraries) {
+    prepareSharedLibs(context)
+  }
+
   // Iterate over components and pages to run domql3hack
   if (context.forceDomql3) {
     for (const key in context.components) {

package/src/prepare.js

@@ -6,7 +6,8 @@ import {
   deepClone,
   merge,
   checkIfKeyIsComponent,
-  isDevelopment
+  isDevelopment,
+  overwriteShallow
 } from '@domql/utils'
 import { initEmotion } from './initEmotion.js'
 
@@ -34,7 +35,8 @@ function onlyDotsAndNumbers(str) {
 const CDN_PROVIDERS = {
   skypack: {
     url: 'https://cdn.skypack.dev',
-    formatUrl: (pkg, version) => `${CDN_PROVIDERS.skypack.url}/${pkg}${version !== 'latest' ? `@${version}` : ''}`
+    formatUrl: (pkg, version) =>
+      `${CDN_PROVIDERS.skypack.url}/${pkg}${version !== 'latest' ? `@${version}` : ''}`
   },
   symbols: {
     url: 'https://pkg.symbo.ls',
@@ -47,17 +49,21 @@ const CDN_PROVIDERS = {
   }
 }
 
-export const getCDNUrl = (packageName, version = 'latest', provider = 'skypack') => {
+export const getCDNUrl = (
+  packageName,
+  version = 'latest',
+  provider = 'skypack'
+) => {
   const cdnConfig = CDN_PROVIDERS[provider] || CDN_PROVIDERS.skypack
   return cdnConfig.formatUrl(packageName, version)
 }
 
-export const UIkitWithPrefix = () => {
+const UIkitWithPrefix = (prefix = 'smbls') => {
   const newObj = {}
   for (const key in uikit) {
     if (Object.prototype.hasOwnProperty.call(uikit, key)) {
       if (checkIfKeyIsComponent(key)) {
-        newObj[`smbls.${key}`] = uikit[key]
+        newObj[`${prefix}.${key}`] = uikit[key]
       } else {
         newObj[key] = uikit[key]
       }
@@ -114,7 +120,7 @@ export const prepareDependencies = async ({
     try {
       if (cachedDeps[dependency]) return
       cachedDeps[dependency] = true
-      await utils.loadRemoteScript(url, { document, type: "module" })
+      await utils.loadRemoteScript(url, { document, type: 'module' })
     } catch (e) {
       console.error(`Failed to load ${dependency} from ${cdnProvider}:`, e)
 
@@ -122,9 +128,14 @@ export const prepareDependencies = async ({
         try {
           const fallbackUrl = getCDNUrl(dependency, version, 'symbols') + random
           await utils.loadRemoteScript(fallbackUrl, { document })
-          console.log(`Successfully loaded ${dependency} from fallback (symbols.ls)`)
+          console.log(
+            `Successfully loaded ${dependency} from fallback (symbols.ls)`
+          )
         } catch (fallbackError) {
-          console.error(`Failed to load ${dependency} from fallback:`, fallbackError)
+          console.error(
+            `Failed to load ${dependency} from fallback:`,
+            fallbackError
+          )
         }
       }
     }
@@ -137,62 +148,63 @@ export const prepareRequire = async (packages, ctx) => {
   const windowOpts = ctx.window || window
   const defaultProvider = ctx.cdnProvider || 'skypack'
 
-  const initRequire = async ctx => async (key, provider) => {
+  const initRequire = async (ctx) => async (key, provider) => {
     const windowOpts = ctx.window || window
     const pkg = windowOpts.packages[key]
     if (typeof pkg === 'function') return pkg()
     return pkg
   }
 
-  const initRequireOnDemand = async ctx => async (key, provider = defaultProvider) => {
-    const { dependenciesOnDemand } = ctx
-    const documentOpts = ctx.document || document
-    const windowOpts = ctx.window || window
-    if (!windowOpts.packages[key]) {
-      const random = isDevelopment() ? `?${Math.random()}` : ''
-      if (dependenciesOnDemand && dependenciesOnDemand[key]) {
-        const version = dependenciesOnDemand[key]
-        const url = getCDNUrl(key, version, provider) + random
-        try {
-          await ctx.utils.loadRemoteScript(url, {
-            window: windowOpts,
-            document: documentOpts,
-            
-          })
-        } catch (e) {
-          console.error(`Failed to load ${key} from ${provider}:`, e)
-          // Fallback to symbo if not already using it
-          if (provider !== 'symbols') {
-            const fallbackUrl = getCDNUrl(key, version, 'symbols') + random
-            await ctx.utils.loadRemoteScript(fallbackUrl, {
+  const initRequireOnDemand =
+    async (ctx) =>
+    async (key, provider = defaultProvider) => {
+      const { dependenciesOnDemand } = ctx
+      const documentOpts = ctx.document || document
+      const windowOpts = ctx.window || window
+      if (!windowOpts.packages[key]) {
+        const random = isDevelopment() ? `?${Math.random()}` : ''
+        if (dependenciesOnDemand && dependenciesOnDemand[key]) {
+          const version = dependenciesOnDemand[key]
+          const url = getCDNUrl(key, version, provider) + random
+          try {
+            await ctx.utils.loadRemoteScript(url, {
               window: windowOpts,
               document: documentOpts
             })
+          } catch (e) {
+            console.error(`Failed to load ${key} from ${provider}:`, e)
+            // Fallback to symbo if not already using it
+            if (provider !== 'symbols') {
+              const fallbackUrl = getCDNUrl(key, version, 'symbols') + random
+              await ctx.utils.loadRemoteScript(fallbackUrl, {
+                window: windowOpts,
+                document: documentOpts
+              })
+            }
           }
-        }
-      } else {
-        const url = getCDNUrl(key, 'latest', provider) + random
-        try {
-          await ctx.utils.loadRemoteScript(url, {
-            window: windowOpts,
-            document: documentOpts,
-          })
-        } catch (e) {
-          console.error(`Failed to load ${key} from ${provider}:`, e)
-          // Fallback to symbo if not already using it
-          if (provider !== 'symbols') {
-            const fallbackUrl = getCDNUrl(key, 'latest', 'symbols') + random
-            await ctx.utils.loadRemoteScript(fallbackUrl, {
+        } else {
+          const url = getCDNUrl(key, 'latest', provider) + random
+          try {
+            await ctx.utils.loadRemoteScript(url, {
               window: windowOpts,
               document: documentOpts
             })
+          } catch (e) {
+            console.error(`Failed to load ${key} from ${provider}:`, e)
+            // Fallback to symbo if not already using it
+            if (provider !== 'symbols') {
+              const fallbackUrl = getCDNUrl(key, 'latest', 'symbols') + random
+              await ctx.utils.loadRemoteScript(fallbackUrl, {
+                window: windowOpts,
+                document: documentOpts
+              })
+            }
           }
+          windowOpts.packages[key] = 'loadedOnDeman'
         }
-        windowOpts.packages[key] = 'loadedOnDeman'
       }
+      return await windowOpts.require(key, provider)
     }
-    return await windowOpts.require(key, provider)
-  }
 
   if (windowOpts.packages) {
     windowOpts.packages = merge(windowOpts.packages, packages)
@@ -237,3 +249,16 @@ export const preparePages = (app, context) => {
       return pages
     }, pages)
 }
+
+export const prepareSharedLibs = (context) => {
+  const sharedLibraries = context.sharedLibraries
+  for (let i = 0; i < sharedLibraries.length; i++) {
+    const sharedLib = sharedLibraries[i]
+    if (context.type === 'template') {
+      overwriteShallow(context.designSystem, sharedLib.designSystem)
+      deepMerge(context, sharedLib, ['designSystem'], 1)
+    } else {
+      deepMerge(context, sharedLib, [], 1)
+    }
+  }
+}