Merge pull request #662 from GoogleChromeLabs/develop

v0.8.0
GoogleChromeLabs · May 9, 2024 · 3964990 · 3964990
2 parents c62d2c6 + f6ca935
commit 3964990
Show file tree

Hide file tree

Showing 125 changed files with 5,357 additions and 5,273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -332,4 +332,28 @@
 * Fix: CLI dashboard blocking reason. https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/618
 
 ## Others
-* Add demo RWS for command line launcher https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/578
+* Add demo RWS for command line launcher https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/578
+
+
+#v0.8.0
+## Extension
+* Improve “Known Breakages” component UI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/643
+* Update “Clear All” button render condition for filter chips https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/637
+* Add readiness content under “Facilitated Testing” section https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/663
+* Fix: Broken download button icon UI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/636
+* Fix: Known breakages section throwing error when a link is quickly opened and closed https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/654
+* Update “Privacy Sandbox” timeline SVG https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/649
+* Update landing pages UI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/659
+* Fix: Normalize blocking reason https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/658
+* Fix: Revise method to keep service worker alive https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/655
+
+
+## CLI
+* Feature: Add HTML report generation to CLI dashboard and CLI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/646
+* Fix: Remove debug log statement https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/633
+* Fix: Merge blocked reasons data in dashboard https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/650
+* Enhancement: CLI output path relative to “out” directory. https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/638
+* Miscellaneous CLI dashboard improvements https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/660
+
+## Others
+* Feature: Update babel-loader webpack config to have caching support for faster builds https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/452
diff --git a/assets/data/open-cookie-database.json b/assets/data/open-cookie-database.json
@@ -19487,4 +19487,4 @@
       "wildcard": "0"
     }
   ]
-}
+}
diff --git a/bin/chrome-3pcd-ps.bat b/bin/chrome-3pcd-ps.bat
@@ -1,7 +1,7 @@
 :: Chrome 3pcd with PS Extension
 
 :: Download PS Extension
-set "ps_analysis_tool_version=v0.7.0"
+set "ps_analysis_tool_version=v0.8.0"
 cd /d %TEMP%
 if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
     mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%

diff --git a/bin/chrome-default-ps.bat b/bin/chrome-default-ps.bat
@@ -1,7 +1,7 @@
 :: Default Chrome with PS Extension
 
 :: Download PS Extension
-set "ps_analysis_tool_version=v0.7.0"
+set "ps_analysis_tool_version=v0.8.0"
 cd /d %TEMP%
 if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
     mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%

