@todesktop/cli 1.18.2 → 1.18.3

package/README.md

@@ -47,7 +47,7 @@ Create a `todesktop.json` file in the root of your Electron project.
 
 ```json
 {
-  "$schema": "https://unpkg.com/@todesktop/cli@1.18.2/schemas/schema.json",
+  "$schema": "https://unpkg.com/@todesktop/cli@1.18.3/schemas/schema.json",
   "schemaVersion": 1
   "id": "your-todesktop-id",
   "icon": "./desktop-icon.png",
@@ -319,7 +319,7 @@ To enable JSON validation and IntelliSense for your `todesktop.json` file in com
 - For example, if using a hosted version of the schema:
   ```json
   {
-    "$schema": "https://unpkg.com/@todesktop/cli@1.18.2/schemas/schema.json",
+    "$schema": "https://unpkg.com/@todesktop/cli@1.18.3/schemas/schema.json",
     "id": "your-todesktop-id"
   }
   ```
@@ -1531,6 +1531,12 @@ Now, when we build your app on ToDesktop servers, it will also run your custom
 
 ## Changelog
 
+### 1.18.3
+
+#### Patch Changes
+
+- 51821cc: Add support for pnpm workspace catalogs in workspace bundling
+
 ### 1.18.2
 
 #### Patch Changes

package/dist/cli.js

@@ -3075,12 +3075,17 @@ async function prepareWorkspaceBundle(input) {
       bundlePath,
       workspacePackage: pkg,
       bundledNames: bundledPackageNames,
-      contexts: bundledPackageContexts
+      contexts: bundledPackageContexts,
+      workspace
     });
     bundleEntries.push(...packageEntries.files);
     bundleEntries.push(packageEntries.packageJsonEntry);
   }
-  const rewrittenAppPkgJson = applyRewriteMap(appPkgJson, appRewriteMap);
+  const rewrittenAppPkgJson = applyRewriteMap(
+    appPkgJson,
+    appRewriteMap,
+    workspace.catalog
+  );
   logger_default.info(
     `Bundling ${sortedPackageNames.length} workspace package(s) from ${workspace.type} workspace at ${workspace.rootDir}`
   );
@@ -3167,7 +3172,7 @@ function createPnpmDefinition({
   pnpmFile,
   rootDir
 }) {
-  const packages = parsePnpmWorkspaceFile(pnpmFile);
+  const { packages, catalog } = parsePnpmWorkspaceFile(pnpmFile);
   if (!packages.length) {
     throw new Error(
       `pnpm workspace file at ${pnpmFile} does not define any packages.`
@@ -3177,7 +3182,8 @@ function createPnpmDefinition({
     globs: packages,
     rootDir,
     realRootDir: import_fs3.default.realpathSync(rootDir),
-    type: "pnpm"
+    type: "pnpm",
+    catalog
   };
 }
 function createNpmDefinition({
@@ -3209,8 +3215,13 @@ function parsePnpmWorkspaceFile(filePath) {
   const content = import_fs3.default.readFileSync(filePath, "utf8");
   const parsed = import_js_yaml.default.load(content);
   let packagesField;
+  let catalogField;
+  let catalogsField;
   if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-    packagesField = parsed.packages;
+    const parsedObj = parsed;
+    packagesField = parsedObj.packages;
+    catalogField = parsedObj.catalog;
+    catalogsField = parsedObj.catalogs;
   } else {
     packagesField = parsed;
   }
@@ -3225,7 +3236,26 @@ function parsePnpmWorkspaceFile(filePath) {
       `pnpm workspace file at ${filePath} does not define any packages.`
     );
   }
-  return packages;
+  const catalog = {};
+  if (catalogField && typeof catalogField === "object" && !Array.isArray(catalogField)) {
+    for (const [key, value] of Object.entries(catalogField)) {
+      if (typeof value === "string") {
+        catalog[key] = value;
+      }
+    }
+  }
+  if (catalogsField && typeof catalogsField === "object" && !Array.isArray(catalogsField)) {
+    for (const [catalogName, catalogContent] of Object.entries(catalogsField)) {
+      if (catalogContent && typeof catalogContent === "object" && !Array.isArray(catalogContent)) {
+        for (const [packageName, version] of Object.entries(catalogContent)) {
+          if (typeof version === "string") {
+            catalog[`${catalogName}:${packageName}`] = version;
+          }
+        }
+      }
+    }
+  }
+  return { packages, catalog };
 }
 function workspaceIncludesPath({
   appDir,
@@ -3397,7 +3427,7 @@ function getBundlePath(packageName) {
   }
   return packageName;
 }
-function applyRewriteMap(manifest, rewriteMap) {
+function applyRewriteMap(manifest, rewriteMap, catalog) {
   const clone = JSON.parse(JSON.stringify(manifest));
   const sections = [
     "dependencies",
@@ -3412,6 +3442,34 @@ function applyRewriteMap(manifest, rewriteMap) {
         sectionDeps[depName] = rewrite;
       }
     }
+    if (catalog) {
+      for (const [depName, spec] of Object.entries(sectionDeps)) {
+        if (typeof spec === "string" && spec.startsWith("catalog:")) {
+          let catalogKey;
+          if (spec === "catalog:") {
+            catalogKey = depName;
+          } else {
+            const catalogRef = spec.slice("catalog:".length);
+            const namedCatalogKey = `${catalogRef}:${depName}`;
+            if (catalog[namedCatalogKey]) {
+              catalogKey = namedCatalogKey;
+            } else {
+              catalogKey = catalogRef;
+            }
+          }
+          const resolvedVersion = catalog[catalogKey];
+          if (resolvedVersion) {
+            sectionDeps[depName] = resolvedVersion;
+          } else {
+            throw new Error(
+              `Catalog reference "${spec}" for dependency "${depName}" not found in pnpm catalog. Available catalog entries: ${Object.keys(
+                catalog
+              ).join(", ")}`
+            );
+          }
+        }
+      }
+    }
   }
   return clone;
 }
@@ -3419,7 +3477,8 @@ async function buildPackageEntries({
   bundlePath,
   workspacePackage,
   bundledNames,
-  contexts
+  contexts,
+  workspace
 }) {
   const packageDir = workspacePackage.dir;
   const { manifest } = workspacePackage;
@@ -3440,7 +3499,11 @@ async function buildPackageEntries({
   });
   const packageJsonEntry = {
     content: Buffer.from(
-      `${JSON.stringify(applyRewriteMap(manifest, rewrites), null, 2)}
+      `${JSON.stringify(
+        applyRewriteMap(manifest, rewrites, workspace.catalog),
+        null,
+        2
+      )}
 `
     ),
     to: import_path8.default.posix.join(BUNDLED_ROOT, bundlePath, "package.json")
