Skip to content

Commit cb02b5c

Browse files
jdaltonjdalton
committed
fix: correct .mjs/.mts file extension mismatches after script rename
- scripts/check.mts: update 4 validate-* spawn paths from .mjs to .mts - scripts/validate-no-cdn-refs.mts: fix self-skip check extension - scripts/lib/build-exec.mts: fix dynamic import of build-helpers - .github/workflows/provenance.yml: update 11 root script references - packages/cli/package.json: revert local script refs back to .mjs (only root scripts/ were renamed, not packages/cli/scripts/)
1 parent 049107c commit cb02b5c

5 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎.github/workflows/provenance.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Generate platform matrix
6464
id: matrix
6565
run: |
66-
MATRIX=$(node scripts/get-platform-matrix.mjs)
66+
MATRIX=$(node scripts/get-platform-matrix.mts)
6767
echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
6868
6969
- name: Upload CLI bundle
@@ -195,7 +195,7 @@ jobs:
195195
set -euo pipefail
196196
197197
# Get platform targets from single source of truth.
198-
PLATFORMS_STR=$(node scripts/get-platform-targets.mjs)
198+
PLATFORMS_STR=$(node scripts/get-platform-targets.mts)
199199
read -ra PLATFORMS <<< "$PLATFORMS_STR"
200200
201201
for target in "${PLATFORMS[@]}"; do
@@ -227,7 +227,7 @@ jobs:
227227
if [ -n "$LIBC" ]; then
228228
LIBC_FLAG="--libc=$LIBC"
229229
fi
230-
node scripts/prepublish-socketbin.mjs \
230+
node scripts/prepublish-socketbin.mts \
231231
--platform="$PLATFORM" --arch="$ARCH" $LIBC_FLAG --prod \
232232
--version="$VERSION" --method=sea
233233
@@ -253,7 +253,7 @@ jobs:
253253
TAG: ${{ steps.version.outputs.cli_tag }}
254254
run: |
255255
PKG_DIR="packages/package-builder/build/prod/out/cli"
256-
node scripts/prepare-package-for-publish.mjs "$PKG_DIR" "$VERSION"
256+
node scripts/prepare-package-for-publish.mts "$PKG_DIR" "$VERSION"
257257
cd "$PKG_DIR"
258258
npm publish --provenance --access public --no-git-checks --tag "$TAG"
259259
@@ -264,7 +264,7 @@ jobs:
264264
TAG: ${{ steps.version.outputs.cli_tag }}
265265
run: |
266266
PKG_DIR="packages/package-builder/build/prod/out/cli-with-sentry"
267-
node scripts/prepare-package-for-publish.mjs "$PKG_DIR" "$VERSION"
267+
node scripts/prepare-package-for-publish.mts "$PKG_DIR" "$VERSION"
268268
cd "$PKG_DIR"
269269
npm publish --provenance --access public --no-git-checks --tag "$TAG"
270270
@@ -276,7 +276,7 @@ jobs:
276276
TAG: ${{ steps.version.outputs.cli_tag }}
277277
run: |
278278
PKG_DIR="packages/package-builder/build/prod/out/socket"
279-
node scripts/prepare-package-for-publish.mjs "$PKG_DIR" "$VERSION"
279+
node scripts/prepare-package-for-publish.mts "$PKG_DIR" "$VERSION"
280280
cd "$PKG_DIR"
281281
npm publish --provenance --access public --no-git-checks --tag "$TAG"
282282
@@ -285,7 +285,7 @@ jobs:
285285
if: ${{ inputs.iocraft }}
286286
run: |
287287
echo "Downloading iocraft .node binaries for all platforms..."
288-
node scripts/download-iocraft-binaries.mjs
288+
node scripts/download-iocraft-binaries.mts
289289
290290
# Copy iocraft binaries to package directories.
291291
- name: Copy iocraft binaries to packages
@@ -295,7 +295,7 @@ jobs:
295295
set -euo pipefail
296296
297297
# Get platform targets from single source of truth.
298-
PLATFORMS_STR=$(node scripts/get-platform-targets.mjs)
298+
PLATFORMS_STR=$(node scripts/get-platform-targets.mts)
299299
read -ra PLATFORMS <<< "$PLATFORMS_STR"
300300
301301
for target in "${PLATFORMS[@]}"; do
@@ -320,7 +320,7 @@ jobs:
320320
TAG: ${{ steps.version.outputs.iocraft_tag }}
321321
run: |
322322
PKG_DIR="packages/package-builder/build/prod/out/socketaddon-iocraft"
323-
node scripts/prepare-package-for-publish.mjs "$PKG_DIR" "$VERSION"
323+
node scripts/prepare-package-for-publish.mts "$PKG_DIR" "$VERSION"
324324
cd "$PKG_DIR"
325325
npm publish --provenance --access public --no-git-checks --tag "$TAG"
326326
@@ -334,7 +334,7 @@ jobs:
334334
set -euo pipefail
335335
336336
# Get platform targets from single source of truth.
337-
PLATFORMS_STR=$(node scripts/get-platform-targets.mjs)
337+
PLATFORMS_STR=$(node scripts/get-platform-targets.mts)
338338
read -ra PLATFORMS <<< "$PLATFORMS_STR"
339339
340340
for target in "${PLATFORMS[@]}"; do
@@ -343,7 +343,7 @@ jobs:
343343
PKG_DIR="packages/package-builder/build/prod/out/socketaddon-iocraft-${target}"
344344
345345
# Prepare package.
346-
node scripts/prepare-package-for-publish.mjs "$PKG_DIR" "$VERSION"
346+
node scripts/prepare-package-for-publish.mts "$PKG_DIR" "$VERSION"
347347
348348
# Publish.
349349
cd "$PKG_DIR"

