Release build 4.27.0 [ci release]

jonathanKingston · github-actions[bot] · commit f98760680ffb · 2023-07-19T12:22:22.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Collect commit ranges
         run: |
-          echo "CHANGELOG=$(bash ./scripts/changelog.sh)" > ${{ github.workspace }}-CHANGELOG.txt
+          bash ./scripts/changelog.sh > ${{ github.workspace }}-CHANGELOG.txt
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
diff --git a/Sources/ContentScopeScripts/dist/contentScope.js b/Sources/ContentScopeScripts/dist/contentScope.js
diff --git a/Sources/ContentScopeScripts/dist/contentScopeIsolated.js b/Sources/ContentScopeScripts/dist/contentScopeIsolated.js
diff --git a/build/android/contentScope.js b/build/android/contentScope.js
diff --git a/build/chrome-mv3/inject.js b/build/chrome-mv3/inject.js
@@ -2719,7 +2719,7 @@
 
     function initialShouldBlockTrackerCookie () {
         const injectName = "chrome-mv3";
-        return injectName === 'chrome-mv3'
+        return injectName === 'chrome-mv3' 
     }
 
     // Initial cookie policy pre init
@@ -2808,7 +2808,7 @@
             if (this.trackerLookup) {
                 trackerLookup$1 = this.trackerLookup;
             }
