Use @next scope for native packages (#28046)

padmaia · web-flow · commit ff5e44428401 · 2021-08-12T13:59:53.000-07:00
diff --git 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
@@ -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/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
@@ -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/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
@@ -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/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
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
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
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
diff --git a/packages/next/build/swc/npm/win32-x64-msvc/README.md 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/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
@@ -15,36 +15,33 @@ 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' : ''
         }`
       )
       // lerna publish in next step will fail if git status is not clean
       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(

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const path = require('path')`
`12`	`12`	`const bindings = loadBinding(`
`13`	`13`	`path.join(__dirname, '../../../native'),`
`14`	`14`	`'next-swc',`
`15`		`- 'next-swc'`
	`15`	`+ '@next/swc'`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`async function transform(src, options) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# `@next/swc-darwin-arm64`
	`2`	`+`
	`3`	+This is the aarch64-apple-darwin binary for `@next/swc`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "next-swc-darwin-arm64",`
	`2`	`+ "name": "@next/swc-darwin-arm64",`
`3`	`3`	`"version": "0.0.0",`
`4`	`4`	`"os": [`
`5`	`5`	`"darwin"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# `@next/swc-darwin-x64`
	`2`	`+`
	`3`	+This is the x86_64-apple-darwin binary for `@next/swc`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "next-swc-darwin-x64",`
	`2`	`+ "name": "@next/swc-darwin-x64",`
`3`	`3`	`"version": "0.0.0",`
`4`	`4`	`"os": [`
`5`	`5`	`"darwin"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# `@next/swc-linux-x64-gnu`
	`2`	`+`
	`3`	+This is the x86_64-unknown-linux-gnu binary for `@next/swc`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "next-swc-linux-x64-gnu",`
	`2`	`+ "name": "@next/swc-linux-x64-gnu",`
`3`	`3`	`"version": "0.0.0",`
`4`	`4`	`"os": [`
`5`	`5`	`"linux"`