@plasmicapp/cli 0.1.353 → 0.1.355

package/src/utils/envdetect.ts

@@ -1,4 +1,5 @@
 import findupSync from "findup-sync";
+import semver from "semver";
 import { getParsedPackageJson } from "./npm-utils";
 
 export function detectTypescript() {
@@ -7,9 +8,13 @@ export function detectTypescript() {
 
 export function detectNextJs() {
   if (
-    findupSync("next.config.js") ||
-    findupSync(".next") ||
-    findupSync("next-env.d.ts")
+    findupSync([
+      "next.config.js",
+      "next.config.ts",
+      "next.config.mjs",
+      ".next/",
+      "next-env.d.ts",
+    ])
   ) {
     return true;
   }
@@ -26,12 +31,44 @@ export function detectNextJs() {
 }
 
 export function detectNextJsAppDir() {
+  if (!detectNextJs()) {
+    return false;
+  }
+
   const nextConfigPath = findupSync("next.config.js");
-  if (!nextConfigPath) {
+  // Legacy Next.js (<13.4): explicit opt-in
+  if (nextConfigPath && require(nextConfigPath)?.experimental?.appDir) {
+    return true;
+  }
+
+  if (!findupSync("app")) {
+    return false;
+  }
+
+  if (!findupSync("pages")) {
+    return true;
+  }
+
+  // Both app/ and pages/ exist - need to check Next.js version
+  try {
+    const packageJson = getParsedPackageJson();
+    const nextVersion: string | undefined = packageJson.dependencies?.next;
+    if (nextVersion) {
+      if (nextVersion === "latest") {
+        return true;
+      }
+      const coercedVersion = semver.coerce(nextVersion);
+      // For Next.js >= 13.4, app dir is the default
+      if (coercedVersion && semver.gte(coercedVersion, "13.4.0")) {
+        return true;
+      }
+    }
+  } catch {
+    // Can't read package.json - can't determine if App Router is enabled
     return false;
   }
 
-  return require(nextConfigPath)?.experimental?.appDir || false;
+  return false;
 }
 
 export function detectGatsby() {

package/src/utils/rsc-config.ts

@@ -1,4 +1,5 @@
 import { ComponentBundle } from "../api";
+import { maybeConvertTsxToJsx } from "./code-utils";
 import { ComponentConfig, PlasmicContext, ProjectConfig } from "./config-utils";
 import { defaultResourcePath, writeFileContent } from "./file-utils";
 
@@ -20,33 +21,49 @@ export async function syncRscFiles(
       };
     }
 
-    const serverModuleFilePath = defaultResourcePath(
+    let serverModuleFilePath = defaultResourcePath(
       context,
       project,
       rscMetadata.pageWrappers.server.fileName
     );
+    let serverModuleContent = rscMetadata.pageWrappers.server.module;
+
+    if (context.config.code.lang === "js") {
+      const [convertedFileName, convertedContent] = await maybeConvertTsxToJsx(
+        serverModuleFilePath,
+        serverModuleContent
+      );
+      serverModuleFilePath = convertedFileName;
+      serverModuleContent = convertedContent;
+    }
     compConfig.rsc.serverModulePath = serverModuleFilePath;
 
-    await writeFileContent(
-      context,
-      serverModuleFilePath,
-      rscMetadata.pageWrappers.server.module,
-      {
-        force: true,
-      }
-    );
+    await writeFileContent(context, serverModuleFilePath, serverModuleContent, {
+      force: true,
+    });
 
-    const clientModuleFilePath = compConfig.importSpec.modulePath.replace(
-      /\.tsx$/,
+    let clientModuleFilePath = compConfig.importSpec.modulePath.replace(
+      /\.(tsx|jsx)$/,
       "-client.tsx"
     );
+    let clientModuleContent = rscMetadata.pageWrappers.client.module;
+
+    if (context.config.code.lang === "js") {
+      const [convertedFileName, convertedContent] = await maybeConvertTsxToJsx(
+        clientModuleFilePath,
+        clientModuleContent
+      );
+      clientModuleFilePath = convertedFileName;
+      clientModuleContent = convertedContent;
+    }
+
     compConfig.rsc.clientModulePath = clientModuleFilePath;
 
     if (opts.shouldRegenerate) {
       await writeFileContent(
         context,
         clientModuleFilePath,
-        rscMetadata.pageWrappers.client.module,
+        clientModuleContent,
         {
           force: false,
         }