regressify 1.0.19 → 1.0.21

package/helpers.ts

@@ -1,27 +1,7 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import path, { dirname } from 'path';
 import { exec } from 'child_process';
-import { fileURLToPath, pathToFileURL } from 'url';
 import chalk from 'chalk';
 
-export function getLibraryPath() {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-
-  let currentDir = __dirname;
-  while (!fs.existsSync(path.join(currentDir, 'package.json'))) {
-    const parentDir = path.dirname(currentDir);
-    if (parentDir === currentDir) {
-      return null;
-    }
-    currentDir = parentDir;
-  }
-  const packageJsonPath = path.join(currentDir, 'package.json');
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-  return `node_modules/${packageJson.name}`;
-}
-
 export function runCommand(command) {
   const childProcess = exec(command, { env: { ...process.env, FORCE_COLOR: '1' } });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "regressify",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Visual regression tests support",
   "main": "index.js",
   "type": "module",

package/src/config.ts

@@ -23,8 +23,7 @@ if (globalRequiredLogin) {
 const scenarios: Scenario[] = [];
 
 const getScriptPath = (scriptPath: string, engine: 'puppeteer' | 'playwright') => {
-  const basePath = path.join(path.dirname(fileURLToPath(import.meta.url)));
-  return path.join(basePath, (engine == 'puppeteer' ? 'puppet' : 'playwright') + scriptPath);
+  return path.join(__dirname, '..', '.engine_scripts', (engine == 'puppeteer' ? 'puppet' : 'playwright') + scriptPath);
 };
 
 if (!testSuite) {

package/src/helpers.ts

@@ -1,7 +1,9 @@
 import fs from 'fs';
 import YAML from 'js-yaml';
-import path, { dirname } from 'path';
+import { dirname } from 'path';
+import slash from 'slash';
 import { fileURLToPath } from 'url';
+
 export const getStringArg = (key: string): string | undefined => {
   const index = process.argv.indexOf(key);
   return index >= 0 && index < process.argv.length - 1 && !process.argv[index + 1].startsWith('-') ? process.argv[index + 1] : undefined;
@@ -23,18 +25,6 @@ export const parseDataFromFile = (dataPath: string, type: 'yaml' | 'json' = 'yam
 };
 
 export function getLibraryPath() {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-
-  let currentDir = __dirname;
-  while (!fs.existsSync(path.join(currentDir, 'package.json'))) {
-    const parentDir = path.dirname(currentDir);
-    if (parentDir === currentDir) {
-      return null;
-    }
-    currentDir = parentDir;
-  }
-  const packageJsonPath = path.join(currentDir, 'package.json');
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-  return `node_modules/${packageJson.name}`;
+  const fileName = fileURLToPath(import.meta.url);
+  return slash(dirname(dirname(fileName)));
 }

package/src/index.ts

@@ -1,12 +1,9 @@
 import chalk from 'chalk';
 import backstop from 'backstopjs';
 import config from './config.js';
-import { getStringArg } from './helpers.js';
+import { getLibraryPath, getStringArg } from './helpers.js';
 import path from 'path';
 import fs from 'fs';
-import { fileURLToPath } from 'url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const command = getStringArg('--command') as 'approve' | 'init' | 'reference' | 'test' | undefined;
 if (!command) {
@@ -28,8 +25,7 @@ ${PATCH_END}
 `;
 
 const packCompare = () => {
-  const projectRootDir = process.cwd();
-  const reportIndex = path.resolve(projectRootDir, 'node_modules/backstopjs/compare/output/index.html');
+  const reportIndex = path.resolve(getLibraryPath(), 'node_modules/backstopjs/compare/output/index.html');
   if (fs.existsSync(reportIndex)) {
     let html = fs.readFileSync(reportIndex, 'utf-8');
     const patchStartIndex = html.indexOf(PATCH_START);