Merge pull request #3108 from relative-ci/revert-insights-changed

Revert "feat(utils): Utils - add insight changes flag"
relative-ci · Feb 11, 2023 · b0744a5 · b0744a5
2 parents b9c27a5 + a99c9cd
commit b0744a5
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 53 deletions.
diff --git a/packages/html-templates/src/app/__snapshots__/app.stories.storyshot b/packages/html-templates/src/app/__snapshots__/app.stories.storyshot
@@ -50,7 +50,6 @@ exports[`Storyshots App default 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "d3-time": Array [
@@ -73,7 +72,6 @@ exports[`Storyshots App default 1`] = `
                 "type": "error",
               },
               "newPackages": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Array [
                     "ariakit-utils",
@@ -29795,7 +29793,6 @@ exports[`Storyshots App default 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "hoist-non-react-statics": Array [
@@ -60035,7 +60032,6 @@ exports[`Storyshots App empty baseline 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "d3-time": Array [
@@ -89780,7 +89776,6 @@ exports[`Storyshots App multiple baselines 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "d3-time": Array [
@@ -89803,7 +89798,6 @@ exports[`Storyshots App multiple baselines 1`] = `
                 "type": "error",
               },
               "newPackages": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Array [
                     "ariakit-utils",
@@ -119592,7 +119586,6 @@ exports[`Storyshots App multiple baselines 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "hoist-non-react-statics": Array [
@@ -119619,7 +119612,6 @@ exports[`Storyshots App multiple baselines 1`] = `
                 "type": "error",
               },
               "newPackages": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Array [
                     "tiny-invariant",
@@ -149886,7 +149878,6 @@ exports[`Storyshots App multiple baselines 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "tslib": Array [
@@ -153027,7 +153018,6 @@ exports[`Storyshots App no baseline 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "d3-time": Array [
@@ -153050,7 +153040,6 @@ exports[`Storyshots App no baseline 1`] = `
                 "type": "error",
               },
               "newPackages": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Array [
                     "ariakit-utils",
@@ -212454,7 +212443,6 @@ exports[`Storyshots App no insights 1`] = `
                 "type": "warning",
               },
               "duplicatePackagesV3": Object {
-                "changes": true,
                 "data": Object {
                   "packages": Object {
                     "hoist-non-react-statics": Array [

diff --git a/packages/ui/src/components/insights/insights.stories.tsx b/packages/ui/src/components/insights/insights.stories.tsx
@@ -27,7 +27,6 @@ Default.args = {
       text: 'Bundle introduced 2 new packages: package-c, package-d',
       packages: ['package-c', 'package-d'],
     },
-    changes: true,
   },
 };
 
@@ -40,14 +39,12 @@ Info.args = {
       packages: { 'package-a': ['package-a', 'package-a~1'] },
       text: 'Bundle removed 1 duplicate packages',
     },
-    changes: false,
   },
   newPackages: {
     type: 'warning',
     data: {
       text: 'Bundle introduced 2 new packages: package-c, package-d',
       packages: ['package-c', 'package-d'],
     },
-    changes: true,
   },
 };
diff --git a/packages/utils/src/constants.ts b/packages/utils/src/constants.ts
@@ -71,18 +71,8 @@ export interface JobSummaryItem {
 }
 
 export interface JobInsight<T = object> {
-  /**
-   * Insight type
-   */
   type: InsightType;
-  /**
-   * Insight result data
-   */
   data: T & { text?: string };
-  /**
-   * Flag if the insight result is due to changes between jobs
-   */
-  changes?: boolean;
 }
 
 export interface JobInsightAssetsSizeTotalData {

diff --git a/packages/utils/src/jobs/__tests__/__snapshots__/create-job.ts.snap b/packages/utils/src/jobs/__tests__/__snapshots__/create-job.ts.snap
@@ -30,7 +30,6 @@ exports[`createJob no baseline 1`] = `
         "type": "warning",
       },
       "duplicatePackagesV3": {
-        "changes": true,
         "data": {
           "packages": {
             "package-c": [
@@ -408,7 +407,6 @@ exports[`createJob with baseline 1`] = `
         "type": "warning",
       },
       "duplicatePackagesV3": {
-        "changes": true,
         "data": {
           "packages": {
             "package-c": [
@@ -421,7 +419,6 @@ exports[`createJob with baseline 1`] = `
         "type": "error",
       },
       "newPackages": {
-        "changes": true,
         "data": {
           "packages": [
             "package-d",

diff --git a/packages/utils/src/report/__tests__/__snapshots__/create.ts.snap b/packages/utils/src/report/__tests__/__snapshots__/create.ts.snap
@@ -153,7 +153,6 @@ exports[`report / createReport multiple sources 1`] = `
         "type": "warning",
       },
       "duplicatePackagesV3": {
-        "changes": true,
         "data": {
           "packages": {
             "package-c": [
@@ -166,7 +165,6 @@ exports[`report / createReport multiple sources 1`] = `
         "type": "error",
       },
       "newPackages": {
-        "changes": true,
         "data": {
           "packages": [
             "package-d",
@@ -1123,7 +1121,6 @@ exports[`report / createReport single source 1`] = `
         "type": "warning",
       },
       "duplicatePackagesV3": {
-        "changes": true,
         "data": {
           "packages": {
             "package-c": [

diff --git a/packages/utils/src/webpack/extract/__tests__/modules-packages-duplicate.ts b/packages/utils/src/webpack/extract/__tests__/modules-packages-duplicate.ts
@@ -12,15 +12,13 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
           packages: {},
           text: 'Bundle does not contain duplicate packages',
         },
-        changes: false,
       });
       expect(getDuplicatePackagesInsight({}, {})).toEqual({
         type: 'info',
         data: {
           packages: {},
           text: 'Bundle does not contain duplicate packages',
         },
-        changes: false,
       });
     });
 
@@ -39,7 +37,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
           },
           text: 'Bundle contains 2 duplicate packages',
         },
-        changes: false,
       });
     });
 
@@ -64,7 +61,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
           },
           text: 'Bundle contains 2 duplicate packages',
         },
-        changes: false,
       });
     });
 