diff --git a/bin/chrome_launcher.sh b/bin/chrome_launcher.sh
@@ -2,7 +2,7 @@
 
 # Download Extension
 extension_setup() {
-  ps_analysis_tool_version=v0.7.0
+  ps_analysis_tool_version=v0.8.0
   extension_dir="/var/tmp"
   cd $extension_dir
   if [ ! -d $extension_dir/ps-analysis-tool-$ps_analysis_tool_version ]; then

diff --git a/bin/install.sh b/bin/install.sh
@@ -4,7 +4,7 @@
 mkdir -p ~/bin/
 
 # Download Chrome Launcher Script and save to ~/bin/chrome_launcher.sh
-curl -s https://raw.githubusercontent.com/GoogleChromeLabs/ps-analysis-tool/develop/bin/chrome_launcher.sh -o ~/bin/chrome_launcher.sh
+curl -s https://raw.githubusercontent.com/GoogleChromeLabs/ps-analysis-tool/main/bin/chrome_launcher.sh -o ~/bin/chrome_launcher.sh
 
 chmod 755 ~/bin/chrome_launcher.sh
 

diff --git a/packages/cli-dashboard/webpack.config.cjs → dashboard.webpack.config.cjs b/packages/cli-dashboard/webpack.config.cjs → dashboard.webpack.config.cjs
@@ -15,21 +15,47 @@
  */
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlInlineScriptPlugin = require('html-inline-script-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 const WebpackBar = require('webpackbar');
-const commonConfig = require('../../webpack.shared.cjs');
+const commonConfig = require('./webpack.shared.cjs');
+
+const report = {
+  entry: {
+    index: './packages/report/src/index.tsx',
+  },
+  output: {
+    path: path.resolve(__dirname, './dist/cli-dashboard/report'),
+    filename: '[name].js',
+    publicPath: '/',
+  },
+  plugins: [
+    new WebpackBar({
+      name: 'Report',
+      color: '#357B66',
+    }),
+    new HtmlWebpackPlugin({
+      title: 'Report',
+      template: './packages/report/public/index.html',
+      filename: 'index.html',
+      inject: true,
+    }),
+    new HtmlInlineScriptPlugin(),
+  ],
+  ...commonConfig,
+};
 
 const dashboard = {
   entry: {
-    index: './src/index.tsx',
+    index: './packages/cli-dashboard/src/index.tsx',
   },
   output: {
-    path: path.resolve(__dirname, './dist/'),
+    path: path.resolve(__dirname, './dist/cli-dashboard'),
     filename: '[name].js',
   },
   devServer: {
     static: {
-      directory: path.join(__dirname, './dist'),
+      directory: path.join(__dirname, './dist/cli-dashboard'),
     },
     compress: true,
     port: 9000,
@@ -41,15 +67,15 @@ const dashboard = {
     }),
     new HtmlWebpackPlugin({
       title: 'Report',
-      template: './public/index.html',
+      template: './packages/cli-dashboard/public/index.html',
       filename: 'index.html',
       inject: false,
     }),
     new CopyPlugin({
-      patterns: [{ from: '../../out', to: 'out' }],
+      patterns: [{ from: './out', to: 'out' }],
     }),
   ],
   ...commonConfig,
 };
 
-module.exports = dashboard;
+module.exports = [dashboard, report];
diff --git a/data/related_website_sets.json b/data/related_website_sets.json
@@ -681,13 +681,107 @@
       "contact": "[email protected]",
       "primary": "https://tvn.pl",
       "associatedSites": [
+        "https://player.pl",
         "https://tvn24.pl",
         "https://zdrowietvn.pl"
       ],
       "rationaleBySite": {
+        "https://player.pl": "Streaming service that is owned by TVN S.A.. Information about the connection with TVN is included in the footer of this website",
         "https://zdrowietvn.pl": "Educational service that is owned by TVN S.A.. Information about the connection with TVN is included in the footer of this website",
         "https://tvn24.pl": "News service that is owned by TVN S.A.. Information about the connection with TVN is included in the footer of this website"
       }
+    },
+    {
+      "primary": "https://zalo.me",
+      "contact": "[email protected]",
+      "associatedSites": [
+        "https://zingmp3.vn",
+        "https://baomoi.com",
+        "https://smoney.vn"
+      ],
+      "rationaleBySite": {
+        "https://zingmp3.vn": "Music Website owned by Zalo Group, VNG",
+        "https://baomoi.com": "News Website owned by Zalo Group, VNG",
+        "https://smoney.vn": "News Website owned by Zalo Group, VNG"
+      }
+    },
+    {
+      "primary": "https://finn.no",
+      "contact": "[email protected]",
+      "associatedSites": [
+        "https://prisjakt.no",
+        "https://mittanbud.no"
+      ],
+      "serviceSites": [
+        "https://pdmp-apis.no"
+      ],
+      "rationaleBySite": {
+        "https://prisjakt.no": "Site owned by Schibsted with shared SSO across Schibsted Norway's sites and common branding that clearly shows the relation between the sites.",
+        "https://mittanbud.no": "Site owned by Schibsted with shared SSO across Schibsted Norway's sites and common branding that clearly shows the relation between the sites.",
+        "https://pdmp-apis.no": "Site owned by Schibsted that provides APIs for users across Schibsted's sites."
+      }
+    },
+    {
+      "contact": "[email protected]",
+      "primary": "https://laprensagrafica.com",
+      "associatedSites": [
+        "https://elgrafico.com",
+        "https://eleconomista.net",
+        "https://ella.sv",
+        "https://grupolpg.sv"
+      ],
+      "rationaleBySite": {
+        "https://elgrafico.com": "News portal owned by La Prensa Grafica Group",
+        "https://eleconomista.net": "News portal owned by La Prensa Grafica Group",
+        "https://ella.sv": "News portal owned by La Prensa Grafica Group",
+        "https://grupolpg.sv": "Domain owned by La Prensa Grafica Group"
+      }
+    },
+    {
+      "primary": "https://kaksya.in",
+      "contact": "[email protected]",
+      "associatedSites": [
+        "https://nidhiacademyonline.com"
+      ],
+      "serviceSites": [],
+      "rationaleBySite": {
+        "https://nidhiacademyonline.com": "This website is a subpart of kaksya.in and is used to host Nidhi Academy educational content videos/notes and more."
+      }
+    },
+    {
+      "contact": "[email protected]",
+      "primary": "https://sapo.pt",
+      "associatedSites": [
+        "https://sapo.pt",
+        "https://meo.pt"
+      ],
+      "rationaleBySite": {
+        "https://sapo.pt": "SAPO is Portugal's leading online platform offering a diverse range of news, information, and services catering to various interests including news, entertainment, sports, technology, and lifestyle.",
+        "https://meo.pt": "MEO is a prominent telecommunications and entertainment provider in Portugal, offering a wide range of services including television, internet, phone, and mobile."
+      },
+      "ccTLDs": {
+        "https://sapo.pt": [
+          "https://sapo.io"
+        ]
+      }
+    },
+    {
+      "contact": "[email protected]",
+      "primary": "https://vrt.be",
+      "associatedSites": [
+        "https://dewarmsteweek.be",
+        "https://sporza.be",
+        "https://een.be",
+        "https://radio2.be",
+        "https://radio1.be"
+      ],
+      "rationaleBySite": {
+        "https://dewarmsteweek.be": "domain for a yearly campaign",
+        "https://sporza.be": "sub brand for sports news",
+        "https://een.be": "sub brand site",
+        "https://radio2.be": "sub brand site",
+        "https://radio1.be": "sub brand site"
+      }
     }
   ]
 }
