fix(lib): Fix .next not found error

zeabur · Sep 19, 2023 · e7561fa · e7561fa
1 parent 243eb46
commit e7561fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/internal/nodejs/nextjs/function.go b/internal/nodejs/nextjs/function.go
@@ -20,7 +20,7 @@ func constructNextFunction(zeaburOutputDir, firstFuncPage, tmpDir string) error
 		return fmt.Errorf("create function dir: %w", err)
 	}
 
-	launcher, err := renderLauncher()
+	launcher, err := renderLauncher(tmpDir)
 	if err != nil {
 		return fmt.Errorf("render launcher: %w", err)
 	}
@@ -30,7 +30,7 @@ func constructNextFunction(zeaburOutputDir, firstFuncPage, tmpDir string) error
 		return fmt.Errorf("write launcher: %w", err)
 	}
 
-	err = cp.Copy(".next", path.Join(p, ".next"))
+	err = cp.Copy(path.Join(tmpDir, ".next"), path.Join(p, ".next"))
 	if err != nil {
 		return fmt.Errorf("copy .next: %w", err)
 	}

diff --git a/internal/nodejs/nextjs/launcher.go b/internal/nodejs/nextjs/launcher.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
 	"strings"
 	"text/template"
 )
@@ -13,8 +14,8 @@ import (
 var launcherTemplate string
 
 // getNextConfig read .next/required-server-files.json and return the config string that will be injected into launcher
-func getNextConfig() (string, error) {
-	rsf, err := os.ReadFile(".next/required-server-files.json")
+func getNextConfig(tmpDir string) (string, error) {
+	rsf, err := os.ReadFile(path.Join(tmpDir, ".next/required-server-files.json"))
 	if err != nil {
 		return "", fmt.Errorf("read required-server-files.json: %w", err)
 	}
@@ -43,8 +44,8 @@ func getNextConfig() (string, error) {
 }
 
 // renderLauncher will render the launcher.js template which used as the entrypoint of the serverless function
-func renderLauncher() (string, error) {
-	nextConfig, err := getNextConfig()
+func renderLauncher(tmpDir string) (string, error) {
+	nextConfig, err := getNextConfig(tmpDir)
 	if err != nil {
 		return "", fmt.Errorf("get next config: %w", err)
 	}

diff --git a/internal/nodejs/nextjs/main.go b/internal/nodejs/nextjs/main.go
@@ -86,7 +86,7 @@ func TransformServerless(image, workdir string) error {
 		return fmt.Errorf("copy public dir: %w", err)
 	}
 
-	nextConfig, err := getNextConfig()
+	nextConfig, err := getNextConfig(tmpDir)
 	if err != nil {
 		return fmt.Errorf("get next config: %w", err)
 	}