diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml index 984f2374d..b84cb7e63 100644 --- a/.github/workflows/build-native.yml +++ b/.github/workflows/build-native.yml @@ -122,7 +122,7 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} run: | for platform in darwin-arm64 darwin-x64 linux-x64-gnu linux-arm64-gnu win32-x64-msvc; do - echo "Publishing @gsd/engine-${platform}..." + echo "Publishing @gsd-build/engine-${platform}..." cd "native/npm/${platform}" OUTPUT=$(npm publish --access public 2>&1) && echo "$OUTPUT" || { if echo "$OUTPUT" | grep -q "cannot publish over the previously published"; then diff --git a/native/npm/darwin-arm64/package.json b/native/npm/darwin-arm64/package.json index 58dd68565..953ff6bb2 100644 --- a/native/npm/darwin-arm64/package.json +++ b/native/npm/darwin-arm64/package.json @@ -1,5 +1,5 @@ { - "name": "@gsd/engine-darwin-arm64", + "name": "@gsd-build/engine-darwin-arm64", "version": "2.10.2", "description": "GSD native engine binary for macOS ARM64", "os": [ diff --git a/native/npm/darwin-x64/package.json b/native/npm/darwin-x64/package.json index 45048a9d1..e0b28a2e4 100644 --- a/native/npm/darwin-x64/package.json +++ b/native/npm/darwin-x64/package.json @@ -1,5 +1,5 @@ { - "name": "@gsd/engine-darwin-x64", + "name": "@gsd-build/engine-darwin-x64", "version": "2.10.2", "description": "GSD native engine binary for macOS Intel", "os": [ diff --git a/native/npm/linux-arm64-gnu/package.json b/native/npm/linux-arm64-gnu/package.json index 3ec130297..e2e824760 100644 --- a/native/npm/linux-arm64-gnu/package.json +++ b/native/npm/linux-arm64-gnu/package.json @@ -1,5 +1,5 @@ { - "name": "@gsd/engine-linux-arm64-gnu", + "name": "@gsd-build/engine-linux-arm64-gnu", "version": "2.10.2", "description": "GSD native engine binary for Linux ARM64 (glibc)", "os": [ diff --git a/native/npm/linux-x64-gnu/package.json b/native/npm/linux-x64-gnu/package.json index f2e59bfd2..e242e6304 100644 --- a/native/npm/linux-x64-gnu/package.json +++ b/native/npm/linux-x64-gnu/package.json @@ -1,5 +1,5 @@ { - "name": "@gsd/engine-linux-x64-gnu", + "name": "@gsd-build/engine-linux-x64-gnu", "version": "2.10.2", "description": "GSD native engine binary for Linux x64 (glibc)", "os": [ diff --git a/native/npm/win32-x64-msvc/package.json b/native/npm/win32-x64-msvc/package.json index 087333771..0616310b5 100644 --- a/native/npm/win32-x64-msvc/package.json +++ b/native/npm/win32-x64-msvc/package.json @@ -1,5 +1,5 @@ { - "name": "@gsd/engine-win32-x64-msvc", + "name": "@gsd-build/engine-win32-x64-msvc", "version": "2.10.2", "description": "GSD native engine binary for Windows x64 (MSVC)", "os": [ diff --git a/native/scripts/sync-platform-versions.cjs b/native/scripts/sync-platform-versions.cjs index 59b0d8834..13f152af2 100644 --- a/native/scripts/sync-platform-versions.cjs +++ b/native/scripts/sync-platform-versions.cjs @@ -48,7 +48,7 @@ for (const platform of platformPackages) { let rootChanged = false; const optDeps = rootPkg.optionalDependencies || {}; for (const platform of platformPackages) { - const depName = `@gsd/engine-${platform}`; + const depName = `@gsd-build/engine-${platform}`; if (optDeps[depName] && optDeps[depName] !== version) { console.log(` root optionalDependencies ${depName}: ${optDeps[depName]} -> ${version}`); optDeps[depName] = version; diff --git a/package.json b/package.json index 0df1383c7..bead79f25 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "pkg", "src/resources", "scripts/postinstall.js", - "native/addon", "package.json", "README.md" ], @@ -83,11 +82,11 @@ "typescript": "^5.4.0" }, "optionalDependencies": { - "@gsd/engine-darwin-arm64": "2.10.2", - "@gsd/engine-darwin-x64": "2.10.2", - "@gsd/engine-linux-x64-gnu": "2.10.2", - "@gsd/engine-linux-arm64-gnu": "2.10.2", - "@gsd/engine-win32-x64-msvc": "2.10.2", + "@gsd-build/engine-darwin-arm64": "2.10.2", + "@gsd-build/engine-darwin-x64": "2.10.2", + "@gsd-build/engine-linux-x64-gnu": "2.10.2", + "@gsd-build/engine-linux-arm64-gnu": "2.10.2", + "@gsd-build/engine-win32-x64-msvc": "2.10.2", "fsevents": "~2.3.3" }, "overrides": { diff --git a/packages/native/src/native.ts b/packages/native/src/native.ts index 322dae98b..b4c09cf65 100644 --- a/packages/native/src/native.ts +++ b/packages/native/src/native.ts @@ -3,7 +3,7 @@ * * Locates and loads the compiled Rust N-API addon (`.node` file). * Resolution order: - * 1. @gsd/engine-{platform} npm optional dependency (production install) + * 1. @gsd-build/engine-{platform} npm optional dependency (production install) * 2. native/addon/gsd_engine.{platform}.node (local release build) * 3. native/addon/gsd_engine.dev.node (local debug build) */ @@ -34,10 +34,10 @@ function loadNative(): Record { const packageSuffix = platformPackageMap[platformTag]; if (packageSuffix) { try { - return require(`@gsd/engine-${packageSuffix}`) as Record; + return require(`@gsd-build/engine-${packageSuffix}`) as Record; } catch (err) { const message = err instanceof Error ? err.message : String(err); - errors.push(`@gsd/engine-${packageSuffix}: ${message}`); + errors.push(`@gsd-build/engine-${packageSuffix}: ${message}`); } }