From 441e894e9a46c12b04960d922173d9913a5cd3e2 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 16 Sep 2022 22:26:36 +0530
Subject: [PATCH] Graph improvements (#15793)

---
 .circleci/scripts/bundle-stats-commit.sh | 20 ++++++++------------
 test/e2e/mv3-perf-stats/bundle-size.js   | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.circleci/scripts/bundle-stats-commit.sh b/.circleci/scripts/bundle-stats-commit.sh
index db5fe101b..31f0ca9d5 100755
--- a/.circleci/scripts/bundle-stats-commit.sh
+++ b/.circleci/scripts/bundle-stats-commit.sh
@@ -40,25 +40,21 @@ git config --global user.name "MetaMask Bot"
 
 git clone git@github.com:MetaMask/extension_bundlesize_stats.git temp
 
-if [[ -f "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json" ]]
-then
-    printf 'Bundle size of the commit is already recorded'
-    cd ..
-    rm -rf temp
-    exit 0
-fi
+{
+    echo " '${CIRCLE_SHA1}': ";
+    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    echo ", ";
+} >> temp/stats/bundle_size_data.temp.js
 
-cp -R test-artifacts/chrome/mv3/bundle_size_stats.json temp/stats
+cp temp/stats/bundle_size_data.temp.js temp/stats/bundle_size_data.js
 
-echo " bundle_size_stats-${CIRCLE_SHA1}.json" >> temp/stats/fileList.txt
-
-mv temp/stats/bundle_size_stats.json "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json"
+echo " }" >> temp/stats/bundle_size_data.js
 
 cd temp
 
 git add .
 
-git commit --message "Bundle size at commit: ${CIRCLE_SHA1}"
+git commit --message "Adding bundle size at commit: ${CIRCLE_SHA1}"
 
 repo_slug="$CIRCLE_PROJECT_USERNAME/extension_bundlesize_stats"
 git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" main
diff --git a/test/e2e/mv3-perf-stats/bundle-size.js b/test/e2e/mv3-perf-stats/bundle-size.js
index d7360ab9d..7ece2877a 100755
--- a/test/e2e/mv3-perf-stats/bundle-size.js
+++ b/test/e2e/mv3-perf-stats/bundle-size.js
@@ -53,14 +53,14 @@ async function main() {
   const distFolder = 'dist/chrome';
   const backgroundFileList = [];
   const uiFileList = [];
+  const commonFileList = [];
 
   const files = await fs.readdir(distFolder);
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
     if (CommonFileRegex.test(file)) {
       const stats = await fs.stat(`${distFolder}/${file}`);
-      backgroundFileList.push({ name: file, size: stats.size });
-      uiFileList.push({ name: file, size: stats.size });
+      commonFileList.push({ name: file, size: stats.size });
     } else if (
       backgroundFiles.includes(file) ||
       BackgroundFileRegex.test(file)
@@ -83,6 +83,11 @@ async function main() {
     0,
   );
 
+  const commonBundleSize = commonFileList.reduce(
+    (result, file) => result + file.size,
+    0,
+  );
+
   const result = {
     background: {
       name: 'background',
@@ -94,6 +99,11 @@ async function main() {
       size: uiBundleSize,
       fileList: uiFileList,
     },
+    common: {
+      name: 'common',
+      size: commonBundleSize,
+      fileList: commonFileList,
+    },
   };
 
   if (out) {
@@ -115,6 +125,7 @@ async function main() {
         {
           background: backgroundBundleSize,
           ui: uiBundleSize,
+          common: commonBundleSize,
           timestamp: new Date().getTime(),
         },
         null,