@plasmicapp/cli 0.1.336 → 0.1.337

package/dist/index.js

@@ -499536,7 +499536,6 @@ async function fixRscModulesImports(context, baseDir, fixImportContext, compConf
     if (!modulePath) {
       continue;
     }
-    logger.info(`Fixing rsc import statements... ${modulePath}`);
     try {
       await fixFileImportStatements(
         context,
@@ -499861,11 +499860,15 @@ function readFileText(path15) {
         case "create":
           return ensureString(action.content);
         case "rename":
-          return readFileText(action.newPath);
+          return import_fs.default.readFileSync(path15, "utf8");
         case "delete":
           throw new HandledError("File does not exists");
       }
     }
+    const renamedFilePath = renamedFiles.get(path15);
+    if (renamedFilePath) {
+      return readFileText(renamedFilePath);
+    }
   }
   return import_fs.default.readFileSync(path15, "utf8");
 }
@@ -502268,7 +502271,7 @@ var import_lodash15 = __toESM(require_lodash());
 var import_upath9 = __toESM(require_upath());
 
 // src/utils/rsc-config.ts
-async function syncRscFiles(context, project, bundle, compConfig) {
+async function syncRscFiles(context, project, bundle, compConfig, opts) {
   const rscMetadata = bundle.rscMetadata;
   if (rscMetadata) {
     if (!compConfig.rsc) {
@@ -502296,19 +502299,22 @@ async function syncRscFiles(context, project, bundle, compConfig) {
       "-client.tsx"
     );
     compConfig.rsc.clientModulePath = clientModuleFilePath;
-    await writeFileContent(
-      context,
-      clientModuleFilePath,
-      rscMetadata.pageWrappers.client.module,
-      {
-        force: false
-      }
-    );
+    if (opts.shouldRegenerate) {
+      await writeFileContent(
+        context,
+        clientModuleFilePath,
+        rscMetadata.pageWrappers.client.module,
+        {
+          force: false
+        }
+      );
+    }
   }
 }
 
 // src/actions/sync-components.ts
 async function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, summary, projectLock, checksums, baseDir) {
+  var _a;
   const componentsFromChecksums = /* @__PURE__ */ new Set([
     ...checksums.cssRulesChecksums.map(([id, _]) => id),
     checksums.renderModuleChecksums.map(([id, _]) => id)
@@ -502467,6 +502473,23 @@ async function syncProjectComponents(context, project, version, componentBundles
         }
         renameFile(context, compConfig.importSpec.modulePath, skeletonPath);
         compConfig.importSpec.modulePath = skeletonPath;
+        if (((_a = compConfig.rsc) == null ? void 0 : _a.clientModulePath) && fileExists(context, compConfig.rsc.clientModulePath)) {
+          const clientModulePath = skeletonPath.replace(
+            /\.tsx$/,
+            "-client.tsx"
+          );
+          if (context.cliArgs.quiet !== true) {
+            logger.info(
+              `Renaming page file: ${compConfig.rsc.clientModulePath} -> ${clientModulePath}	['${project.projectName}' ${project.projectId}/${id} ${project.version}]`
+            );
+          }
+          renameFile(
+            context,
+            compConfig.rsc.clientModulePath,
+            clientModulePath
+          );
+          compConfig.rsc.clientModulePath = clientModulePath;
+        }
       }
       compConfig.plumeType = plumeType;
       if (scheme === "direct") {
@@ -502534,7 +502557,9 @@ async function syncProjectComponents(context, project, version, componentBundles
       );
     }
     summary.set(id, { skeletonModuleModified });
-    await syncRscFiles(context, project, bundle, compConfig);
+    await syncRscFiles(context, project, bundle, compConfig, {
+      shouldRegenerate
+    });
   }
 }
 

package/dist/lib.js

@@ -494878,7 +494878,6 @@ async function fixRscModulesImports(context, baseDir, fixImportContext, compConf
     if (!modulePath) {
       continue;
     }
-    logger.info(`Fixing rsc import statements... ${modulePath}`);
     try {
       await fixFileImportStatements(
         context,
@@ -495203,11 +495202,15 @@ function readFileText(path15) {
         case "create":
           return ensureString(action.content);
         case "rename":
-          return readFileText(action.newPath);
+          return import_fs.default.readFileSync(path15, "utf8");
         case "delete":
           throw new HandledError("File does not exists");
       }
     }
+    const renamedFilePath = renamedFiles.get(path15);
+    if (renamedFilePath) {
+      return readFileText(renamedFilePath);
+    }
   }
   return import_fs.default.readFileSync(path15, "utf8");
 }
@@ -497566,7 +497569,7 @@ var import_lodash15 = __toESM(require_lodash());
 var import_upath9 = __toESM(require_upath());
 
 // src/utils/rsc-config.ts
-async function syncRscFiles(context, project, bundle, compConfig) {
+async function syncRscFiles(context, project, bundle, compConfig, opts) {
   const rscMetadata = bundle.rscMetadata;
   if (rscMetadata) {
     if (!compConfig.rsc) {
@@ -497594,19 +497597,22 @@ async function syncRscFiles(context, project, bundle, compConfig) {
       "-client.tsx"
     );
     compConfig.rsc.clientModulePath = clientModuleFilePath;
-    await writeFileContent(
-      context,
-      clientModuleFilePath,
-      rscMetadata.pageWrappers.client.module,
-      {
-        force: false
-      }
-    );
+    if (opts.shouldRegenerate) {
+      await writeFileContent(
+        context,
+        clientModuleFilePath,
+        rscMetadata.pageWrappers.client.module,
+        {
+          force: false
+        }
+      );
+    }
   }
 }
 
 // src/actions/sync-components.ts
 async function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, summary, projectLock, checksums, baseDir) {
+  var _a;
   const componentsFromChecksums = /* @__PURE__ */ new Set([
     ...checksums.cssRulesChecksums.map(([id, _]) => id),
     checksums.renderModuleChecksums.map(([id, _]) => id)
@@ -497765,6 +497771,23 @@ async function syncProjectComponents(context, project, version, componentBundles
         }
         renameFile(context, compConfig.importSpec.modulePath, skeletonPath);
         compConfig.importSpec.modulePath = skeletonPath;
+        if (((_a = compConfig.rsc) == null ? void 0 : _a.clientModulePath) && fileExists(context, compConfig.rsc.clientModulePath)) {
+          const clientModulePath = skeletonPath.replace(
+            /\.tsx$/,
+            "-client.tsx"
+          );
+          if (context.cliArgs.quiet !== true) {
+            logger.info(
+              `Renaming page file: ${compConfig.rsc.clientModulePath} -> ${clientModulePath}	['${project.projectName}' ${project.projectId}/${id} ${project.version}]`
+            );
+          }
+          renameFile(
+            context,
+            compConfig.rsc.clientModulePath,
+            clientModulePath
+          );
+          compConfig.rsc.clientModulePath = clientModulePath;
+        }
       }
       compConfig.plumeType = plumeType;
       if (scheme === "direct") {
@@ -497832,7 +497855,9 @@ async function syncProjectComponents(context, project, version, componentBundles
       );
     }
     summary.set(id, { skeletonModuleModified });
-    await syncRscFiles(context, project, bundle, compConfig);
+    await syncRscFiles(context, project, bundle, compConfig, {
+      shouldRegenerate
+    });
   }
 }
 

package/dist/plasmic.schema.json

@@ -113,11 +113,14 @@
                     "type": "string"
                 },
                 "rsc": {
+                    "description": "RSC metadata for this component. The structure of the config changes when this is set:\nrenderModuleFilePath points to the client blackbox render module.\nimportSpec points to the server skeleton file.",
                     "properties": {
                         "clientModulePath": {
+                            "description": "The client skeleton file",
                             "type": "string"
                         },
                         "serverModulePath": {
+                            "description": "The server blackbox render module",
                             "type": "string"
                         }
                     },

package/dist/utils/config-utils.d.ts

@@ -206,8 +206,15 @@ export interface ComponentConfig {
     path?: string;
     /** Plume type if component is a Plume component */
     plumeType?: string;
+    /**
+     * RSC metadata for this component. The structure of the config changes when this is set:
+     * renderModuleFilePath points to the client blackbox render module.
+     * importSpec points to the server skeleton file.
+     */
     rsc?: {
+        /** The server blackbox render module  */
         serverModulePath: string;
+        /** The client skeleton file */
         clientModulePath: string;
     };
 }

package/dist/utils/rsc-config.d.ts

@@ -1,3 +1,5 @@
 import { ComponentBundle } from "../api";
 import { ComponentConfig, PlasmicContext, ProjectConfig } from "./config-utils";
-export declare function syncRscFiles(context: PlasmicContext, project: ProjectConfig, bundle: ComponentBundle, compConfig: ComponentConfig): Promise<void>;
+export declare function syncRscFiles(context: PlasmicContext, project: ProjectConfig, bundle: ComponentBundle, compConfig: ComponentConfig, opts: {
+    shouldRegenerate: boolean;
+}): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.336",
+  "version": "0.1.337",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -83,5 +83,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "e390ac2d296d887f8ed34f29fd85f21a315c35da"
+  "gitHead": "5dbcf9cb4a1be8f4060acbb9e3bdf698e99af7c6"
 }

package/src/actions/sync-components.ts

@@ -232,6 +232,26 @@ export async function syncProjectComponents(
         }
         renameFile(context, compConfig.importSpec.modulePath, skeletonPath);
         compConfig.importSpec.modulePath = skeletonPath;
+        if (
+          compConfig.rsc?.clientModulePath &&
+          fileExists(context, compConfig.rsc.clientModulePath)
+        ) {
+          const clientModulePath = skeletonPath.replace(
+            /\.tsx$/,
+            "-client.tsx"
+          );
+          if (context.cliArgs.quiet !== true) {
+            logger.info(
+              `Renaming page file: ${compConfig.rsc.clientModulePath} -> ${clientModulePath}\t['${project.projectName}' ${project.projectId}/${id} ${project.version}]`
+            );
+          }
+          renameFile(
+            context,
+            compConfig.rsc.clientModulePath,
+            clientModulePath
+          );
+          compConfig.rsc.clientModulePath = clientModulePath;
+        }
       }
 
       compConfig.plumeType = plumeType;
