pockethost 4.2.0 → 4.2.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Formerly published as `phio`. Versions below 3.0.0 are phio's history.
 
+## 4.2.1
+
+### Patch Changes
+
+- Removing a package (even the last one) now removes it from the instance. With a `package.json`, `deploy` and `dev`
+  tell PocketHost that the deploy owns `node_modules`, so whatever isn't shipped is cleaned up.
+  `--no-node-modules` still leaves the instance's `node_modules` alone.
+
 ## 4.2.0
 
 ### Minor Changes

package/README.md

@@ -117,10 +117,11 @@ Older project files (`.phioconfig`, `package.json` → `pockethost.instanceName`
 3. Commit: the server swaps the file set in atomically (stopping the instance when anything outside `pb_public`
    changes) and starts the instance again.
 
-PocketHost doesn't run `npm install`. Instead, when `package.json` has `dependencies`, the CLI ships your production
+PocketHost doesn't run `npm install`. Instead, when your project has a `package.json`, the CLI ships your production
 `node_modules` with the deploy: the packages in `dependencies` and everything they need, never `devDependencies`.
 It works with npm, pnpm, Bun and workspaces, and follows symlinks, so the instance gets plain files. Install first
-(`npm install` or similar), then deploy. `--no-node-modules` leaves the instance's `node_modules` alone.
+(`npm install` or similar), then deploy. The instance's `node_modules` ends up matching what you shipped, so packages
+you remove (even the last one) are removed there too. `--no-node-modules` leaves the instance's `node_modules` alone.
 
 Only `pb_*` folders (never `pb_data`), `package.json`, `bun.lock(b)`, `patches/` and the production `node_modules` are
 deployed. Files in those folders on the instance that aren't in your project are removed. `.git*` files are never
@@ -160,13 +161,13 @@ Customer docs: https://pockethost.io/docs/cli
 
 ## Environment variables
 
-| Variable | Purpose |
-| -------- | ------- |
-| `POCKETHOST_TOKEN` | Personal access token (CI); overrides the saved one |
-| `POCKETHOST_INSTANCE_NAME` | Override linked instance name |
-| `POCKETHOST_MOTHERSHIP_URL` | Override mothership API URL |
-| `POCKETHOST_HOME` | Override config directory |
-| `POCKETHOST_PROJECT_DIR` | Override project root detection |
+| Variable                    | Purpose                                             |
+| --------------------------- | --------------------------------------------------- |
+| `POCKETHOST_TOKEN`          | Personal access token (CI); overrides the saved one |
+| `POCKETHOST_INSTANCE_NAME`  | Override linked instance name                       |
+| `POCKETHOST_MOTHERSHIP_URL` | Override mothership API URL                         |
+| `POCKETHOST_HOME`           | Override config directory                           |
+| `POCKETHOST_PROJECT_DIR`    | Override project root detection                     |
 
 Environment variables take precedence over `.pockethostconfig`. The old `PHIO_*` names still work (with a deprecation
 warning) and will be removed in a future major version.

package/dist/cli.js

@@ -6444,7 +6444,7 @@ function useColor() {
 var program = new Command();
 
 // package.json
-var version = "4.2.0";
+var version = "4.2.1";
 
 // src/lib/projectRoot.ts
 import { existsSync as existsSync2 } from "fs";
@@ -6755,8 +6755,8 @@ var saveInstanceName = (instanceName) => {
 
 // src/lib/deployLocal.ts
 import { copyFile, mkdir, readdir } from "fs/promises";
-import { existsSync as existsSync5 } from "fs";
-import { dirname as dirname3, join as join4, resolve } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { dirname as dirname3, join as join5, resolve } from "path";
 
 // ../../node_modules/.pnpm/pretty-bytes@7.1.0/node_modules/pretty-bytes/index.js
 var BYTE_UNITS = [
@@ -6900,7 +6900,7 @@ function prettyBytes(number, options2) {
 
 // src/lib/deployApi.ts
 import { execFileSync } from "child_process";
-import { lstatSync as lstatSync2 } from "fs";
+import { existsSync as existsSync5, lstatSync as lstatSync2 } from "fs";
 import { readFile } from "fs/promises";
 
 // ../../node_modules/.pnpm/glob@13.0.6/node_modules/glob/dist/esm/index.min.js
@@ -9888,7 +9888,7 @@ var Ze = Object.assign(Je, { glob: Je, globSync: ts, sync: Ui, globStream: Qe, s
 Ze.glob = Ze;
 
 // src/lib/deployApi.ts
-import { sep as sep3 } from "path";
+import { join as join4, sep as sep3 } from "path";
 import { gzipSync } from "zlib";
 
 // vendor/ftp-deploy/sftpDeploy.ts
@@ -12868,10 +12868,6 @@ var collectNodeModules = (projectDir) => {
   packages.sort((a, b) => a.path < b.path ? -1 : 1);
   return { files, packages, missing };
 };
-var hasRuntimeDependencies = (projectDir) => {
-  const pkg = readPackageJson(projectDir);
-  return Object.keys(pkg.dependencies ?? {}).length + Object.keys(pkg.optionalDependencies ?? {}).length > 0;
-};
 
 // src/lib/config.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
@@ -13015,7 +13011,7 @@ var collectLocalFiles = async (include, exclude, cwd = process.cwd(), options2 =
     });
   }
   let nodeModules = null;
-  if (options2.nodeModules ?? hasRuntimeDependencies(cwd)) {
+  if (options2.nodeModules ?? existsSync5(join4(cwd, "package.json"))) {
     nodeModules = collectNodeModules(cwd);
     for (const f of nodeModules.files) {
       const data = await readFile(f.source);
@@ -13039,7 +13035,7 @@ var assertNodeModulesComplete = (nm) => {
 var describeNodeModules = (nm) => {
   if (!nm) return [];
   const lines = [
-    `\u{1F4E6} node_modules: ${nm.packages.length} package(s), ${nm.files.length} file(s)`
+    nm.packages.length === 0 ? `\u{1F4E6} node_modules: no packages (any on the server will be removed)` : `\u{1F4E6} node_modules: ${nm.packages.length} package(s), ${nm.files.length} file(s)`
   ];
   if (nm.missing.length > 0) {
     lines.push(
@@ -13115,7 +13111,7 @@ var createDeployClient = (instanceName, cred) => {
     base,
     headers,
     whoami: () => call("GET", "/whoami"),
-    check: (files) => call("POST", "/check", { files }),
+    check: (files, nodeModules = false) => call("POST", "/check", { files, nodeModules }),
     upload: (bundle) => call(
       "POST",
       "/blobs",
@@ -13170,10 +13166,12 @@ var deployViaApi = async (opts) => {
     uploadedCount += toSend.length;
     uploadedBytes += bytes;
   };
-  const { missing } = await client.check(manifest);
+  const managesNodeModules = nodeModules !== null;
+  const { missing } = await client.check(manifest, managesNodeModules);
   await upload(missing);
   const commitBody = {
     files: manifest,
+    nodeModules: managesNodeModules,
     commit: opts.commit ?? detectCommit(cwd),
     message: opts.message ?? "",
     source: detectSource(),
@@ -13212,12 +13210,12 @@ var deployViaApi = async (opts) => {
 // src/lib/deployLocal.ts
 var writeDeploySet = async (files, outDir) => {
   const root = resolve(outDir);
-  if (existsSync5(root) && (await readdir(root)).length > 0) {
+  if (existsSync6(root) && (await readdir(root)).length > 0) {
     throw new Error(`${outDir} must be empty or not exist yet`);
   }
   await mkdir(root, { recursive: true });
   for (const f of files) {
-    const dest = join4(root, ...f.path.split("/"));
+    const dest = join5(root, ...f.path.split("/"));
     await mkdir(dirname3(dest), { recursive: true });
     await copyFile(f.source, dest);
   }
@@ -15029,7 +15027,7 @@ var shellQuote = (value) => {
 var formatSftpCommand = (connection, sftpBin = "sftp") => [sftpBin, ...buildSftpArgs(connection).map(shellQuote)].join(" ");
 
 // src/lib/deployKey.ts
-import { chmodSync as chmodSync2, existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
 import { generateKeyPairSync } from "crypto";
 
 // src/lib/sshPublicKey.ts
@@ -15178,7 +15176,7 @@ var migratePkcs8PrivateKeyIfNeeded = (privateKeyPath) => {
 };
 var ensureLocalKeyPair = () => {
   const { privateKeyPath, publicKeyPath } = getDeployKeyPaths();
-  if (existsSync6(privateKeyPath) && existsSync6(publicKeyPath)) {
+  if (existsSync7(privateKeyPath) && existsSync7(publicKeyPath)) {
     migratePkcs8PrivateKeyIfNeeded(privateKeyPath);
     return {
       privateKeyPath,
@@ -15360,8 +15358,11 @@ var DeployCommand = () => {
     `Commit SHA to record (default: $GITHUB_SHA or git HEAD)`
   ).option(`-m, --message <message>`, `Note to record with this deploy`).option(
     `--node-modules`,
-    `Ship the production node_modules tree (default when package.json has dependencies)`
-  ).option(`--no-node-modules`, `Don't ship node_modules`).option(
+    `Ship the production node_modules tree and remove packages no longer used (default with a package.json)`
+  ).option(
+    `--no-node-modules`,
+    `Don't ship node_modules; leave the instance's node_modules alone`
+  ).option(
     `--out <dir>`,
     `Write the deploy set to a local folder instead of deploying`
   ).option(`--dry-run`, `List what would be deployed, deploy nothing`).option(
@@ -15409,8 +15410,8 @@ var DeployCommand = () => {
 };
 
 // src/commands/FilesCommand.ts
-import { existsSync as existsSync7, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
-import { join as join7, relative as relative4, resolve as resolve4, sep as sep4 } from "path";
+import { existsSync as existsSync8, readdirSync as readdirSync3, statSync as statSync2 } from "fs";
+import { join as join8, relative as relative4, resolve as resolve4, sep as sep4 } from "path";
 
 // src/lib/filesApi.ts
 import { createReadStream, createWriteStream } from "fs";
@@ -15559,7 +15560,7 @@ var FilesCommand = () => instanceOption(
   if (out.truncated) console.log(`(list truncated)`);
 });
 var isCurrent = (local, e) => {
-  if (!existsSync7(local)) return false;
+  if (!existsSync8(local)) return false;
   const st2 = statSync2(local);
   return st2.size === e.size && Math.abs(st2.mtimeMs - e.mtime) < 1e3;
 };
@@ -15596,21 +15597,21 @@ var PullCommand = () => instanceOption(
       )
     );
   }
-  const todo = wanted.filter((e) => !isCurrent(join7(dir, e.path), e));
+  const todo = wanted.filter((e) => !isCurrent(join8(dir, e.path), e));
   const bytes = todo.reduce((n7, e) => n7 + e.size, 0);
   console.log(
     `${options2.dryRun ? "Would download" : "Downloading"} ${todo.length} of ${wanted.length} file(s) (${prettyBytes(bytes)}) from ${instanceName} into ${dir}`
   );
   for (const e of todo) {
     if (options2.verbose || options2.dryRun) console.log(`   ${e.path}`);
-    if (!options2.dryRun) await files.download(e.path, join7(dir, e.path));
+    if (!options2.dryRun) await files.download(e.path, join8(dir, e.path));
   }
   if (!options2.dryRun) console.log(`\u2705 Done.`);
 });
 var walkLocal = (abs) => {
   const st2 = statSync2(abs);
   if (!st2.isDirectory()) return [abs];
-  return readdirSync3(abs).filter((n7) => !n7.startsWith(".git")).flatMap((n7) => walkLocal(join7(abs, n7)));
+  return readdirSync3(abs).filter((n7) => !n7.startsWith(".git")).flatMap((n7) => walkLocal(join8(abs, n7)));
 };
 var UploadCommand = () => instanceOption(
   new Command("upload").description(
@@ -15622,7 +15623,7 @@ var UploadCommand = () => instanceOption(
 ).action(async (local, remote, options2) => {
   const instanceName = requireInstance(options2.instance);
   const abs = resolve4(local);
-  if (!existsSync7(abs)) throw new Error(`${local} not found`);
+  if (!existsSync8(abs)) throw new Error(`${local} not found`);
   const target = normalizeRemotePath(
     remote ?? relative4(process.cwd(), abs).split(sep4).join("/")
   );
@@ -15674,7 +15675,7 @@ var RmCommand = () => instanceOption(
 });
 
 // src/commands/InfoCommand.ts
-import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
 
 // ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@20.19.43/node_modules/@inquirer/core/dist/lib/key.js
 var keybindings = ["emacs", "vim"];
@@ -17569,7 +17570,7 @@ var TokenCommand = () => new Command("token").description(`Show, save or remove
 // src/commands/InfoCommand.ts
 var sshKeyStatus = async () => {
   const { publicKeyPath } = getDeployKeyPaths();
-  if (!existsSync8(publicKeyPath))
+  if (!existsSync9(publicKeyPath))
     return `none yet (created the first time you use SFTP)`;
   const fingerprint = fingerprintForPublicKey(
     readFileSync6(publicKeyPath, "utf8").trim()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pockethost",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "The PocketHost CLI: deploy, sync, and tail logs for your PocketHost instances",
   "repository": {
     "type": "git",