Skip to content

Commit f164218

Browse files
committed
fix(build): use default export workaround for CommonJS imports with --import flag
Node.js --import flag prevents detection of CommonJS named exports from esbuild-annotated modules. Updated build-infra and CLI files to use the default export workaround pattern recommended by Node.js. Also fixed incorrect import paths for pr-lifecycle-logger.mts. Changes: - build-infra: Updated 11 files to use default export pattern - cli: Fixed 2 incorrect import paths from pr-lifecycle-getDefaultLogger()
1 parent ecf2214 commit f164218

File tree

13 files changed

+50
-23
lines changed

13 files changed

+50
-23
lines changed

packages/build-infra/lib/build-helpers.mjs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
import { promises as fs } from 'node:fs'
99
import path from 'node:path'
1010

11-
import { whichBinSync } from '@socketsecurity/lib/bin'
11+
import binPkg from '@socketsecurity/lib/bin'
12+
import platformPkg from '@socketsecurity/lib/constants/platform'
13+
import spawnPkg from '@socketsecurity/lib/spawn'
1214

13-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
14-
import { spawn } from '@socketsecurity/lib/spawn'
15+
const { whichBinSync } = binPkg
16+
const { WIN32 } = platformPkg
17+
const { spawn } = spawnPkg
1518

1619
import { printError, printStep, printSubstep, printWarning } from './build-output.mjs'
1720

packages/build-infra/lib/build-output.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* Provides consistent, pretty logging for build processes.
55
*/
66

7-
import { getDefaultLogger } from '@socketsecurity/lib/logger'
7+
import loggerPkg from '@socketsecurity/lib/logger'
8+
const { getDefaultLogger } = loggerPkg
89

910
/**
1011
* Print header.

packages/build-infra/lib/cmake-builder.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66

77
import { cpus } from 'node:os'
88

9-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
10-
import { spawn } from '@socketsecurity/lib/spawn'
9+
import platformPkg from '@socketsecurity/lib/constants/platform'
10+
import spawnPkg from '@socketsecurity/lib/spawn'
11+
12+
const { WIN32 } = platformPkg
13+
const { spawn } = spawnPkg
1114

1215
import { printStep } from './build-output.mjs'
1316

packages/build-infra/lib/emscripten-builder.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import { cpus } from 'node:os'
88
import path from 'node:path'
99

10-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
11-
import { spawn } from '@socketsecurity/lib/spawn'
10+
import platformPkg from '@socketsecurity/lib/constants/platform'
11+
import spawnPkg from '@socketsecurity/lib/spawn'
12+
13+
const { WIN32 } = platformPkg
14+
const { spawn } = spawnPkg
1215

1316
import { printStep } from './build-output.mjs'
1417

packages/build-infra/lib/extraction-cache.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import { createHash } from 'node:crypto'
1111
import { existsSync, mkdirSync, readFileSync } from 'node:fs'
1212
import path from 'node:path'
1313

14-
import { getDefaultLogger } from '@socketsecurity/lib/logger'
14+
import loggerPkg from '@socketsecurity/lib/logger'
15+
const { getDefaultLogger } = loggerPkg
1516

1617
/**
1718
* Check if extraction is needed based on source content hash.

packages/build-infra/lib/fetch-with-retry.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Automatically retries on network errors and 5xx server errors.
44
*/
55

6-
import { getDefaultLogger } from '@socketsecurity/lib/logger'
6+
import loggerPkg from '@socketsecurity/lib/logger'
7+
const { getDefaultLogger } = loggerPkg
78

89
/**
910
* Fetch with automatic retry on transient failures.

packages/build-infra/lib/patch-validator.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import { promises as fs } from 'node:fs'
88
import path from 'node:path'
99

10-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
11-
import { spawn } from '@socketsecurity/lib/spawn'
10+
import platformPkg from '@socketsecurity/lib/constants/platform'
11+
import spawnPkg from '@socketsecurity/lib/spawn'
12+
13+
const { WIN32 } = platformPkg
14+
const { spawn } = spawnPkg
1215

1316
import { printError, printStep, printSubstep } from './build-output.mjs'
1417

packages/build-infra/lib/preflight-checks.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Provides a DRY way to run common pre-build validation checks.
44
*/
55

6-
import { getDefaultLogger } from '@socketsecurity/lib/logger'
6+
import loggerPkg from '@socketsecurity/lib/logger'
7+
const { getDefaultLogger } = loggerPkg
78

89
import { printError, printSuccess } from './build-output.mjs'
910
import {

packages/build-infra/lib/rust-builder.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import { cpus } from 'node:os'
88
import path from 'node:path'
99

10-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
11-
import { spawn } from '@socketsecurity/lib/spawn'
10+
import platformPkg from '@socketsecurity/lib/constants/platform'
11+
import spawnPkg from '@socketsecurity/lib/spawn'
12+
13+
const { WIN32 } = platformPkg
14+
const { spawn } = spawnPkg
1215

1316
import { printStep } from './build-output.mjs'
1417

packages/build-infra/lib/script-runner.mjs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
* Provides DRY helpers for running pnpm scripts, commands, and sequences.
44
*/
55

6-
import { WIN32 } from '@socketsecurity/lib/constants/platform'
7-
import { getDefaultLogger } from '@socketsecurity/lib/logger'
8-
import { spawn } from '@socketsecurity/lib/spawn'
6+
import platformPkg from '@socketsecurity/lib/constants/platform'
7+
import loggerPkg from '@socketsecurity/lib/logger'
8+
import spawnPkg from '@socketsecurity/lib/spawn'
9+
10+
const { WIN32 } = platformPkg
11+
const { getDefaultLogger } = loggerPkg
12+
const { spawn } = spawnPkg
913

1014
/**
1115
* Run a pnpm script in a specific package.

0 commit comments

Comments
 (0)