@@ -3463,7 +3526,7 @@ async function gatherPackageFiles({
         const posixPattern = pattern.replace(/\\/g, "/");
         return [pattern, `${posixPattern}/**/*`];
       }
-    } catch {
+    } catch (_error) {
     }
     return [pattern];
   });
@@ -4149,7 +4212,10 @@ var Login = ({ setIsLoggedIn }) => {
     failureMessage && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Error2, { errorMessage: failureMessage, marginTop: true })
   ] });
 };
-var Error2 = ({ errorMessage, marginTop }) => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Box, { marginTop: marginTop ? 1 : 0, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { color: "red", children: errorMessage }) });
+var Error2 = ({
+  errorMessage,
+  marginTop
+}) => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Box, { marginTop: marginTop ? 1 : 0, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { color: "red", children: errorMessage }) });
 Error2.propTypes = {
   errorMessage: import_prop_types8.default.string.isRequired,
   marginTop: import_prop_types8.default.bool
@@ -5450,7 +5516,10 @@ function BuildPicker({
   });
   function updateState(changes) {
     setState(
-      (previousState) => ({ ...previousState, ...changes })
+      (previousState) => ({
+        ...previousState,
+        ...changes
+      })
     );
     if (changes.state && ["error", "no-builds"].includes(changes.state)) {
       setTimeout(() => exit(), 10);
@@ -5993,7 +6062,10 @@ function ReleaseConfirmation({
   }, []);
   function updateState(changes) {
     setState(
-      (previousState) => ({ ...previousState, ...changes })
+      (previousState) => ({
+        ...previousState,
+        ...changes
+      })
     );
   }
   switch (state.state) {
@@ -6655,7 +6727,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.18.2",
+  version: "1.18.3",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",