@movable/studio-framework 2.40.0-redondo-beach.1 → 2.40.0-redondo-beach.4

package/dist/index.es.js

@@ -7498,7 +7498,7 @@ var stringMatch = function stringMatch(original, comparable, ignoreRegExp) {
 };
 
 var studioOverwritableJs = 'var app = new studio[a-zA-Z0-9]*.A\\(\\);';
-var jsIgnoreRE = new RegExp("\\s|".concat(studioOverwritableJs));
+var jsIgnoreRE = new RegExp("\\s|".concat(studioOverwritableJs), 'g');
 var jsCompareString = "(function(){app.render(document.getElementById('react-root')).then(function(){window.APP_SUCCESSFULLY_RENDERED=true;});})();";
 var isPristinePicJsTag = function isPristinePicJsTag(scriptTag) {
   var script = scriptTag.innerHTML;
@@ -7510,8 +7510,16 @@ var isDocumentEligibleForStaticHandling = function isDocumentEligibleForStaticHa
 
   var hasTagContainingPristinePicJs = from_1(scriptTags).some(isPristinePicJsTag);
 
-  if (!hasTagContainingPristinePicJs) return false;
-  if (scriptTags.length > COUNT_OF_SCRIPT_TAGS_COMPILED_BY_STUDIO) return false;
+  if (!hasTagContainingPristinePicJs) {
+    console.log('static statis is false - user-altered js detected');
+    return false;
+  }
+
+  if (scriptTags.length > COUNT_OF_SCRIPT_TAGS_COMPILED_BY_STUDIO) {
+    console.log('static statis is false - user-added script tags detected');
+    return false;
+  }
+
   return true;
 };
 
