@symbo.ls/create 2.11.416 → 2.11.417

package/dist/cjs/bundle/index.js

@@ -3214,7 +3214,7 @@ var require_cjs2 = __commonJS({
     };
     var import_globals2 = __toESM2(require_cjs18(), 1);
     var import_utils32 = __toESM2(require_cjs22(), 1);
-    var ENV2 = "development";
+    var ENV3 = "development";
     var colorStringToRgbaArray = (color) => {
       if (color === "")
         return [0, 0, 0, 0];
@@ -3337,7 +3337,7 @@ var require_cjs2 = __commonJS({
     var opacify2 = (color, opacity) => {
       const arr = colorStringToRgbaArray(color);
       if (!arr) {
-        if (ENV2 === "test" || ENV2 === "development")
+        if (ENV3 === "test" || ENV3 === "development")
           console.warn(color + " color is not rgba");
         return;
       }
@@ -11405,7 +11405,7 @@ var require_extendUtils = __commonJS({
     });
     module2.exports = __toCommonJS2(extendUtils_exports);
     var import_utils32 = require_cjs();
-    var ENV2 = "development";
+    var ENV3 = "development";
     var generateHash = () => Math.random().toString(36).substring(2);
     var extendStackRegistry = {};
     var extendCachedRegistry = {};
@@ -11486,7 +11486,7 @@ var require_extendUtils = __commonJS({
         else if (pageExists)
           return pageExists;
         else {
-          if (options.verbose && (ENV2 === "test" || ENV2 === "development")) {
+          if (options.verbose && (ENV3 === "test" || ENV3 === "development")) {
             console.warn("Extend is string but component was not found:", extend);
           }
           return {};
@@ -11540,7 +11540,7 @@ var require_extend = __commonJS({
     module2.exports = __toCommonJS2(extend_exports);
     var import_utils32 = require_cjs();
     var import_utils210 = require_utils();
-    var ENV2 = "development";
+    var ENV3 = "development";
     var mainExtend;
     var applyExtend = (element, parent, options = {}) => {
       if ((0, import_utils32.isFunction)(element))
@@ -11549,7 +11549,7 @@ var require_extend = __commonJS({
       const context = element.context || parent.context;
       extend = (0, import_utils210.fallbackStringExtend)(extend, context, options);
       const extendStack = (0, import_utils210.getExtendStack)(extend, context);
-      if (ENV2 !== "test" || ENV2 !== "development")
+      if (ENV3 !== "test" || ENV3 !== "development")
         delete element.extend;
       let childExtendStack = [];
       if (parent) {
@@ -11639,7 +11639,7 @@ var require_component = __commonJS({
     module2.exports = __toCommonJS2(component_exports);
     var import_utils32 = require_cjs();
     var import_extend = require_extend();
-    var ENV2 = "development";
+    var ENV3 = "development";
     var DOMQL_BUILTINS = [
       "extend",
       "childExtend",
@@ -11743,7 +11743,7 @@ var require_component = __commonJS({
         if (componentExists)
           element.extend = componentExists;
         else {
-          if ((ENV2 === "test" || ENV2 === "development") && options.verbose) {
+          if ((ENV3 === "test" || ENV3 === "development") && options.verbose) {
             console.warn(execExtend, "is not in library", components, element);
             console.warn("replacing with ", {});
           }
@@ -12079,7 +12079,7 @@ var require_node2 = __commonJS({
     var import_applyParam = require_applyParam();
     var import_utils210 = require_utils();
     var import_propEvents = require_propEvents();
-    var ENV2 = "development";
+    var ENV3 = "development";
     var createNode = (element, options) => {
       let { node: node3, tag, __ref: ref } = element;
       let isNewNode;
@@ -12093,7 +12093,7 @@ var require_node2 = __commonJS({
           node3 = element.node = (0, import_render.cacheNode)(element);
         (0, import_event.triggerEventOn)("attachNode", element, options);
       }
-      if (ENV2 === "test" || ENV2 === "development" || options.alowRefReference) {
+      if (ENV3 === "test" || ENV3 === "development" || options.alowRefReference) {
         node3.ref = element;
         if ((0, import_utils32.isFunction)(node3.setAttribute))
           node3.setAttribute("key", element.key);
@@ -14090,7 +14090,7 @@ var require_create4 = __commonJS({
     var import_utils32 = require_cjs();
     var import_options3 = __toESM2(require_options(), 1);
     var import_component = require_component();
-    var ENV2 = "development";
+    var ENV3 = "development";
     var create2 = (element, parent, key, options = import_options3.default.create || {}, attachOptions) => {
       cacheOptions(element, options);
       if (checkIfPrimitive(element)) {
@@ -14138,13 +14138,13 @@ var require_create4 = __commonJS({
     };
     var createBasedOnType = (element, parent, key, options) => {
       if (element === void 0) {
-        if (ENV2 === "test" || ENV2 === "development") {
+        if (ENV3 === "test" || ENV3 === "development") {
           console.warn(key, "element is undefined in", parent && parent.__ref && parent.__ref.path);
         }
         return {};
       }
       if ((0, import_utils32.isString)(key) && key.slice(0, 2 === "__")) {
-        if (ENV2 === "test" || ENV2 === "development") {
+        if (ENV3 === "test" || ENV3 === "development") {
           console.warn(key, "seems like to be in __ref");
         }
       }
@@ -14215,7 +14215,7 @@ var require_create4 = __commonJS({
       try {
         (0, import_node.default)(element, options);
       } catch (e) {
-        if (ENV2 === "test" || ENV2 === "development")
+        if (ENV3 === "test" || ENV3 === "development")
           console.warn(element, e);
       }
       if (!ref.__if) {
@@ -27930,6 +27930,7 @@ var initEmotion = (key, options = {}) => {
 };
 
 // src/prepare.js
+var ENV2 = "development";
 var checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = (0, import_utils29.isString)(key);
   if (!isFirstKeyString)
@@ -27956,17 +27957,18 @@ var prepareComponents = (options) => {
 var prepareUtils = (options) => {
   return { ...utilImports_exports, ...import_scratch2.scratchUtils, ...options.snippets || options.utils || options.functions || {} };
 };
-var prepareDependencies = ({ dependencies, document: document2 }) => {
+var prepareDependencies = ({ dependencies, dependenciesOnDemand, document: document2 }) => {
   if (!dependencies || Object.keys(dependencies).length === 0) {
     return null;
   }
-  const ENV2 = "development";
   for (const [dependency, version] of Object.entries(dependencies)) {
     if (version === "loading" || version === "error") {
       continue;
     }
     const random = ENV2 === "development" ? `?${Math.random()}` : "";
     const url2 = `https://pkg.symbo.ls/${dependency}/${version}.js${random}`;
+    if (dependenciesOnDemand && dependenciesOnDemand[dependency])
+      continue;
     try {
       utilImports_exports.loadJavascriptFileSync(url2, document2);
     } catch (e) {
@@ -27993,10 +27995,18 @@ var preparePackages = (packages, opts) => {
   if (!windowOpts.requireOnDemand) {
     windowOpts.requireOnDemand = (key) => {
       const { dependenciesOnDemand, document: document2 } = opts;
-      if (!windowOpts.packages[key] && dependenciesOnDemand && dependenciesOnDemand[key]) {
-        const version = dependenciesOnDemand[key];
-        const url2 = `https://pkg.symbo.ls/${key}/${version}.js`;
-        utilImports_exports.loadJavascriptFileSync(url2, document2);
+      if (!windowOpts.packages[key]) {
+        const random = ENV2 === "development" ? `?${Math.random()}` : "";
+        if (dependenciesOnDemand && dependenciesOnDemand[key]) {
+          const version = dependenciesOnDemand[key];
+          const url2 = `https://pkg.symbo.ls/${key}/${version}.js${random}`;
+          utilImports_exports.loadJavascriptFileSync(url2, document2);
+        } else {
+          const url2 = `https://pkg.symbo.ls/${key}${random}`;
+          utilImports_exports.loadJavascriptFileSync(url2, document2, () => {
+            windowOpts.packages[key] = "loadedOnDeman";
+          });
+        }
       }
       return windowOpts.require(key);
     };

package/dist/cjs/prepare.js

@@ -43,6 +43,7 @@ var import_utils = require("@domql/utils");
 var import_initEmotion = require("./initEmotion");
 var uikit = __toESM(require("@symbo.ls/uikit"), 1);
 var utils = __toESM(require("./utilImports"), 1);
+const ENV = "development";
 const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = (0, import_utils.isString)(key);
   if (!isFirstKeyString)
@@ -69,17 +70,18 @@ const prepareComponents = (options) => {
 const prepareUtils = (options) => {
   return { ...utils, ...utils.scratchUtils, ...options.snippets || options.utils || options.functions || {} };
 };
-const prepareDependencies = ({ dependencies, document: document2 }) => {
+const prepareDependencies = ({ dependencies, dependenciesOnDemand, document: document2 }) => {
   if (!dependencies || Object.keys(dependencies).length === 0) {
     return null;
   }
-  const ENV = "development";
   for (const [dependency, version] of Object.entries(dependencies)) {
     if (version === "loading" || version === "error") {
       continue;
     }
     const random = ENV === "development" ? `?${Math.random()}` : "";
     const url = `https://pkg.symbo.ls/${dependency}/${version}.js${random}`;
+    if (dependenciesOnDemand && dependenciesOnDemand[dependency])
+      continue;
     try {
       utils.loadJavascriptFileSync(url, document2);
     } catch (e) {
@@ -106,10 +108,18 @@ const preparePackages = (packages, opts) => {
   if (!windowOpts.requireOnDemand) {
     windowOpts.requireOnDemand = (key) => {
       const { dependenciesOnDemand, document: document2 } = opts;
-      if (!windowOpts.packages[key] && dependenciesOnDemand && dependenciesOnDemand[key]) {
-        const version = dependenciesOnDemand[key];
-        const url = `https://pkg.symbo.ls/${key}/${version}.js`;
-        utils.loadJavascriptFileSync(url, document2);
+      if (!windowOpts.packages[key]) {
+        const random = ENV === "development" ? `?${Math.random()}` : "";
+        if (dependenciesOnDemand && dependenciesOnDemand[key]) {
+          const version = dependenciesOnDemand[key];
+          const url = `https://pkg.symbo.ls/${key}/${version}.js${random}`;
+          utils.loadJavascriptFileSync(url, document2);
+        } else {
+          const url = `https://pkg.symbo.ls/${key}${random}`;
+          utils.loadJavascriptFileSync(url, document2, () => {
+            windowOpts.packages[key] = "loadedOnDeman";
+          });
+        }
       }
       return windowOpts.require(key);
     };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.11.416",
+  "version": "2.11.417",
   "license": "MIT",
-  "gitHead": "ed1acb2a00946055aad3b2f9aa5a4a44f6ddc745",
+  "gitHead": "d3f5ad50e57320d72c7d50bc0309f3308e6b8ff2",
   "files": [
     "src",
     "dist"

package/src/prepare.js

@@ -6,6 +6,8 @@ import { initEmotion } from './initEmotion'
 import * as uikit from '@symbo.ls/uikit'
 import * as utils from './utilImports'
 
+const ENV = process.env.NODE_ENV
+
 const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = isString(key)
   if (!isFirstKeyString) return
@@ -35,13 +37,11 @@ export const prepareUtils = options => {
   return { ...utils, ...utils.scratchUtils, ...(options.snippets || options.utils || options.functions || {}) }
 }
 
-export const prepareDependencies = ({ dependencies, document }) => {
+export const prepareDependencies = ({ dependencies, dependenciesOnDemand, document }) => {
   if (!dependencies || Object.keys(dependencies).length === 0) {
     return null
   }
 
-  const ENV = process.env.NODE_ENV
-
   for (const [dependency, version] of Object.entries(dependencies)) {
     if (version === 'loading' || version === 'error') {
       continue
@@ -50,12 +50,15 @@ export const prepareDependencies = ({ dependencies, document }) => {
     const random = ENV === 'development' ? `?${Math.random()}` : ''
     const url = `https://pkg.symbo.ls/${dependency}/${version}.js${random}`
 
+    if (dependenciesOnDemand && dependenciesOnDemand[dependency]) continue
+
     try {
       utils.loadJavascriptFileSync(url, document)
     } catch (e) {
       console.error(`Failed to load ${dependency}:`, e)
     }
   }
+
   return dependencies
 }
 
@@ -79,10 +82,18 @@ export const preparePackages = (packages, opts) => {
   if (!windowOpts.requireOnDemand) {
     windowOpts.requireOnDemand = key => {
       const { dependenciesOnDemand, document } = opts
-      if (!windowOpts.packages[key] && dependenciesOnDemand && dependenciesOnDemand[key]) {
-        const version = dependenciesOnDemand[key]
-        const url = `https://pkg.symbo.ls/${key}/${version}.js`
-        utils.loadJavascriptFileSync(url, document)
+      if (!windowOpts.packages[key]) {
+        const random = ENV === 'development' ? `?${Math.random()}` : ''
+        if (dependenciesOnDemand && dependenciesOnDemand[key]) {
+          const version = dependenciesOnDemand[key]
+          const url = `https://pkg.symbo.ls/${key}/${version}.js${random}`
+          utils.loadJavascriptFileSync(url, document)
+        } else {
+          const url = `https://pkg.symbo.ls/${key}${random}`
+          utils.loadJavascriptFileSync(url, document, () => {
+            windowOpts.packages[key] = 'loadedOnDeman'
+          })
+        }
       }
       return windowOpts.require(key)
     }