@@ -306,6 +326,8 @@ export async function syncProjectComponents(
     }
     summary.set(id, { skeletonModuleModified });
 
-    await syncRscFiles(context, project, bundle, compConfig);
+    await syncRscFiles(context, project, bundle, compConfig, {
+      shouldRegenerate,
+    });
   }
 }

package/src/utils/code-utils.ts

@@ -946,8 +946,6 @@ export async function fixRscModulesImports(
       continue;
     }
 
-    logger.info(`Fixing rsc import statements... ${modulePath}`);
-
     try {
       await fixFileImportStatements(
         context,

package/src/utils/config-utils.ts

@@ -289,8 +289,15 @@ export interface ComponentConfig {
   /** Plume type if component is a Plume component */
   plumeType?: string;
 
+  /**
+   * RSC metadata for this component. The structure of the config changes when this is set:
+   * renderModuleFilePath points to the client blackbox render module.
+   * importSpec points to the server skeleton file.
+   */
   rsc?: {
+    /** The server blackbox render module  */
     serverModulePath: string;
+    /** The client skeleton file */
     clientModulePath: string;
   };
 }

package/src/utils/file-utils.ts

@@ -463,11 +463,18 @@ export function readFileText(path: string): string {
         case "create":
           return ensureString(action.content);
         case "rename":
-          return readFileText(action.newPath);
+          // eslint-disable-next-line no-restricted-properties
+          return fs.readFileSync(path, "utf8");
         case "delete":
           throw new HandledError("File does not exists");
       }
     }
+    // If we are buffering files and the file has been renamed, only the old file path
+    // exists in disk, so we need to read the content from the old file path.
+    const renamedFilePath = renamedFiles.get(path);
+    if (renamedFilePath) {
+      return readFileText(renamedFilePath);
+    }
   }
 
   // eslint-disable-next-line no-restricted-properties
