Refactor: Move dashboard from design-system to report.

package.json

@@ -4,9 +4,9 @@
 	"description": "Cookie Analysis Tool and CLI for analysis and understanding of cookie usage on web pages.",
 	"scripts": {
 		"build-storybook": "storybook build",
-		"build:all": "run-p build:cli build:ext",
-		"build:tsc-packages": "npm run build:i18n && npm run build:common && npm run build:design-system && npm run build:library-detection && npm run build:analysis-utils",
-		"dev:tsc-packages": "run-p dev:i18n dev:common dev:design-system dev:library-detection dev:analysis-utils",
+		"build:all": "run-p build:tsc-packages webpack:build:cli webpack:build:ext",
+		"build:tsc-packages": "npm run build:i18n && npm run build:common && npm run build:design-system && npm run build:library-detection && npm run build:analysis-utils && npm run build:report",
+		"dev:tsc-packages": "run-p dev:i18n dev:common dev:design-system dev:library-detection dev:analysis-utils dev:report",
 		"publish:all:local": "npm run build:all && npm run publish:local --workspaces",
 		"unpublish:all:local": "npm run unpublish:local --workspaces",
 		"publish:all:remote": "npm run build:all && npm run publish:remote --workspaces",
@@ -23,17 +23,19 @@
 		"dev:analysis-utils": "npm run dev -w @google-psat/analysis-utils",
 		"webpack:dev:cli": "npm run dev -w @google-psat/cli",
 		"dev:cli": "run-p dev:tsc-packages webpack:dev:cli",
-		"build:cli": "npm run build:tsc-packages && cross-env NODE_ENV=production npm run build -w @google-psat/cli",
+		"webpack:build:cli": "cross-env NODE_ENV=production npm run build -w @google-psat/cli",
+		"build:cli": "npm run build:tsc-packages && webpack:build:cli",
 		"build:cli:dashboard": "run-p build:cli build:cli-dashboard",
 		"cli": "node packages/cli/dist/main.js",
-		"build:report": "npm run dev -w @google-psat/report",
+		"build:report": "npm run build -w @google-psat/report",
 		"dev:report": "npm run dev -w @google-psat/report",
 		"dev:cli-dashboard": "npm run dev -w @google-psat/cli-dashboard",
 		"build:cli-dashboard": "cross-env NODE_ENV=production npm run build -w @google-psat/cli-dashboard",
 		"cookie-db:update": "node scripts/update-cookie-db.cjs",
 		"webpack:dev:ext":"npm run dev -w @google-psat/extension",
 		"dev:ext": "run-p dev:tsc-packages webpack:dev:ext",
-		"build:ext": "npm run build:tsc-packages && cross-env NODE_ENV=production npm run build -w @google-psat/extension",
+		"webpack:build:ext": "cross-env NODE_ENV=production npm run build -w @google-psat/extension",
+		"build:ext": "npm run build:tsc-packages && webpack:build:ext",
 		"lint": "npm-run-all --parallel lint:*",
 		"lint:js": "eslint .",
 		"lint:types": "tsc ",
@@ -149,5 +151,7 @@
 		"wappalyzer": {
 			"puppeteer": "^22.11.1"
 		}
+	},
+	"dependencies": {
 	}
 }

packages/cli-dashboard/package.json

@@ -36,6 +36,7 @@
     "@google-psat/common": "*",
     "@google-psat/design-system": "*",
     "@google-psat/i18n": "*",
+    "@google-psat/report": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/cli-dashboard/src/app.tsx

@@ -29,7 +29,7 @@ import {
   extractCookies,
   SiteMapReport,
   SiteReport,
-} from '@google-psat/design-system';
+} from '@google-psat/report';
 
 /**
  * Internal dependencies

packages/cli-dashboard/tsconfig.json

@@ -15,6 +15,9 @@
     { "path": "../common" },
     {
       "path": "../design-system"
+    },
+    {
+      "path": "../report"
     }
   ]
 }

packages/design-system/package.json

@@ -38,7 +38,6 @@
   "dependencies": {
     "@google-psat/common": "*",
     "@google-psat/i18n": "*",
-    "@google-psat/library-detection": "*",
     "classnames": "^2.3.2",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1",

packages/design-system/src/components/index.ts

@@ -28,7 +28,6 @@ export { default as MatrixComponentHorizontal } from './matrix/matrixComponent/m
 export type { MatrixComponentProps } from './matrix/matrixComponent';
 export { default as CookiesLanding } from './cookiesLanding';
 export * from './cookiesLanding';
-export * from './dashboard';
 export { default as CookiesMatrix } from './cookiesLanding/cookiesMatrix';
 export { default as CookieDetails } from './cookieDetails';
 export { default as Details } from './cookieDetails/details';

packages/extension/package.json

@@ -30,6 +30,7 @@
     "@google-psat/design-system": "*",
     "@google-psat/i18n": "*",
     "@google-psat/library-detection": "*",
+    "@google-psat/report": "*",
     "classnames": "^2.3.2",
     "deep-object-diff": "^1.1.9",
     "fast-xml-parser": "^4.3.2",

packages/extension/src/view/report/dashboardApp.tsx

@@ -23,7 +23,7 @@ import type {
   LibraryData,
 } from '@google-psat/common';
 import { I18n } from '@google-psat/i18n';
-import { extractCookies, SiteReport } from '@google-psat/design-system';
+import { extractCookies, SiteReport } from '@google-psat/report';
 
 /**
  * Internal dependencies

packages/report/package.json

@@ -2,6 +2,8 @@
   "name": "@google-psat/report",
   "version": "0.9.0-2",
   "description": "Static HTML analysis report",
+  "main": "dist/index.js",
+  "types": "dist-types/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/GoogleChromeLabs/ps-analysis-tool",
@@ -18,7 +20,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "webpack serve --config ./webpack.config.cjs --open",
+    "build": "tsc",
+    "dev": "tsc-watch",
+    "build:remove": "rimraf dist dist-types tsconfig.tsbuildinfo",
     "publish:local": "npm publish --registry=http://localhost:4873",
     "publish:remote": "npm publish --access=public --registry=https://registry.npmjs.org",
     "unpublish:local": "npm unpublish --registry=http://localhost:4873 --force",