Pull in next version from package lock

PiperOrigin-RevId: 600575957
Change-Id: I0022a6bc13724d662ddcf47f50052bdb9bd1d723

cmd/nodejs/firebasenextjs/main.go

@@ -17,6 +17,8 @@
 package main
 
 import (
+	"encoding/json"
+
 	"github.com/GoogleCloudPlatform/buildpacks/pkg/nodejs"
 	"github.com/Masterminds/semver"
 
@@ -61,8 +63,9 @@ func buildFn(ctx *gcp.Context) error {
 	if err != nil {
 		return err
 	}
+	version := version(ctx, pjs)
 
-	err = validateVersion(ctx, pjs.Dependencies["next"])
+	err = validateVersion(ctx, version)
 	if err != nil {
 		return err
 	}
@@ -100,3 +103,27 @@ func validateVersion(ctx *gcp.Context, depVersion string) error {
 	}
 	return nil
 }
+
+type nextVersionJSON struct {
+	Name         string `json:"name"`
+	Dependencies struct {
+		Next struct {
+			Version    string `json:"version"`
+			Resolved   string `json:"resolved"`
+			Overridden bool   `json:"overridden"`
+		} `json:"next"`
+	} `json:"dependencies"`
+}
+
+// tries to get the concrete nextjs version used, otherwise falls back on package.json
+func version(ctx *gcp.Context, pjs *nodejs.PackageJSON) string {
+	result, err := ctx.Exec([]string{"npm", "list", "next", "--json"})
+	if err != nil {
+		return pjs.Dependencies["next"]
+	}
+	var nextVersionnpm nextVersionJSON
+	if err := json.Unmarshal([]byte(result.Stdout), &nextVersionnpm); err != nil {
+		return pjs.Dependencies["next"]
+	}
+	return nextVersionnpm.Dependencies.Next.Version
+}

cmd/nodejs/firebasenextjs/main_test.go

@@ -126,6 +126,51 @@ func TestBuild(t *testing.T) {
 			},
 			wantExitCode: 1,
 		},
+		{
+			name: "read supported concrete version from npm list",
+			files: map[string]string{
+				"package.json": `{
+				"dependencies": {
+					"next": "12.0.0 - 14.0.0"
+				}
+			}`,
+			},
+			mocks: []*mockprocess.Mock{
+				mockprocess.New(`npm list next --json`, mockprocess.WithStdout(`{
+					"name": "test",
+					"dependencies": {
+						"next": {
+							"version": "14.0.0",
+							"resolved": "https://registry.npmjs.org/next/-/next-14.1.0.tgz",
+							"overridden": false
+						}
+					}
+				}`)),
+			},
+		},
+		{
+			name: "read unsupported concrete version from npm list",
+			files: map[string]string{
+				"package.json": `{
+				"dependencies": {
+					"next": "12.0.0 - 14.0.0"
+				}
+			}`,
+			},
+			wantExitCode: 1,
+			mocks: []*mockprocess.Mock{
+				mockprocess.New(`npm list next --json`, mockprocess.WithStdout(`{
+					"name": "test",
+					"dependencies": {
+						"next": {
+							"version": "12.0.0",
+							"resolved": "https://registry.npmjs.org/next/-/next-12.0.0.tgz",
+							"overridden": false
+						}
+					}
+				}`)),
+			},
+		},
 	}
 
 	for _, tc := range testCases {