bump lz-utils

cenfun · Jul 25, 2024 · 714b1da · 714b1da
1 parent 47bd6f5
commit 714b1da
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 34 deletions.
diff --git a/lib/assets.js b/lib/assets.js
@@ -20,6 +20,7 @@ const Assets = {
         const {
             inline,
             reportData,
+            jsFiles,
             assetsPath,
             outputDir,
             htmlFile,
@@ -44,9 +45,11 @@ const Assets = {
         const jsList = [];
 
         // deps
-        jsList.push({
-            filename: 'monocart-coverage-app.js',
-            str: Assets.getFileContent('monocart-coverage-app')
+        jsFiles.forEach((id) => {
+            jsList.push({
+                filename: `${id}.js`,
+                str: Assets.getFileContent(id)
+            });
         });
 
         // html content

diff --git a/lib/v8/v8.js b/lib/v8/v8.js
@@ -352,10 +352,12 @@ const handleV8HtmlReport = async (reportData, reportOptions, options) => {
     const outputDir = path.dirname(reportPath);
     const htmlFile = path.basename(reportPath);
 
+    const jsFiles = ['monocart-coverage-app'];
     // console.log(jsFiles);
 
     const htmlOptions = {
         reportData,
+        jsFiles,
         inline,
         assetsPath,
         outputDir,

diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-reports": "^3.1.7",
-        "lz-utils": "^2.0.2",
+        "lz-utils": "^2.1.0",
         "minimatch": "9.0.5",
         "monocart-locator": "^1.0.2"
     },

diff --git a/packages/loader/package.json b/packages/loader/package.json
diff --git a/packages/loader/src/index.js b/packages/loader/src/index.js
diff --git a/scripts/conf.cli.js b/scripts/conf.cli.js
@@ -58,7 +58,7 @@ const copyVendor = (EC, toPath) => {
 };
 
 const buildAssets = (EC, toPath) => {
-    const { deflateSync } = require('lz-utils');
+    const { createScriptLoader } = require('lz-utils');
 
     const toJs = path.resolve(toPath, 'monocart-coverage-assets.js');
 
@@ -78,16 +78,8 @@ const buildAssets = (EC, toPath) => {
             if (!fs.existsSync(appPath)) {
                 return;
             }
-            const loaderPath = path.resolve(__dirname, '../packages/loader/dist/monocart-coverage-loader.js');
-            if (!fs.existsSync(loaderPath)) {
-                return;
-            }
-
             const appContent = fs.readFileSync(appPath).toString('utf-8');
-            const loaderContent = fs.readFileSync(loaderPath).toString('utf-8');
-
-            return loaderContent.replace('{compressed_placeholder}', deflateSync(appContent));
-
+            return createScriptLoader(appContent);
         }
     }];
 

diff --git a/test/package.json b/test/package.json
@@ -19,7 +19,7 @@
         "mocha": "^10.7.0",
         "open": "^10.1.0",
         "playwright": "^1.45.3",
-        "puppeteer": "^22.13.1",
+        "puppeteer": "^22.14.0",
         "rollup": "^4.19.0",
         "swc-loader": "^0.2.6",
         "ts-loader": "^9.5.1",

diff --git a/test/test-merge.js b/test/test-merge.js
@@ -15,6 +15,8 @@ const coverageOptions = {
         'v8'
     ],
 
+    inline: true,
+
     // merge from exists raw dirs
     inputDir: './docs/node-vm/raw, ./docs/cli/raw, ./wrong-raw-dir',
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ const coverageOptions = { @@
             'v8'
         ],
+        inline: true,
         // merge from exists raw dirs
         inputDir: './docs/node-vm/raw, ./docs/cli/raw, ./wrong-raw-dir',
@@ Expand Down @@