‎packages/cli/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
"logo-light.png"
1919
],
2020
"scripts": {
21-
"build": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mts",
22-
"build:force": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mts --force",
23-
"build:watch": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mts --watch",
24-
"restore-cache": "node --import=./scripts/load.mjs scripts/restore-cache.mts",
25-
"build:sea": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build-sea.mts",
26-
"build:js": "node scripts/build-js.mts",
21+
"build": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mjs",
22+
"build:force": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mjs --force",
23+
"build:watch": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build.mjs --watch",
24+
"restore-cache": "node --import=./scripts/load.mjs scripts/restore-cache.mjs",
25+
"build:sea": "node --max-old-space-size=8192 --import=./scripts/load.mjs scripts/build-sea.mjs",
26+
"build:js": "node scripts/build-js.mjs",
2727
"dev:watch": "pnpm run build:watch",
2828
"check": "node ../../scripts/check.mts",
2929
"check-ci": "pnpm run check",
3030
"lint": "oxlint -c ../../.oxlintrc.json",
3131
"lint-ci": "pnpm run lint",
3232
"type": "tsc --noEmit",
3333
"type-ci": "pnpm run type",
34-
"sync-checksums": "node scripts/sync-checksums.mts",
35-
"cover": "node --import=./scripts/load.mjs scripts/cover.mts",
34+
"sync-checksums": "node scripts/sync-checksums.mjs",
35+
"cover": "node --import=./scripts/load.mjs scripts/cover.mjs",
3636
"clean": "run-p -c --aggregate-output clean:*",
3737
"clean:binject": "del-cli 'build/binject'",
3838
"clean:cache": "del-cli '**/.cache'",
@@ -49,22 +49,22 @@
4949
"dev:npm": "cross-env SOCKET_CLI_MODE=npm node --experimental-strip-types src/cli-dispatch.mts",
5050
"dev:npx": "cross-env SOCKET_CLI_MODE=npx node --experimental-strip-types src/cli-dispatch.mts",
5151
"e2e-tests": "dotenvx -q run -f .env.test -- vitest run --config vitest.e2e.config.mts",
52-
"e2e:js": "node scripts/e2e.mts --js",
53-
"e2e:sea": "node scripts/e2e.mts --sea",
54-
"e2e:all": "node scripts/e2e.mts --all",
52+
"e2e:js": "node scripts/e2e.mjs --js",
53+
"e2e:sea": "node scripts/e2e.mjs --sea",
54+
"e2e:all": "node scripts/e2e.mjs --all",
5555
"test": "run-s check test:*",
5656
"test:prepare": "dotenvx -q run -f .env.test -- pnpm build && del-cli 'test/**/node_modules'",
57-
"test:unit": "node --import=./scripts/load.mjs scripts/test-wrapper.mts",
58-
"test:unit:update": "node --import=./scripts/load.mjs scripts/test-wrapper.mts --update",
59-
"test:unit:coverage": "node --import=./scripts/load.mjs scripts/test-wrapper.mts --coverage",
60-
"test:validate": "node --import=./scripts/load.mjs scripts/validate-tests.mts",
57+
"test:unit": "node --import=./scripts/load.mjs scripts/test-wrapper.mjs",
58+
"test:unit:update": "node --import=./scripts/load.mjs scripts/test-wrapper.mjs --update",
59+
"test:unit:coverage": "node --import=./scripts/load.mjs scripts/test-wrapper.mjs --coverage",
60+
"test:validate": "node --import=./scripts/load.mjs scripts/validate-tests.mjs",
6161
"test-ci": "run-s test:*",
6262
"test-pre-commit": "cross-env PRE_COMMIT=1 pnpm test",
6363
"update": "node ../../scripts/update.mts",
64-
"verify": "node scripts/verify-package.mts",
65-
"wasm": "node scripts/wasm.mts",
66-
"wasm:build": "node scripts/wasm.mts --build",
67-
"wasm:download": "node scripts/wasm.mts --download"
64+
"verify": "node scripts/verify-package.mjs",
65+
"wasm": "node scripts/wasm.mjs",
66+
"wasm:build": "node scripts/wasm.mjs --build",
67+
"wasm:download": "node scripts/wasm.mjs --download"
6868
},
6969
"devDependencies": {
7070
"@babel/generator": "catalog:",

‎scripts/check.mts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ async function main(): Promise<void> {
243243
}
244244
const validateResult = await spawn(
245245
'node',
246-
[path.join(scriptsDir, 'validate-no-link-deps.mjs')],
246+
[path.join(scriptsDir, 'validate-no-link-deps.mts')],
247247
{
248248
shell: WIN32,
249249
stdio: 'pipe',
@@ -279,7 +279,7 @@ async function main(): Promise<void> {
279279
}
280280
const bundleResult = await spawn(
281281
'node',
282-
[path.join(scriptsDir, 'validate-bundle-deps.mjs')],
282+
[path.join(scriptsDir, 'validate-bundle-deps.mts')],
283283
{
284284
shell: WIN32,
285285
stdio: 'pipe',
@@ -315,7 +315,7 @@ async function main(): Promise<void> {
315315
}
316316
const cdnResult = await spawn(
317317
'node',
318-
[path.join(scriptsDir, 'validate-no-cdn-refs.mjs')],
318+
[path.join(scriptsDir, 'validate-no-cdn-refs.mts')],
319319
{
320320
shell: WIN32,
321321
stdio: 'pipe',
@@ -351,7 +351,7 @@ async function main(): Promise<void> {
351351
}
352352
const sizeResult = await spawn(
353353
'node',
354-
[path.join(scriptsDir, 'validate-file-size.mjs')],
354+
[path.join(scriptsDir, 'validate-file-size.mts')],
355355
{
356356
shell: WIN32,
357357
stdio: 'pipe',

‎scripts/lib/build-exec.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export async function downloadWithRetry(
9999
const { buildDir, maxRetries = 3, verifyIntegrity = true } = options
100100

101101
// Import verifyFileIntegrity dynamically to avoid circular dependency.
102-
const { verifyFileIntegrity } = await import('./build-helpers.mjs')
102+
const { verifyFileIntegrity } = await import('./build-helpers.mts')
103103

104104
for (let attempt = 1; attempt <= maxRetries; attempt++) {
105105
try {

‎scripts/validate-no-cdn-refs.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ async function findTextFiles(
124124
*/
125125
async function checkFileForCdnRefs(filePath: string): Promise<CdnViolation[]> {
126126
// Skip this validator script itself (it mentions CDN domains by necessity)
127-
if (filePath.endsWith('validate-no-cdn-refs.mjs')) {
127+
if (filePath.endsWith('validate-no-cdn-refs.mts')) {
128128
return []
129129
}
130130

0 commit comments

Comments
 (0)