Update esbuild istanbul plugin

thednp · May 13, 2022 · 5d49c6a · 5d49c6a
1 parent 95e88dd
commit 5d49c6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cypress/integration/dommatrix.spec.js b/cypress/integration/dommatrix.spec.js
@@ -16,7 +16,7 @@ describe('DOMMatrix Class Test', () => {
       .get('.bg-secondary').then((m) => {
         cy.wrap(m[0]).as('dommatrix');
       })
-      .log('These test compare CSSMatrix methods agains the native DOMMatrix.');
+      .log('These tests compare CSSMatrix methods agains the native DOMMatrix.');
   });
 
   it('Test init with no parameter, expect same output as native DOMMatrix', () => {

diff --git a/cypress/plugins/esbuild-istanbul.js b/cypress/plugins/esbuild-istanbul.js
@@ -3,10 +3,11 @@
 
 const { readFileSync } = require('fs');
 const { createInstrumenter } = require('istanbul-lib-instrument');
-const debug = require('debug')('istanbul-lib-instrument')
+const debug = require('debug');
 
 // import Cypress settings
-const { env: { sourceFolder } } = require('../../cypress.json');
+let { env: { sourceFolder } } = require('../../cypress.json');
+sourceFolder = sourceFolder || 'src';
 const [name] = process.cwd().split(/[\\|\/]/).slice(-1);
 const sourcePath = sourceFolder.replace(/\\/g,'\/');
 
@@ -22,8 +23,9 @@ const esbuildPluginIstanbul = () => ({
     build.onLoad({filter: /\.(js|jsx|ts|tsx)$/ },
       async ({ path }) => {
         const contents = String(readFileSync(path, 'utf8'));
+        const samePath = path.replace(/\\/g, '/')
 
-        if (!sourceFilter.split(/\\|\//).every((word) => path.includes(word))) {
+        if (!samePath.includes(sourceFilter)) {
           return { contents };
         }
         debug('instrumenting %s for output coverage', path);