chore: fix edge version (#5440)

Currently edge versions pretend to be production version.

This commit fixes that, to ensure that we do not confuse edge builds
with production builds and to ensure that our analytics is correct.

cli/src/build-pkg.ts

@@ -199,7 +199,19 @@ async function zipAndHash({ targetDir, archiveName, cwd, prefix, fileNames }: Zi
 
 async function buildBinaries(args: string[]) {
   const argv = minimist(args)
-  const version = argv.version || getPackageVersion()
+
+  let version: string
+
+  if (argv.version === "edge" || argv.version.startsWith("edge-")) {
+    const gitHash = await exec("git", ["rev-parse", "--short", "HEAD"])
+    version = `${getPackageVersion()}-${argv.version}-${gitHash.stdout}`
+  } else if (argv.version) {
+    console.log(`Cannot set Garden to version ${argv.version}. Please update the package.json files instead.`)
+    process.exit(1)
+  } else {
+    version = getPackageVersion()
+  }
+
   const selected = argv._.length > 0 ? pick(targets, argv._) : targets
 
   if (Object.keys(selected).length === 0) {
@@ -271,10 +283,9 @@ async function buildBinaries(args: string[]) {
         packageJson.dependencies[depName] = "file:" + relPath
       }
 
-      if (version === "edge" || version.startsWith("edge-")) {
-        const gitHash = await exec("git", ["rev-parse", "--short", "HEAD"])
-        packageJson.version = `${packageJson.version}-${version}-${gitHash.stdout}`
-        console.log("Set package version to " + packageJson.version)
+      if (version) {
+        packageJson.version = version
+        console.log(`Updated version to ${packageJson.version} in ${packageJsonPath}`)
       }
 
       await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2))
@@ -299,7 +310,7 @@ async function buildBinaries(args: string[]) {
   console.log(chalk.cyan("Bundling source code"))
 
   await remove(rollupTmpDir)
-  await exec("npm", ["run", "rollup"], { cwd: repoRoot, stdio: "inherit" })
+  await exec("npm", ["run", "rollup"], { cwd: repoRoot, stdio: "inherit", env: { GARDEN_CORE_VERSION: version } })
 
   await zipAndHash({
     archiveName: "source",

core/src/util/util.ts

@@ -114,6 +114,7 @@ export function registerCleanupFunction(name: string, func: HookCallback) {
 }
 
 export function getPackageVersion(): string {
+  // This code will be replaced by the version number during the build process in rollup.config.js. Please update the rollup config as well if you change the following line.
   const { version } = corePackageJson as { version: string }
   return version
 }

rollup.config.js

@@ -48,8 +48,16 @@ export default {
         }
       }
     },
-
-    // we import the package.json file for version number detection
+    // Hack: Replace version in `getPackageVersion()` function, because the `json()` plugin below somehow loads the wrong package.json file.
+    replace({
+      include: [/core.*\.js/],
+      values: {
+        "const { version } = corePackageJson": `const version = ${JSON.stringify(process.env.GARDEN_CORE_VERSION || "0.0.0-dev")}`,
+      },
+      delimiters: ["", ""],
+    }),
+    // we import the package.json file for version number detection, but for some reasons rollup reads the package.json files in ./ instead of in ./garden-sea/tmp/source/
+    // That's why we also need the hack above unfortunately...
     json(),
 
     // NOTE: You may need the following hacks if we ever decide to update ink to the latest version