refactor(utils): createJob - update job structure

- flatten webpack.stats - namespace meta, warnings
relative-ci · Feb 29, 2020 · 13d65a7 · 13d65a7
1 parent fb113f3
commit 13d65a7
Show file tree

Hide file tree

Showing 25 changed files with 4,647 additions and 4,712 deletions.
diff --git a/packages/bundle-stats/src/webpack-plugin.js b/packages/bundle-stats/src/webpack-plugin.js
@@ -1,7 +1,8 @@
 import path from 'path';
 import process from 'process';
 import { get, merge } from 'lodash';
-import { createJobs, extractDataFromWebpackStats } from '@bundle-stats/utils';
+import { createJobs } from '@bundle-stats/utils';
+import { filter } from '@bundle-stats/utils/lib-esm/webpack';
 
 import * as TEXT from './text';
 import { getBaselineStatsFilepath, readBaseline } from './baseline';
@@ -34,7 +35,7 @@ const getOnEmit = (options) => async (compilation, callback) => {
     stats: statsOptions,
   } = options;
 
-  const data = extractDataFromWebpackStats(
+  const data = filter(
     compilation.getStats().toJson(statsOptions),
   );
 
@@ -55,7 +56,7 @@ const getOnEmit = (options) => async (compilation, callback) => {
   try {
     if (compare) {
       baselineStats = await readBaseline();
-      baselineStats = extractDataFromWebpackStats(baselineStats);
+      baselineStats = filter(baselineStats);
       logger.info(`Read baseline from ${baselineFilepath}`);
     }
   } catch (err) {

diff --git a/packages/html-templates/src/app/index.jsx b/packages/html-templates/src/app/index.jsx
@@ -70,9 +70,9 @@ const StandaloneApp = ({ jobs }) => {
           showSummaryItemBaselineValue={jobs.length !== 1}
         />
       </Container>
-      {warnings && warnings.duplicatePackages && (
+      {warnings && warnings.webpack && warnings.webpack.duplicatePackages && (
         <Container>
-          <DuplicatePackagesWarning duplicatePackages={warnings.duplicatePackages} />
+          <DuplicatePackagesWarning duplicatePackages={warnings.webpack.duplicatePackages} />
         </Container>
       )}
       <Container>

diff --git a/packages/html-templates/src/app/stories.jsx b/packages/html-templates/src/app/stories.jsx
@@ -9,15 +9,13 @@ import baselineData from 'Fixtures/job.baseline.json'; // eslint-disable-line
 import StandaloneApp from '.';
 
 const JOBS = createJobs([
-  { webpack: { stats: currentData.rawData.webpack.stats } },
-  { webpack: { stats: baselineData.rawData.webpack.stats } },
+  { webpack: currentData.rawData.webpack.stats },
+  { webpack: baselineData.rawData.webpack.stats },
   {
     webpack: {
-      stats: {
-        ...baselineData.rawData.webpack.stats,
-        assets: baselineData.rawData.webpack.stats.assets.filter((asset) => asset.name.match(/.(css|js)$/)),
-        modules: baselineData.rawData.webpack.stats.modules.slice(0, 100),
-      },
+      ...baselineData.rawData.webpack.stats,
+      assets: baselineData.rawData.webpack.stats.assets.filter((asset) => asset.name.match(/.(css|js)$/)),
+      modules: baselineData.rawData.webpack.stats.modules.slice(0, 100),
     },
   },
 ]);

diff --git a/packages/ui/__mocks__/job.baseline.json b/packages/ui/__mocks__/job.baseline.json
@@ -10,7 +10,6 @@
   "internalBuildNumber": 123,
   "rawData": {
     "webpack": {
-      "stats": {
         "assets": [
           {
             "name": "../artifacts/webpack.json",
@@ -4370,7 +4369,6 @@
             ]
           }
         ]
-      }
     }
   }
 }