Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cli bundling import fix #1794

Merged
merged 10 commits into from
Nov 26, 2024
Merged

Cli bundling import fix #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e82beac
Fix import in ternary statement
khushhalm Nov 12, 2024
43a7cfc
Added comment
khushhalm Nov 18, 2024
c57ecc2
Typo fix in comment
khushhalm Nov 19, 2024
45375f9
Removed trailing space
khushhalm Nov 19, 2024
b78953c
Fix import of PERCY_DOM in line w ESM req
khushhalm Nov 20, 2024
81ae1ac
made a minor comment change
khushhalm Nov 20, 2024
fa8c2a8
Merge branch 'pac-file-support' into cli-bundling-import-fix
khushhalm Nov 20, 2024
f5d7881
Added PERCY_FORCE_DIRNAME flag in getPackageJSON util method
khushhalm Nov 25, 2024
082f73b
Merge branch 'pac-file-support' into cli-bundling-import-fix
khushhalm Nov 25, 2024
3af6e20
Env var name updated to PERCY_FORCE_EXECUTABLE_DIRNAME
khushhalm Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/client/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ export function waitForTimeout() {

// Returns the package.json content at the package path.
export function getPackageJSON(rel) {
/* istanbul ignore else: sanity check */
if (process.env.PERCY_FORCE_EXECUTABLE_DIRNAME) rel = __dirname;

/* istanbul ignore else: sanity check */
if (rel.startsWith('file:')) rel = url.fileURLToPath(rel);

Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import path, { dirname, resolve } from 'path';
import logger from '@percy/logger';
import { normalize } from '@percy/config/utils';
import { getPackageJSON, Server, percyAutomateRequestHandler, percyBuildEventHandler } from './utils.js';
Expand All @@ -11,7 +11,6 @@ import { handleSyncJob } from './snapshot.js';
// Now, we use `fileURLToPath` and `path.resolve` to determine the absolute path in a way that's more aligned with ESM conventions.
// This change ensures better compatibility and avoids relying on Node.js-specific APIs that might cause issues in ESM environments.
import { fileURLToPath } from 'url';
import { dirname, resolve } from 'path';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
Expand Down