@@ -503,7 +510,6 @@ export function renameFileBuffered(oldPath: string, newPath: string) {
     if (renamedFile !== undefined) {
       oldPath = renamedFile;
     }
-
     buffer.set(oldPath, { type: "rename", newPath });
     renamedFiles.set(newPath, oldPath);
   } else {

package/src/utils/rsc-config.ts

@@ -6,7 +6,10 @@ export async function syncRscFiles(
   context: PlasmicContext,
   project: ProjectConfig,
   bundle: ComponentBundle,
-  compConfig: ComponentConfig
+  compConfig: ComponentConfig,
+  opts: {
+    shouldRegenerate: boolean;
+  }
 ) {
   const rscMetadata = bundle.rscMetadata;
   if (rscMetadata) {
@@ -39,13 +42,15 @@ export async function syncRscFiles(
     );
     compConfig.rsc.clientModulePath = clientModuleFilePath;
 
-    await writeFileContent(
-      context,
-      clientModuleFilePath,
-      rscMetadata.pageWrappers.client.module,
-      {
-        force: false,
-      }
-    );
+    if (opts.shouldRegenerate) {
+      await writeFileContent(
+        context,
+        clientModuleFilePath,
+        rscMetadata.pageWrappers.client.module,
+        {
+          force: false,
+        }
+      );
+    }
   }
 }