diff --git a/packages/extension/webpack.config.cjs → extension.webpack.config.cjs b/packages/extension/webpack.config.cjs → extension.webpack.config.cjs
@@ -18,24 +18,24 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlInlineScriptPlugin = require('html-inline-script-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 const WebpackBar = require('webpackbar');
-const commonConfig = require('../../webpack.shared.cjs');
+const commonConfig = require('./webpack.shared.cjs');
 
 const root = {
   entry: {
-    'service-worker': './src/serviceWorker/index.ts',
-    'content-script': './src/contentScript/index.ts',
+    'service-worker': './packages/extension/src/serviceWorker/index.ts',
+    'content-script': './packages/extension/src/contentScript/index.ts',
   },
   output: {
-    path: path.resolve(__dirname, '../../dist/extension'),
+    path: path.resolve(__dirname, './dist/extension'),
     filename: '[name].js',
   },
   plugins: [
     new CopyPlugin({
       patterns: [
-        { from: 'src/manifest.json', to: '' },
-        { from: 'icons', to: 'icons' },
-        { from: '../../assets', to: 'assets' },
-        { from: '../../data', to: 'data' },
+        { from: './packages/extension/src/manifest.json', to: '' },
+        { from: './packages/extension/icons', to: 'icons' },
+        { from: './assets', to: 'assets' },
+        { from: './data', to: 'data' },
       ],
     }),
     new WebpackBar({
@@ -48,12 +48,12 @@ const root = {
 
 const devTools = {
   entry: {
-    index: './src/view/devtools/index.tsx',
-    devtools: './src/view/devtools/devtools.ts',
-    worker: './src/worker/index.ts',
+    index: './packages/extension/src/view/devtools/index.tsx',
+    devtools: './packages/extension/src/view/devtools/devtools.ts',
+    worker: './packages/extension/src/worker/index.ts',
   },
   output: {
-    path: path.resolve(__dirname, '../../dist/extension/devtools'),
+    path: path.resolve(__dirname, './dist/extension/devtools'),
     filename: '[name].js',
   },
   plugins: [
@@ -63,13 +63,13 @@ const devTools = {
     }),
     new HtmlWebpackPlugin({
       title: 'PSAT Devtool',
-      template: './src/view/devtools/index.html',
+      template: './packages/extension/src/view/devtools/index.html',
       filename: 'index.html',
       inject: false,
     }),
     new HtmlWebpackPlugin({
       title: 'PSAT',
-      template: './src/view/devtools/devtools.html',
+      template: './packages/extension/src/view/devtools/devtools.html',
       filename: 'devtools.html',
       inject: true,
     }),
@@ -79,10 +79,10 @@ const devTools = {
 
 const popup = {
   entry: {
-    index: './src/view/popup/index.tsx',
+    index: './packages/extension/src/view/popup/index.tsx',
   },
   output: {
-    path: path.resolve(__dirname, '../../dist/extension/popup'),
+    path: path.resolve(__dirname, './dist/extension/popup'),
     filename: 'index.js',
   },
   plugins: [
@@ -92,7 +92,7 @@ const popup = {
     }),
     new HtmlWebpackPlugin({
       title: 'PSAT Popup',
-      template: './src/view/popup/index.html',
+      template: './packages/extension/src/view/popup/index.html',
       inject: false,
     }),
   ],
@@ -101,10 +101,10 @@ const popup = {
 
 const report = {
   entry: {
-    index: './src/view/report/index.tsx',
+    index: './packages/report/src/index.tsx',
   },
   output: {
-    path: path.resolve(__dirname, '../../dist/extension/report'),
+    path: path.resolve(__dirname, './dist/extension/report'),
     filename: '[name].js',
   },
   plugins: [
@@ -114,7 +114,7 @@ const report = {
     }),
     new HtmlWebpackPlugin({
       title: 'Report',
-      template: './src/view/report/index.html',
+      template: './packages/report/public/index.html',
       filename: 'index.html',
       inject: true,
     }),