@@ -89,7 +85,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
           },
           text: 'Bundle introduced 1 duplicate package',
         },
-        changes: true,
       });
     });
 
@@ -109,7 +104,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
           packages: { 'package-a': ['package-a', 'package-a~1'] },
           text: 'Bundle introduced 1 and removed 1 duplicate package',
         },
-        changes: true,
       });
     });
   });
@@ -127,7 +121,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
         },
       },
       metrics: { duplicatePackagesCount: { value: 0 } },
-      changes: false,
     });
   });
 
@@ -181,7 +174,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
               'package-a': ['package-a', 'package-b:package-a'],
             },
           },
-          changes: true,
         },
       },
       metrics: {
@@ -258,7 +250,6 @@ describe('Webpack/extract/extractModulesPackagesDuplicate', () => {
               'package-a': ['package-a', 'package-b:package-a'],
             },
           },
-          changes: true,
         },
       },
       metrics: {

diff --git a/packages/utils/src/webpack/extract/__tests__/modules-packages-new-insight.ts b/packages/utils/src/webpack/extract/__tests__/modules-packages-new-insight.ts
@@ -85,7 +85,6 @@ describe('Webpack/extracts/extractModulesPackagesNewInsight', () => {
             text: 'Bundle introduced one new package: package-b',
             packages: ['package-b'],
           },
-          changes: true,
         },
       },
     });
@@ -154,7 +153,6 @@ describe('Webpack/extracts/extractModulesPackagesNewInsight', () => {
             text: 'Bundle introduced 2 new packages: package-c, package-d',
             packages: ['package-c', 'package-d'],
           },
-          changes: true,
         },
       },
     });

diff --git a/packages/utils/src/webpack/extract/modules-packages-duplicate.ts b/packages/utils/src/webpack/extract/modules-packages-duplicate.ts
@@ -83,21 +83,18 @@ export const getDuplicatePackagesInsight = (
 
   let text: string;
   let insightType: InsightType;
-  let changes = false;
 
   if (newDuplicateInstancesCount > 0 && removedDuplicateInstancesCount > 0) {
     // New duplicate packages and removed duplicates
     const item =
       newDuplicateInstancesCount > 1 || removedDuplicateInstancesCount > 1 ? 'packages' : 'package';
     text = `Bundle introduced ${newDuplicateInstancesCount} and removed ${removedDuplicateInstancesCount} duplicate ${item}`;
     insightType = InsightType.ERROR;
-    changes = true;
   } else if (newDuplicateInstancesCount > 0 && baselineDuplicatePackagesMap) {
     // New duplicate packages and baseline comparison
     const item = newDuplicateInstancesCount > 1 ? 'packages' : 'package';
     text = `Bundle introduced ${newDuplicateInstancesCount} duplicate ${item}`;
     insightType = InsightType.ERROR;
-    changes = true;
   } else if (newDuplicateInstancesCount > 0) {
     // New duplicate packages and no baseline
     const item = newDuplicateInstancesCount > 1 ? 'packages' : 'package';
@@ -108,7 +105,6 @@ export const getDuplicatePackagesInsight = (
     const item = removedDuplicateInstancesCount > 1 ? 'packages' : 'package';
     text = `Bundle removed ${removedDuplicateInstancesCount} duplicate ${item}`;
     insightType = InsightType.INFO;
-    changes = true;
   } else if (
     newDuplicateInstancesCount === 0 &&
     removedDuplicateInstancesCount === 0 &&
@@ -130,7 +126,6 @@ export const getDuplicatePackagesInsight = (
       text,
       packages: duplicatePackagesMap,
     },
-    changes
   };
 };
 

diff --git a/packages/utils/src/webpack/extract/modules-packages-new-insight.ts b/packages/utils/src/webpack/extract/modules-packages-new-insight.ts
@@ -27,13 +27,15 @@ const getText = (newPackages: Array<string>) => {
 
   const text = `Bundle introduced ${newPackages.length} new packages: ${firstNewPackages.join(', ')}`;
 
-  const otherPackagesCount = otherPackages.length;
-
-  if (otherPackagesCount === 0) {
+  if (otherPackages.length === 0) {
     return text;
   }
 
-  return `${text} and ${otherPackagesCount > 1 ? otherPackagesCount : 'one'} more`;
+  if (otherPackages.length === 1) {
+    return `${text} and one more`;
+  }
+
+  return `${text} and ${otherPackages.length} more`;
 };
 
 export const extractModulesPackagesNewInsight = (
@@ -52,8 +54,8 @@ export const extractModulesPackagesNewInsight = (
   const currentPackages = getPackageNames(currentMetricPackages);
   const baselinePackages = getPackageNames(baselineMetricPackages);
 
-  // Process current packages and save if they are not available on the baseline job
   const newPackages: Array<string> = [];
+
   currentPackages.forEach((packageName) => {
     if (!baselinePackages.has(packageName)) {
       newPackages.push(packageName);
@@ -72,7 +74,6 @@ export const extractModulesPackagesNewInsight = (
           text: getText(newPackages),
           packages: newPackages,
         },
-        changes: true,
       },
     },
   };