kirby-deploy 0.3.0 → 0.3.3

package/dist/cli.js

@@ -46,7 +46,12 @@ var ConfigSchema = object({
   token: optional(string()),
   remoteDir: optional(string()),
   folderStructure: optional(
-    union([literal("flat"), literal("public"), literal("composer"), FolderStructureSchema])
+    union([
+      literal("flat"),
+      literal("public"),
+      literal("composer"),
+      FolderStructureSchema
+    ])
   ),
   checkComposerLock: optional(boolean()),
   callWebhooks: optional(boolean()),
@@ -63,6 +68,7 @@ var ConfigSchema = object({
 
 // src/config.ts
 var loadConfig = async () => {
+  var _a;
   let { config, configFile } = await load({
     name: "kirby-deploy",
     dotenv: true
@@ -96,7 +102,7 @@ ${info}`);
   } else if (config.folderStructure === "flat") {
     folderStructure = {
       content: "content",
-      media: "site/media",
+      media: "media",
       accounts: "site/accounts",
       sessions: "site/sessions",
       cache: "site/cache",
@@ -128,6 +134,7 @@ ${info}`);
     include: [],
     includeGlob: [],
     ...config,
+    url: (_a = config.url) == null ? void 0 : _a.replace(/\/$/, ""),
     folderStructure,
     lftpSettings: {
       "ftp:ssl-force": true,
@@ -156,7 +163,11 @@ var cat = (file, { host, user, password, lftpSettings }) => {
   const child = isWindows ? spawnSync("wsl", ["lftp", "-c", commands.join("; ")], {
     encoding: "utf-8"
   }) : spawnSync("lftp", ["-c", commands.join("; ")], { encoding: "utf-8" });
-  if (child.stderr) consola2.error(child.stderr);
+  if (child.stderr) {
+    if (child.stderr.includes("550")) return void 0;
+    consola2.error(child.stderr);
+    return void 0;
+  }
   return child.stdout;
 };
 
@@ -275,7 +286,7 @@ var sync = async (source, mode, config) => {
   const targetName = mode === "push" ? "remote" : "local";
   const webhookBase = `${config.url}/plugin-kirby-deploy`;
   const shouldCallWebhooks = mode === "push" && config.callWebhooks;
-  const destination = source === "./" ? config.remoteDir : `./${join2(config.remoteDir, source)}`;
+  const destination = source === "./" ? config.remoteDir : join2(config.remoteDir, source);
   if (shouldCallWebhooks && !config.token) {
     consola5.error("token needed to call webhooks");
     return false;
@@ -492,7 +503,7 @@ var main = defineCommand4({
         encoding: "utf-8"
       });
       const remoteComposerLock = cat("./composer.lock", config);
-      const skipVendor = localComposerLock === remoteComposerLock;
+      const skipVendor = remoteComposerLock !== void 0 && localComposerLock === remoteComposerLock;
       if (skipVendor) {
         exclude.push("^vendor/", "^kirby/");
         consola9.info("Skipping vendor\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-deploy",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "main": "./dist/index.js",
   "type": "module",
   "bin": {
@@ -9,6 +9,15 @@
   "keywords": [],
   "author": "Arno Schlipf",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/arnoson/kirby-deploy"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts src/cli.ts --format esm --dts",
+    "dev": "tsup src/index.ts src/cli.ts --format esm --watch",
+    "type-check": "tsc --noEmit"
+  },
   "devDependencies": {
     "@prettier/plugin-php": "^0.24.0",
     "@types/node": "^20.16.10",
@@ -21,10 +30,5 @@
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "valibot": "^1.0.0"
-  },
-  "scripts": {
-    "build": "tsup src/index.ts src/cli.ts --format esm --dts",
-    "dev": "tsup src/index.ts src/cli.ts --format esm --watch",
-    "type-check": "tsc --noEmit"
   }
-}
+}

package/src/commands/main.ts

@@ -52,7 +52,9 @@ export const main = defineCommand({
         encoding: 'utf-8',
       })
       const remoteComposerLock = cat('./composer.lock', config)
-      const skipVendor = localComposerLock === remoteComposerLock
+      const skipVendor =
+        remoteComposerLock !== undefined &&
+        localComposerLock === remoteComposerLock
       if (skipVendor) {
         exclude.push('^vendor/', '^kirby/')
         consola.info('Skipping vendor\n')

package/src/config.ts

@@ -44,7 +44,7 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
     // 'flat' structure is the default.
     folderStructure = {
       content: 'content',
-      media: 'site/media',
+      media: 'media',
       accounts: 'site/accounts',
       sessions: 'site/sessions',
       cache: 'site/cache',
@@ -77,6 +77,7 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
     include: [],
     includeGlob: [],
     ...config,
+    url: config.url?.replace(/\/$/, ''),
     folderStructure,
     lftpSettings: {
       'ftp:ssl-force': true,

package/src/lftp/cat.ts

@@ -24,6 +24,11 @@ export const cat = (
       })
     : spawnSync('lftp', ['-c', commands.join('; ')], { encoding: 'utf-8' })
 
-  if (child.stderr) consola.error(child.stderr)
+  if (child.stderr) {
+    // 550 means the file doesn't exist, silently return undefined
+    if (child.stderr.includes('550')) return undefined
+    consola.error(child.stderr)
+    return undefined
+  }
   return child.stdout
 }

package/src/sync.ts

@@ -14,7 +14,7 @@ export const sync = async (
   const webhookBase = `${config.url}/plugin-kirby-deploy`
   const shouldCallWebhooks = mode === 'push' && config.callWebhooks
   const destination =
-    source === './' ? config.remoteDir : `./${join(config.remoteDir, source)}`
+    source === './' ? config.remoteDir : join(config.remoteDir, source)
 
   if (shouldCallWebhooks && !config.token) {
     consola.error('token needed to call webhooks')

package/src/types.ts

@@ -32,7 +32,12 @@ export const ConfigSchema = object({
   token: optional(string()),
   remoteDir: optional(string()),
   folderStructure: optional(
-    union([literal('flat'), literal('public'), literal('composer'), FolderStructureSchema]),
+    union([
+      literal('flat'),
+      literal('public'),
+      literal('composer'),
+      FolderStructureSchema,
+    ]),
   ),
   checkComposerLock: optional(boolean()),
   callWebhooks: optional(boolean()),