Release build 4.21.0 [ci release]

Author: shakyShane

.github/workflows/tests.yml

@@ -69,9 +69,15 @@ jobs:
       if: always()
       with:
         name: playwright-report
-        path: playwright-report/
+        path: test-results
         retention-days: 5
     - run: npm run test-int-x
+    - uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: playwright-report-pages
+        path: packages/special-pages/test-results
+        retention-days: 5
     - name: Build docs
       run: npm run docs
 

Package.swift

@@ -21,6 +21,7 @@ let package = Package(
             dependencies: [],
             resources: [
                 .process("dist/contentScope.js"),
+                .process("dist/contentScopeIsolated.js"),
                 .copy("dist/pages"),
             ]
         ),

Sources/ContentScopeScripts/dist/contentScope.js

@@ -427,6 +427,27 @@
         return false
     }
 
+    /**
+     * @param {*[]} argsArray
+     * @returns {string}
+     */
+    function debugSerialize (argsArray) {
+        const maxSerializedSize = 1000;
+        const serializedArgs = argsArray.map((arg) => {
+            try {
+                const serializableOut = JSON.stringify(arg);
+                if (serializableOut.length > maxSerializedSize) {
+                    return `<truncated, length: ${serializableOut.length}, value: ${serializableOut.substring(0, maxSerializedSize)}...>`
+                }
+                return serializableOut
+            } catch (e) {
+                // Sometimes this happens when we can't serialize an object to string but we still wish to log it and make other args readable
+                return '<unserializable>'
+            }
+        });
+        return JSON.stringify(serializedArgs)
+    }
+
     /**
      * @template {object} P
      * @typedef {object} ProxyObject<P>
@@ -469,7 +490,7 @@
                         kind: this.property,
                         documentUrl: document.location.href,
                         stack: getStack(),
-                        args: JSON.stringify(args[2])
+                        args: debugSerialize(args[2])
                     });
                 }
                 // The normal return value
@@ -598,12 +619,7 @@
     }
 
     function parseVersionString (versionString) {
-        const [major = 0, minor = 0, patch = 0] = versionString.split('.').map(Number);
-        return {
-            major,
-            minor,
-            patch
-        }
+        return versionString.split('.').map(Number)
     }
 
     /**
@@ -612,12 +628,20 @@
      * @returns {boolean}
      */
     function satisfiesMinVersion (minVersionString, applicationVersionString) {
-        const { major: minMajor, minor: minMinor, patch: minPatch } = parseVersionString(minVersionString);
-        const { major, minor, patch } = parseVersionString(applicationVersionString);
-
-        return (major > minMajor ||
-                (major >= minMajor && minor > minMinor) ||
-                (major >= minMajor && minor >= minMinor && patch >= minPatch))
+        const minVersions = parseVersionString(minVersionString);
+        const currentVersions = parseVersionString(applicationVersionString);
+        const maxLength = Math.max(minVersions.length, currentVersions.length);
+        for (let i = 0; i < maxLength; i++) {
+            const minNumberPart = minVersions[i] || 0;
+            const currentVersionPart = currentVersions[i] || 0;
+            if (currentVersionPart > minNumberPart) {
+                return true
+            }
+            if (currentVersionPart < minNumberPart) {
+                return false
+            }
+        }
+        return true
     }
 
     /**
@@ -762,6 +786,9 @@
             ...baseFeatures,
             'webCompat'
         ],
+        'apple-isolated': [
+            'duckPlayer'
+        ],
         android: [
             ...baseFeatures,
             'clickToLoad'