Merge branch 'main' of github.com:GoogleChromeLabs/ps-analysis-tool i…

…nto develop

packages/cli/src/utils/fetchCookieDictionary.ts

@@ -31,10 +31,9 @@ import { CookieDatabase } from '../types';
  */
 export async function fetchDictionary(): Promise<CookieDatabase> {
   const data = JSON.parse(
-    await fs.readFile(
-      path.resolve('./third_party/data/open-cookie-database.json'),
-      { encoding: 'utf8' }
-    )
+    await fs.readFile(path.resolve('./assets/data/open-cookie-database.json'), {
+      encoding: 'utf8',
+    })
   );
 
   return data;

packages/extension/src/manifest.json

@@ -37,7 +37,7 @@
   },
   "web_accessible_resources": [
     {
-      "resources": ["third_party/data/*.json", "data/*json"],
+      "resources": ["assets/data/*.json", "data/*json"],
       "matches": ["*://*/*"]
     }
   ]

packages/extension/src/utils/fetchCookieDictionary.ts

@@ -23,9 +23,7 @@ import { type CookieDatabase } from '@ps-analysis-tool/common';
  * @returns {Promise<CookieDatabase>} Open Cookie Data base
  */
 export async function fetchDictionary(): Promise<CookieDatabase> {
-  const url = chrome.runtime.getURL(
-    'third_party/data/open-cookie-database.json'
-  );
+  const url = chrome.runtime.getURL('assets/data/open-cookie-database.json');
 
   const data = await (await fetch(url)).json();
 

packages/extension/src/view/devtools/components/settings/components/informationContainer.tsx

@@ -25,10 +25,10 @@ import classNames from 'classnames';
 import { useSettingsStore } from '../../../stateProviders/syncSettingsStore';
 // @ts-ignore
 // eslint-disable-next-line import/no-relative-packages
-import InformationIcon from '../../../../../../../../third_party/icons/information-icon.svg';
+import InformationIcon from '../../../../../../../../assets/icons/information-icon.svg';
 // @ts-ignore
 // eslint-disable-next-line import/no-relative-packages
-import Done from '../../../../../../../../third_party/icons/done.svg';
+import Done from '../../../../../../../../assets/icons/done.svg';
 
 const InformationContainer = () => {
   const { currentTabs, currentExtensions, browserInformation, OSInformation } =

packages/extension/src/view/devtools/components/settings/components/settingsContainer.tsx

@@ -25,7 +25,7 @@ import SettingOption from './settingOption';
 import { useSettingsStore } from '../../../stateProviders/syncSettingsStore';
 // @ts-ignore
 // eslint-disable-next-line import/no-relative-packages
-import Gear from '../../../../../../../../third_party/icons/gear.svg';
+import Gear from '../../../../../../../../assets/icons/gear.svg';
 import { SETTING_PAGE_CONTROLS } from '../../../../../constants';
 
 interface settingsToReturnObject {

packages/extension/src/view/devtools/tabs.tsx

@@ -49,10 +49,10 @@ import {
  */
 // @ts-ignore
 // eslint-disable-next-line import/no-relative-packages
-import SettingsTab from '../../../../../third_party/icons/settings-tab.svg';
+import SettingsTab from '../../../../../assets/icons/settings-tab.svg';
 // @ts-ignore
 // eslint-disable-next-line import/no-relative-packages
-import SettingsTabWhite from '../../../../../third_party/icons/settings-tab-white.svg';
+import SettingsTabWhite from '../../../../../assets/icons/settings-tab-white.svg';
 import {
   SiteBoundaries,
   Chips,

packages/extension/webpack.config.cjs

@@ -33,7 +33,7 @@ const root = {
       patterns: [
         { from: 'src/manifest.json', to: '' },
         { from: 'icons', to: 'icons' },
-        { from: '../../third_party', to: 'third_party' },
+        { from: '../../assets', to: 'assets' },
         { from: '../../data', to: 'data' },
       ],
     }),

packages/library-detection/src/libraries/gsi/accordion.tsx

@@ -41,7 +41,7 @@ const GISAccordion = ({ matches }: AccordionProps) => {
         Due to Privacy Sandbox enforcements some features are backward
         incompatible or deprecated. This report performs a page scan for script
         src elements and affected JavaScript objects and methods. Review the
-        following features in and{' '}
+        following features and{' '}
         <a
           className="text-bright-navy-blue dark:text-jordy-blue"
           target="_blank"

scripts/update-cookie-db.cjs

@@ -22,7 +22,7 @@ const path = require('path');
 const csvtojson = require('csvtojson');
 const process = require('process');
 const fetch = require('node-fetch');
-const targetDIR = path.resolve(__dirname, '..', 'third_party/data');
+const targetDIR = path.resolve(__dirname, '..', 'assets/data');
 const requestURL =
   'https://raw.githubusercontent.com/rtCamp/Open-Cookie-Database/master/open-cookie-database.csv';
 

tests/jest.config.cjs

@@ -43,7 +43,7 @@ module.exports = {
   coveragePathIgnorePatterns: [
     '<rootDir>/node_modules',
     '<rootDir>/dist',
-    '<rootDir>/third_party',
+    '<rootDir>/assets',
     '<rootDir>/data',
     '/stories/',
     '<rootDir>/packages/extension/src/view/devtools/index.tsx',