Merge branch 'canary' into fix/timed-out-prefetch

vercel · Sep 8, 2021 · 55b9f2c · 55b9f2c
2 parents 162b96d + 4f8d883
commit 55b9f2c
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 43 deletions.
diff --git a/.github/workflows/build_native.yml b/.github/workflows/build_native.yml
@@ -11,12 +11,16 @@ jobs:
         include:
           - os: ubuntu-18.04
             target: x86_64-unknown-linux-gnu
+            name: linux-x64-gnu
           - os: windows-latest
             target: x86_64-pc-windows-msvc
+            name: win32-x64-msvc
           - os: macos-latest
             target: x86_64-apple-darwin
+            name: darwin-x64
           - os: macos-latest
             target: aarch64-apple-darwin
+            name: darwin-arm64
             description: m1
 
     name: next-swc - ${{ matrix.os }} - ${{ matrix.target }} - node@14
@@ -69,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@v2.2.4
         with:
           name: next-swc-binaries
-          path: packages/next/native/next-swc.*.node
+          path: packages/next/native/next-swc.${{ matrix.name }}.node
       - name: Clear the cargo caches
         run: |
           cargo install cargo-cache --no-default-features --features ci-autoclean

diff --git a/packages/next/build/swc/index.js b/packages/next/build/swc/index.js
@@ -67,5 +67,15 @@ function toBuffer(t) {
   return Buffer.from(JSON.stringify(t))
 }
 
+export async function minify(src, opts) {
+  return bindings.minify(src, toBuffer(opts ?? {}))
+}
+
+export function minifySync(src, opts) {
+  return bindings.minifySync(src, toBuffer(opts ?? {}))
+}
+
 module.exports.transform = transform
 module.exports.transformSync = transformSync
+module.exports.minify = minify
+module.exports.minifySync = minifySync
diff --git a/packages/next/build/swc/src/lib.rs b/packages/next/build/swc/src/lib.rs
@@ -47,6 +47,7 @@ use swc_common::{
 
 mod amp_attributes;
 mod hook_optimizer;
+mod minify;
 mod next_dynamic;
 pub mod next_ssg;
 mod transform;
@@ -76,6 +77,9 @@ fn init(mut exports: JsObject) -> napi::Result<()> {
     exports.create_named_method("transform", transform::transform)?;
     exports.create_named_method("transformSync", transform::transform_sync)?;
 
+    exports.create_named_method("minify", minify::minify)?;
+    exports.create_named_method("minifySync", minify::minify_sync)?;
+
     Ok(())
 }