-            if (this.bundledConfig) {
+            if (this.bundledConfig?.features?.cookie) {
                 // use the bundled config to get a best-effort at the policy, before the background sends the real one
                 const { exceptions, settings } = this.bundledConfig.features.cookie;
                 const tabHostname = getTabHostname();
@@ -10793,7 +10793,7 @@
      * @property {import('./content-feature').Site} site
      * @property {import('./utils.js').Platform} platform
      * @property {boolean} documentOriginIsTracker
-     * @property {object} [bundledConfig]
+     * @property {import('./utils.js').RemoteConfig} bundledConfig
      * @property {string} [injectName]
      * @property {object} trackerLookup - provided currently only by the extension
      */
diff --git a/build/chrome/inject.js b/build/chrome/inject.js
diff --git a/build/contentScope.js b/build/contentScope.js
@@ -10556,7 +10556,7 @@
 
     function initialShouldBlockTrackerCookie () {
         const injectName = "integration";
-        return injectName === 'chrome-mv3'
+        return injectName === 'windows'
     }
 
     // Initial cookie policy pre init
@@ -10645,7 +10645,7 @@
             if (this.trackerLookup) {
                 trackerLookup = this.trackerLookup;
             }
-            if (this.bundledConfig) {
+            if (this.bundledConfig?.features?.cookie) {
                 // use the bundled config to get a best-effort at the policy, before the background sends the real one
                 const { exceptions, settings } = this.bundledConfig.features.cookie;
                 const tabHostname = getTabHostname();
@@ -13599,7 +13599,7 @@
      * @property {import('./content-feature').Site} site
      * @property {import('./utils.js').Platform} platform
      * @property {boolean} documentOriginIsTracker
-     * @property {object} [bundledConfig]
+     * @property {import('./utils.js').RemoteConfig} bundledConfig
      * @property {string} [injectName]
      * @property {object} trackerLookup - provided currently only by the extension
      */
diff --git a/build/firefox/inject.js b/build/firefox/inject.js
@@ -2753,7 +2753,7 @@
 
     function initialShouldBlockTrackerCookie () {
         const injectName = "firefox";
-        return injectName === 'firefox' 
+        return injectName === 'firefox'  
     }
 
     // Initial cookie policy pre init
@@ -2842,7 +2842,7 @@
             if (this.trackerLookup) {
                 trackerLookup = this.trackerLookup;
             }
-            if (this.bundledConfig) {
+            if (this.bundledConfig?.features?.cookie) {
                 // use the bundled config to get a best-effort at the policy, before the background sends the real one
                 const { exceptions, settings } = this.bundledConfig.features.cookie;
                 const tabHostname = getTabHostname();
@@ -10827,7 +10827,7 @@
      * @property {import('./content-feature').Site} site
      * @property {import('./utils.js').Platform} platform
      * @property {boolean} documentOriginIsTracker
-     * @property {object} [bundledConfig]
+     * @property {import('./utils.js').RemoteConfig} bundledConfig
      * @property {string} [injectName]
      * @property {object} trackerLookup - provided currently only by the extension
      */
diff --git a/build/integration/contentScope.js b/build/integration/contentScope.js
@@ -10556,7 +10556,7 @@
 
     function initialShouldBlockTrackerCookie () {
         const injectName = "integration";
-        return injectName === 'chrome-mv3'
+        return injectName === 'windows'
     }
 
     // Initial cookie policy pre init
@@ -10645,7 +10645,7 @@
             if (this.trackerLookup) {
                 trackerLookup = this.trackerLookup;
             }
-            if (this.bundledConfig) {
+            if (this.bundledConfig?.features?.cookie) {
                 // use the bundled config to get a best-effort at the policy, before the background sends the real one
                 const { exceptions, settings } = this.bundledConfig.features.cookie;
                 const tabHostname = getTabHostname();
@@ -13599,7 +13599,7 @@
      * @property {import('./content-feature').Site} site
      * @property {import('./utils.js').Platform} platform
      * @property {boolean} documentOriginIsTracker
-     * @property {object} [bundledConfig]
+     * @property {import('./utils.js').RemoteConfig} bundledConfig
      * @property {string} [injectName]
      * @property {object} trackerLookup - provided currently only by the extension
      */
diff --git a/build/windows/contentScope.js b/build/windows/contentScope.js
diff --git a/inject/android.js b/inject/android.js
@@ -27,7 +27,8 @@ function initCode () {
         platform: processedConfig.platform,
         trackerLookup: processedConfig.trackerLookup,
         documentOriginIsTracker: isTrackerOrigin(processedConfig.trackerLookup),
-        site: processedConfig.site
+        site: processedConfig.site,
+        bundledConfig: processedConfig.bundledConfig
     })
 
     const messageSecret = processedConfig.messageSecret
diff --git a/inject/apple.js b/inject/apple.js
@@ -17,7 +17,8 @@ function initCode () {
         platform: processedConfig.platform,
         trackerLookup: processedConfig.trackerLookup,
         documentOriginIsTracker: isTrackerOrigin(processedConfig.trackerLookup),
-        site: processedConfig.site
+        site: processedConfig.site,
+        bundledConfig: processedConfig.bundledConfig
     })
 
     init(processedConfig)
diff --git a/inject/windows.js b/inject/windows.js
@@ -17,7 +17,8 @@ function initCode () {
         platform: processedConfig.platform,
         trackerLookup: processedConfig.trackerLookup,
         documentOriginIsTracker: isTrackerOrigin(processedConfig.trackerLookup),
-        site: processedConfig.site
+        site: processedConfig.site,
+        bundledConfig: processedConfig.bundledConfig
     })
 
     init(processedConfig)
diff --git a/src/content-scope-features.js b/src/content-scope-features.js
@@ -29,7 +29,7 @@ const performanceMonitor = new PerformanceMonitor()
  * @property {import('./content-feature').Site} site
  * @property {import('./utils.js').Platform} platform
  * @property {boolean} documentOriginIsTracker
- * @property {object} [bundledConfig]
+ * @property {import('./utils.js').RemoteConfig} bundledConfig
  * @property {string} [injectName]
  * @property {object} trackerLookup - provided currently only by the extension
  */
diff --git a/src/features/cookie.js b/src/features/cookie.js
@@ -14,7 +14,7 @@ import { isTrackerOrigin } from '../trackers.js'
 
 function initialShouldBlockTrackerCookie () {
     const injectName = import.meta.injectName
-    return injectName === 'chrome' || injectName === 'firefox' || injectName === 'chrome-mv3'
+    return injectName === 'chrome' || injectName === 'firefox' || injectName === 'chrome-mv3' || injectName === 'windows'
 }
 
 // Initial cookie policy pre init
@@ -103,7 +103,7 @@ export default class CookieFeature extends ContentFeature {
         if (this.trackerLookup) {
             trackerLookup = this.trackerLookup
         }
-        if (this.bundledConfig) {
+        if (this.bundledConfig?.features?.cookie) {
             // use the bundled config to get a best-effort at the policy, before the background sends the real one
             const { exceptions, settings } = this.bundledConfig.features.cookie
             const tabHostname = getTabHostname()
diff --git a/src/utils.js b/src/utils.js
@@ -707,6 +707,7 @@ export function processConfig (data, userList, preferences, platformSpecificFeat
     // Copy feature settings from remote config to preferences object
     output.featureSettings = parseFeatureSettings(data, enabledFeatures)
     output.trackerLookup = import.meta.trackerLookup
+    output.bundledConfig = data
 
     return output
 }
diff --git a/unit-test/utils.js b/unit-test/utils.js
@@ -16,7 +16,7 @@ describe('Helpers checks', () => {
     })
 
     it('processes config in expected way for minSupportedVersion and numeric versions', () => {
-        const processedConfig = processConfig({
+        const configIn = {
             features: {
                 testFeature: {
                     state: 'enabled',
@@ -53,16 +53,19 @@ describe('Helpers checks', () => {
                 }
             },
             unprotectedTemporary: []
-        },
-        [],
-        {
-            platform: {
-                name: 'android'
+        }
+        const processedConfig = processConfig(
+            configIn,
+            [],
+            {
+                platform: {
+                    name: 'android'
+                },
+                versionNumber: 99,
+                sessionKey: 'testSessionKey'
             },
-            versionNumber: 99,
-            sessionKey: 'testSessionKey'
-        },
-        [])
+            []
+        )
         expect(processedConfig).toEqual({
             site: {
                 domain: 'localhost',
@@ -87,12 +90,13 @@ describe('Helpers checks', () => {
             versionNumber: 99,
             sessionKey: 'testSessionKey',
             // import.meta.trackerLookup is undefined because we've not overloaded it
-            trackerLookup: undefined
+            trackerLookup: undefined,
+            bundledConfig: configIn
         })
     })
 
     it('processes config in expected way for minSupportedVersion and string versions', () => {
-        const processedConfig = processConfig({
+        const configIn = {
             features: {
                 testFeature: {
                     state: 'enabled',
@@ -129,16 +133,19 @@ describe('Helpers checks', () => {
                 }
             },
             unprotectedTemporary: []
-        },
-        [],
-        {
-            platform: {
-                name: 'ios'
+        }
+        const processedConfig = processConfig(
+            configIn,
+            [],
+            {
+                platform: {
+                    name: 'ios'
+                },
+                versionString: '0.9.9',
+                sessionKey: 'testSessionKey'
             },
-            versionString: '0.9.9',
-            sessionKey: 'testSessionKey'
-        },
-        [])
+            []
+        )
         expect(processedConfig).toEqual({
             site: {
                 domain: 'localhost',
@@ -162,7 +169,8 @@ describe('Helpers checks', () => {
             },
             versionString: '0.9.9',
             sessionKey: 'testSessionKey',
-            trackerLookup: undefined
+            trackerLookup: undefined,
+            bundledConfig: configIn
         })
     })
 
