diff --git a/packages/next/build/swc/index.js b/packages/next/build/swc/index.js index 9048fd5b1a0e6ae..b81191bd9cdf70e 100644 --- a/packages/next/build/swc/index.js +++ b/packages/next/build/swc/index.js @@ -12,7 +12,7 @@ const path = require('path') const bindings = loadBinding( path.join(__dirname, '../../../native'), 'next-swc', - 'next-swc' + '@next/swc' ) async function transform(src, options) { diff --git a/packages/next/build/swc/npm/darwin-arm64/README.md b/packages/next/build/swc/npm/darwin-arm64/README.md new file mode 100644 index 000000000000000..10a0ca93e0e9a09 --- /dev/null +++ b/packages/next/build/swc/npm/darwin-arm64/README.md @@ -0,0 +1,3 @@ +# `@next/swc-darwin-arm64` + +This is the **aarch64-apple-darwin** binary for `@next/swc` diff --git a/packages/next/build/swc/npm/next-swc-darwin-arm64/package.json b/packages/next/build/swc/npm/darwin-arm64/package.json similarity index 86% rename from packages/next/build/swc/npm/next-swc-darwin-arm64/package.json rename to packages/next/build/swc/npm/darwin-arm64/package.json index d40a7a93885ec64..afdf49e4749a2f9 100644 --- a/packages/next/build/swc/npm/next-swc-darwin-arm64/package.json +++ b/packages/next/build/swc/npm/darwin-arm64/package.json @@ -1,5 +1,5 @@ { - "name": "next-swc-darwin-arm64", + "name": "@next/swc-darwin-arm64", "version": "0.0.0", "os": [ "darwin" diff --git a/packages/next/build/swc/npm/darwin-x64/README.md b/packages/next/build/swc/npm/darwin-x64/README.md new file mode 100644 index 000000000000000..a0d630dddadc8f7 --- /dev/null +++ b/packages/next/build/swc/npm/darwin-x64/README.md @@ -0,0 +1,3 @@ +# `@next/swc-darwin-x64` + +This is the **x86_64-apple-darwin** binary for `@next/swc` diff --git a/packages/next/build/swc/npm/next-swc-darwin-x64/package.json b/packages/next/build/swc/npm/darwin-x64/package.json similarity index 86% rename from packages/next/build/swc/npm/next-swc-darwin-x64/package.json rename to packages/next/build/swc/npm/darwin-x64/package.json index 841f101bc3ed0df..fea96c76f2479df 100644 --- a/packages/next/build/swc/npm/next-swc-darwin-x64/package.json +++ b/packages/next/build/swc/npm/darwin-x64/package.json @@ -1,5 +1,5 @@ { - "name": "next-swc-darwin-x64", + "name": "@next/swc-darwin-x64", "version": "0.0.0", "os": [ "darwin" diff --git a/packages/next/build/swc/npm/linux-x64-gnu/README.md b/packages/next/build/swc/npm/linux-x64-gnu/README.md new file mode 100644 index 000000000000000..f85ed88cf6bda26 --- /dev/null +++ b/packages/next/build/swc/npm/linux-x64-gnu/README.md @@ -0,0 +1,3 @@ +# `@next/swc-linux-x64-gnu` + +This is the **x86_64-unknown-linux-gnu** binary for `@next/swc` diff --git a/packages/next/build/swc/npm/next-swc-linux-x64-gnu/package.json b/packages/next/build/swc/npm/linux-x64-gnu/package.json similarity index 86% rename from packages/next/build/swc/npm/next-swc-linux-x64-gnu/package.json rename to packages/next/build/swc/npm/linux-x64-gnu/package.json index 46d6a065dc47514..07f4f9f039d191f 100644 --- a/packages/next/build/swc/npm/next-swc-linux-x64-gnu/package.json +++ b/packages/next/build/swc/npm/linux-x64-gnu/package.json @@ -1,5 +1,5 @@ { - "name": "next-swc-linux-x64-gnu", + "name": "@next/swc-linux-x64-gnu", "version": "0.0.0", "os": [ "linux" diff --git a/packages/next/build/swc/npm/next-swc-darwin-arm64/README.md b/packages/next/build/swc/npm/next-swc-darwin-arm64/README.md deleted file mode 100644 index 8a616700ad72555..000000000000000 --- a/packages/next/build/swc/npm/next-swc-darwin-arm64/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `next-swc-darwin-arm64` - -This is the **aarch64-apple-darwin** binary for `next-swc` diff --git a/packages/next/build/swc/npm/next-swc-darwin-x64/README.md b/packages/next/build/swc/npm/next-swc-darwin-x64/README.md deleted file mode 100644 index e456065a5f41b61..000000000000000 --- a/packages/next/build/swc/npm/next-swc-darwin-x64/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `next-swc-darwin-x64` - -This is the **x86_64-apple-darwin** binary for `next-swc` diff --git a/packages/next/build/swc/npm/next-swc-linux-x64-gnu/README.md b/packages/next/build/swc/npm/next-swc-linux-x64-gnu/README.md deleted file mode 100644 index ab0dd023d410dc5..000000000000000 --- a/packages/next/build/swc/npm/next-swc-linux-x64-gnu/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `next-swc-linux-x64-gnu` - -This is the **x86_64-unknown-linux-gnu** binary for `next-swc` diff --git a/packages/next/build/swc/npm/next-swc-win32-x64-msvc/README.md b/packages/next/build/swc/npm/next-swc-win32-x64-msvc/README.md deleted file mode 100644 index 043a268252d559e..000000000000000 --- a/packages/next/build/swc/npm/next-swc-win32-x64-msvc/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `next-swc-win32-x64-msvc` - -This is the **x86_64-pc-windows-msvc** binary for `next-swc` diff --git a/packages/next/build/swc/npm/win32-x64-msvc/README.md b/packages/next/build/swc/npm/win32-x64-msvc/README.md new file mode 100644 index 000000000000000..04e5bcab51da48d --- /dev/null +++ b/packages/next/build/swc/npm/win32-x64-msvc/README.md @@ -0,0 +1,3 @@ +# `@next/swc-win32-x64-msvc` + +This is the **x86_64-pc-windows-msvc** binary for `@next/swc` diff --git a/packages/next/build/swc/npm/next-swc-win32-x64-msvc/package.json b/packages/next/build/swc/npm/win32-x64-msvc/package.json similarity index 85% rename from packages/next/build/swc/npm/next-swc-win32-x64-msvc/package.json rename to packages/next/build/swc/npm/win32-x64-msvc/package.json index d5ea85b6c5e7df9..a569a2a87625110 100644 --- a/packages/next/build/swc/npm/next-swc-win32-x64-msvc/package.json +++ b/packages/next/build/swc/npm/win32-x64-msvc/package.json @@ -1,5 +1,5 @@ { - "name": "next-swc-win32-x64-msvc", + "name": "@next/swc-win32-x64-msvc", "version": "0.0.0", "os": [ "win32" diff --git a/scripts/publish-native.js b/scripts/publish-native.js index b2709a4dc1c3c10..07190f13ff3fe27 100755 --- a/scripts/publish-native.js +++ b/scripts/publish-native.js @@ -15,28 +15,25 @@ const cwd = process.cwd() // Copy binaries to package folders, update version, and publish let nativePackagesDir = path.join(cwd, 'packages/next/build/swc/npm') - let nativePackages = await readdir(nativePackagesDir) - for (let nativePackage of nativePackages) { - if (nativePackage === '.gitignore') { - continue - } - let binaryName = `next-swc.${nativePackage.substr(9)}.node` + let platforms = await (await readdir(nativePackagesDir)).filter( + (name) => name !== '.gitignore' + ) + for (let platform of platforms) { + let binaryName = `next-swc.${platform}.node` await copy( path.join(cwd, 'packages/next/build/swc/dist', binaryName), - path.join(nativePackagesDir, nativePackage, binaryName) + path.join(nativePackagesDir, platform, binaryName) ) let pkg = JSON.parse( - await readFile( - path.join(nativePackagesDir, nativePackage, 'package.json') - ) + await readFile(path.join(nativePackagesDir, platform, 'package.json')) ) pkg.version = version await writeFile( - path.join(nativePackagesDir, nativePackage, 'package.json'), + path.join(nativePackagesDir, platform, 'package.json'), JSON.stringify(pkg, null, 2) ) execSync( - `npm publish ${path.join(nativePackagesDir, nativePackage)}${ + `npm publish ${path.join(nativePackagesDir, platform)}${ gitref.includes('canary') ? ' --tag canary' : '' }` ) @@ -44,7 +41,7 @@ const cwd = process.cwd() execSync( `git update-index --skip-worktree ${path.join( nativePackagesDir, - nativePackage, + platform, 'package.json' )}` ) @@ -54,9 +51,9 @@ const cwd = process.cwd() let nextPkg = JSON.parse( await readFile(path.join(cwd, 'packages/next/package.json')) ) - for (let name of nativePackages) { + for (let platform of platforms) { let optionalDependencies = nextPkg.optionalDependencies || {} - optionalDependencies[name] = version + optionalDependencies['@next/swc-' + platform] = version nextPkg.optionalDependencies = optionalDependencies } await writeFile(