@@ -7554,7 +7562,11 @@ var areAttributesStatic = function areAttributesStatic(attributes) {
           tags = _step$value$tags === void 0 ? [] : _step$value$tags,
           clickthroughDynamicProperty = _step$value.clickthroughDynamicProperty,
           conditionalDynamicProperty = _step$value.conditionalDynamicProperty;
-      if (appliedElementModifiers || clickthroughDynamicProperty || conditionalDynamicProperty) return false;
+
+      if (appliedElementModifiers || clickthroughDynamicProperty || conditionalDynamicProperty) {
+        console.log('static status is false - dynamic properties on canvas detected');
+        return false;
+      }
 
       var _iterator2 = _createForOfIteratorHelper$2(tags),
           _step2;
@@ -7562,7 +7574,11 @@ var areAttributesStatic = function areAttributesStatic(attributes) {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var tag = _step2.value;
-          if (!isTagStatic(tag)) return false;
+
+          if (!isTagStatic(tag)) {
+            console.log('static status is false - dynamic properties on tag detected');
+            return false;
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -7704,19 +7720,14 @@ var StudioFramework = /*#__PURE__*/function () {
         set: function set(target, key, value) {
           if (key in target) {
             window.RENDERED_STATICALLY = false;
-            console.log("static status is false - overidden StudioFramework class method ".concat(key.toString().match(/\(.*\)/)));
+            console.log("static status is false - overidden StudioFramework class method ", key);
           }
 
           return set$2(target, key, value);
         }
       });
       this.setup.call(proxy);
-
-      if (this.shouldPerformStaticCheck) {
-        if (!(window.RENDERED_STATICALLY = areAttributesStatic(opts))) {
-          console.log('static status is false - presentationAttributes are not static');
-        }
-      }
+      if (this.shouldPerformStaticCheck) window.RENDERED_STATICALLY = areAttributesStatic(opts);
     } else {
       this.setup();
     }
@@ -8473,12 +8484,7 @@ var StudioFramework = /*#__PURE__*/function () {
                 }
 
                 if (this.shouldPerformStaticCheck) {
-                  if (!(window.RENDERED_STATICALLY = isDocumentEligibleForStaticHandling(targetElement))) {
-                    console.log('static status is false - scripts have been altered by the user');
-                  } else {
-                    console.log('static status is true - static check has finished');
-                    console.log('App is static.');
-                  }
+                  if (window.RENDERED_STATICALLY = isDocumentEligibleForStaticHandling(targetElement)) console.log('static status is true - static check has finished');
                 }
 
                 if (format === 'html') {

package/dist/index.js

@@ -7508,7 +7508,7 @@ var stringMatch = function stringMatch(original, comparable, ignoreRegExp) {
 };
 
 var studioOverwritableJs = 'var app = new studio[a-zA-Z0-9]*.A\\(\\);';
-var jsIgnoreRE = new RegExp("\\s|".concat(studioOverwritableJs));
+var jsIgnoreRE = new RegExp("\\s|".concat(studioOverwritableJs), 'g');
 var jsCompareString = "(function(){app.render(document.getElementById('react-root')).then(function(){window.APP_SUCCESSFULLY_RENDERED=true;});})();";
 var isPristinePicJsTag = function isPristinePicJsTag(scriptTag) {
   var script = scriptTag.innerHTML;
@@ -7520,8 +7520,16 @@ var isDocumentEligibleForStaticHandling = function isDocumentEligibleForStaticHa
 
   var hasTagContainingPristinePicJs = from_1(scriptTags).some(isPristinePicJsTag);
 
-  if (!hasTagContainingPristinePicJs) return false;
-  if (scriptTags.length > COUNT_OF_SCRIPT_TAGS_COMPILED_BY_STUDIO) return false;
+  if (!hasTagContainingPristinePicJs) {
+    console.log('static statis is false - user-altered js detected');
+    return false;
+  }
+
+  if (scriptTags.length > COUNT_OF_SCRIPT_TAGS_COMPILED_BY_STUDIO) {
+    console.log('static statis is false - user-added script tags detected');
+    return false;
+  }
+
   return true;
 };
 
@@ -7564,7 +7572,11 @@ var areAttributesStatic = function areAttributesStatic(attributes) {
           tags = _step$value$tags === void 0 ? [] : _step$value$tags,
           clickthroughDynamicProperty = _step$value.clickthroughDynamicProperty,
           conditionalDynamicProperty = _step$value.conditionalDynamicProperty;
-      if (appliedElementModifiers || clickthroughDynamicProperty || conditionalDynamicProperty) return false;
+
+      if (appliedElementModifiers || clickthroughDynamicProperty || conditionalDynamicProperty) {
+        console.log('static status is false - dynamic properties on canvas detected');
+        return false;
+      }
 
       var _iterator2 = _createForOfIteratorHelper$2(tags),
           _step2;
@@ -7572,7 +7584,11 @@ var areAttributesStatic = function areAttributesStatic(attributes) {
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var tag = _step2.value;
-          if (!isTagStatic(tag)) return false;
+
+          if (!isTagStatic(tag)) {
+            console.log('static status is false - dynamic properties on tag detected');
+            return false;
+          }
         }
       } catch (err) {
         _iterator2.e(err);
@@ -7714,19 +7730,14 @@ var StudioFramework = /*#__PURE__*/function () {
         set: function set(target, key, value) {
           if (key in target) {
             window.RENDERED_STATICALLY = false;
-            console.log("static status is false - overidden StudioFramework class method ".concat(key.toString().match(/\(.*\)/)));
+            console.log("static status is false - overidden StudioFramework class method ", key);
           }
 
           return set$2(target, key, value);
         }
       });
       this.setup.call(proxy);
-
-      if (this.shouldPerformStaticCheck) {
-        if (!(window.RENDERED_STATICALLY = areAttributesStatic(opts))) {
-          console.log('static status is false - presentationAttributes are not static');
-        }
-      }
+      if (this.shouldPerformStaticCheck) window.RENDERED_STATICALLY = areAttributesStatic(opts);
     } else {
       this.setup();
     }
@@ -8483,12 +8494,7 @@ var StudioFramework = /*#__PURE__*/function () {
                 }
 
                 if (this.shouldPerformStaticCheck) {
-                  if (!(window.RENDERED_STATICALLY = isDocumentEligibleForStaticHandling(targetElement))) {
-                    console.log('static status is false - scripts have been altered by the user');
-                  } else {
-                    console.log('static status is true - static check has finished');
-                    console.log('App is static.');
-                  }
+                  if (window.RENDERED_STATICALLY = isDocumentEligibleForStaticHandling(targetElement)) console.log('static status is true - static check has finished');
                 }
 
                 if (format === 'html') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework",
-  "version": "2.40.0-redondo-beach.1",
+  "version": "2.40.0-redondo-beach.4",
   "description": "A Component library for reactive Studio apps.",
   "author": "Movable Ink",
   "repository": "movableink/studio-framework",
@@ -35,8 +35,8 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.13.0",
     "@movable/eslint-config-react": "^1.0.1",
-    "@movable/framework-types": "^2.40.0-redondo-beach.1",
-    "@movable/studio-framework-test-helpers": "^2.40.0-redondo-beach.1",
+    "@movable/framework-types": "^2.40.0-redondo-beach.4",
+    "@movable/studio-framework-test-helpers": "^2.40.0-redondo-beach.4",
     "@types/qunit": "^2.11.1",
     "@types/qunit-dom": "^0.7.0",
     "@types/react": "^17.0.6",
@@ -68,5 +68,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "24e218f663c2ae24d27152472403a43835a9218f"
+  "gitHead": "61ab1eb94de2426a822b42f7244b2770125c3699"
 }