@cedarjs/cli 8.0.0-canary.3333 → 8.0.0-canary.3337

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -14,6 +14,9 @@ const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
 const CURRENT_RELEASE_SYMLINK_NAME = "current";
 const LIFECYCLE_HOOKS = ["before", "after"];
+const WEB_DIST_DIRS = ["web/dist", "web/dist/browser"];
+const BUILD_MANIFEST_FILENAME = "client-build-manifest.json";
+const LINK_BATCH_SIZE = 100;
 const RELEASE_DIR_PATTERN = "^[0-9]{14}$";
 const releaseDirRegExp = new RegExp(RELEASE_DIR_PATTERN);
 const DEFAULT_SERVER_CONFIG = {
@@ -210,6 +213,135 @@ const commandWithLifecycleEvents = ({
   tasks.push(lifecycleTask("after", name, skip, config));
   return tasks.flat().filter((t) => Boolean(t));
 };
+const manifestAssetFiles = (manifestJson) => {
+  const manifest = JSON.parse(manifestJson);
+  const files = /* @__PURE__ */ new Set();
+  if (!manifest || typeof manifest !== "object") {
+    return [];
+  }
+  for (const entry of Object.values(manifest)) {
+    if (!entry || typeof entry !== "object") {
+      continue;
+    }
+    if ("file" in entry && typeof entry.file === "string") {
+      files.add(entry.file);
+    }
+    for (const key of ["css", "assets"]) {
+      if (!(key in entry) || !Array.isArray(entry[key])) {
+        continue;
+      }
+      for (const item of entry[key]) {
+        if (typeof item === "string") {
+          files.add(item);
+        }
+      }
+    }
+  }
+  return [...files];
+};
+const shellQuote = (value) => `'${value.replaceAll("'", `'\\''`)}'`;
+const readBuildManifest = async (ssh, releasePath) => {
+  for (const distDir of WEB_DIST_DIRS) {
+    let stdout;
+    try {
+      ;
+      ({ stdout } = await ssh.exec(pathJoin(releasePath, distDir), "cat", [
+        BUILD_MANIFEST_FILENAME
+      ]));
+    } catch {
+      continue;
+    }
+    const jsonStart = stdout.indexOf("{");
+    const json = jsonStart === -1 ? stdout : stdout.slice(jsonStart);
+    try {
+      return { distDir, files: manifestAssetFiles(json) };
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      throw new Error(
+        `Could not parse ${pathJoin(releasePath, distDir, BUILD_MANIFEST_FILENAME)}: ${message}`
+      );
+    }
+  }
+  return void 0;
+};
+const keepPreviousAssets = async (yargs, ssh, serverConfig) => {
+  const newReleasePath = pathJoin(serverConfig.path, yargs.releaseDir);
+  let newRelease;
+  try {
+    newRelease = await readBuildManifest(ssh, newReleasePath);
+  } catch (e) {
+    const reason = e instanceof Error ? e.message : String(e);
+    return { status: "skipped", reason };
+  }
+  if (!newRelease) {
+    return {
+      status: "skipped",
+      reason: `No ${BUILD_MANIFEST_FILENAME} in ` + WEB_DIST_DIRS.map((dir) => pathJoin(yargs.releaseDir, dir)).join(
+        " or "
+      )
+    };
+  }
+  const { stdout } = await ssh.exec(serverConfig.path, "ls");
+  const previousReleases = stdout.split("\n").map((line) => line.trim()).filter((dir) => releaseDirRegExp.test(dir) && dir !== yargs.releaseDir).sort().reverse().slice(0, Math.max(serverConfig.keepReleases - 1, 0));
+  const presentFiles = new Set(newRelease.files);
+  const warnings = [];
+  let linkedCount = 0;
+  for (const release of previousReleases) {
+    const releasePath = pathJoin(serverConfig.path, release);
+    let previousRelease;
+    try {
+      previousRelease = await readBuildManifest(ssh, releasePath);
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      warnings.push(`Skipping the web assets of release ${release}: ${message}`);
+      continue;
+    }
+    if (!previousRelease) {
+      warnings.push(
+        `Release ${release} has no web build manifest, skipping its assets`
+      );
+      continue;
+    }
+    const missingFiles = previousRelease.files.filter(
+      (file) => !presentFiles.has(file)
+    );
+    if (missingFiles.length === 0) {
+      continue;
+    }
+    const filesByDir = /* @__PURE__ */ new Map();
+    for (const file of missingFiles) {
+      const dir = path.posix.dirname(file);
+      filesByDir.set(dir, [...filesByDir.get(dir) ?? [], file]);
+    }
+    try {
+      for (const [dir, files] of filesByDir) {
+        const targetDir = pathJoin(newReleasePath, newRelease.distDir, dir);
+        await ssh.exec(newReleasePath, "mkdir", ["-p", shellQuote(targetDir)]);
+        for (let i = 0; i < files.length; i += LINK_BATCH_SIZE) {
+          const sources = files.slice(i, i + LINK_BATCH_SIZE).map(
+            (file) => shellQuote(pathJoin(releasePath, previousRelease.distDir, file))
+          );
+          await ssh.exec(newReleasePath, "ln", [
+            "-f",
+            ...sources,
+            shellQuote(targetDir)
+          ]);
+        }
+      }
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      warnings.push(
+        `Could not keep the web assets of release ${release}: ${message}`
+      );
+      continue;
+    }
+    for (const file of missingFiles) {
+      presentFiles.add(file);
+    }
+    linkedCount += missingFiles.length;
+  }
+  return { status: "done", linkedCount, warnings };
+};
 const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   const cmdPath = pathJoin(serverConfig.path, yargs.releaseDir);
   const config = {
@@ -358,6 +490,30 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
       })
     );
   }
+  tasks.push(
+    ...commandWithLifecycleEvents({
+      name: "keepAssets",
+      config,
+      skip: !yargs.keepAssets || !yargs.build || !serverConfig.sides.includes("web"),
+      command: {
+        title: `Keeping web assets of previous releases...`,
+        task: async (_ctx, task) => {
+          const result = await keepPreviousAssets(yargs, ssh, serverConfig);
+          if (result.status === "skipped") {
+            return task.skip(
+              c.warning(
+                `Warning: ${result.reason}, not keeping the web assets of previous releases`
+              )
+            );
+          }
+          task.output = [
+            `Linked ${result.linkedCount} file(s) from previous releases`,
+            ...result.warnings.map((warning) => c.warning(warning))
+          ].join("\n");
+        }
+      }
+    })
+  );
   tasks.push(
     ...commandWithLifecycleEvents({
       name: "symlinkCurrent",
@@ -599,8 +755,10 @@ export {
   commands,
   deployTasks,
   handler,
+  keepPreviousAssets,
   lifecycleTask,
   maintenanceTasks,
+  manifestAssetFiles,
   parseConfig,
   rollbackTasks,
   serverConfigWithDefaults,

package/dist/commands/deploy/baremetal.js

@@ -48,6 +48,11 @@ const builder = (yargs) => {
     default: true,
     type: "boolean"
   });
+  yargs.option("keep-assets", {
+    describe: "Hardlink previous releases' hashed web assets into the new release so open browser tabs keep working after the deploy",
+    default: true,
+    type: "boolean"
+  });
   yargs.option("releaseDir", {
     describe: "Directory to create for the latest release, defaults to timestamp",
     default: (/* @__PURE__ */ new Date()).toISOString().replace(/[:\-TZ]/g, "").replace(/\.\d+$/, ""),
@@ -95,6 +100,7 @@ async function handler(yargs) {
     build: yargs.build,
     restart: yargs.restart,
     cleanup: yargs.cleanup,
+    keepAssets: yargs.keepAssets,
     maintenance: yargs.maintenance,
     rollback: yargs.rollback,
     verbose: yargs.verbose,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3333",
+  "version": "8.0.0-canary.3337",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "8.0.0-canary.3333",
-    "@cedarjs/babel-config": "8.0.0-canary.3333",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3333",
-    "@cedarjs/internal": "8.0.0-canary.3333",
-    "@cedarjs/prerender": "8.0.0-canary.3333",
-    "@cedarjs/project-config": "8.0.0-canary.3333",
-    "@cedarjs/structure": "8.0.0-canary.3333",
-    "@cedarjs/telemetry": "8.0.0-canary.3333",
-    "@cedarjs/utils": "8.0.0-canary.3333",
-    "@cedarjs/vite": "8.0.0-canary.3333",
-    "@cedarjs/web-server": "8.0.0-canary.3333",
+    "@cedarjs/api-server": "8.0.0-canary.3337",
+    "@cedarjs/babel-config": "8.0.0-canary.3337",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3337",
+    "@cedarjs/internal": "8.0.0-canary.3337",
+    "@cedarjs/prerender": "8.0.0-canary.3337",
+    "@cedarjs/project-config": "8.0.0-canary.3337",
+    "@cedarjs/structure": "8.0.0-canary.3337",
+    "@cedarjs/telemetry": "8.0.0-canary.3337",
+    "@cedarjs/utils": "8.0.0-canary.3337",
+    "@cedarjs/vite": "8.0.0-canary.3337",
+    "@cedarjs/web-server": "8.0.0-canary.3337",
     "@listr2/prompt-adapter-enquirer": "4.3.3",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.11.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3333",
+    "@cedarjs/framework-tools": "8.0.0-canary.3337",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",