@plasmicapp/cli 0.1.353 → 0.1.354

package/dist/index.js

@@ -474480,7 +474480,7 @@ var require_src5 = __commonJS2({
     Object.defineProperty(exports, "__esModule", { value: true });
     var fs42 = __importStar7(__require("fs"));
     var path142 = __importStar7(__require("path"));
-    var semver3 = {
+    var semver4 = {
       gte: require_gte2()
     };
     var fnmatch_1 = __importDefault7(require_fnmatch());
@@ -474509,7 +474509,7 @@ var require_src5 = __commonJS2({
       return paths;
     }
     function processMatches(matches, version) {
-      if ("indent_style" in matches && matches.indent_style === "tab" && !("indent_size" in matches) && semver3.gte(version, "0.10.0")) {
+      if ("indent_style" in matches && matches.indent_style === "tab" && !("indent_size" in matches) && semver4.gte(version, "0.10.0")) {
         matches.indent_size = "tab";
       }
       if ("indent_size" in matches && !("tab_width" in matches) && matches.indent_size !== "tab") {
@@ -485387,7 +485387,7 @@ init_import_meta_url();
 var import_lodash = __toESM(require_lodash());
 var MODULE_NAME = "plasmic-data-tokens";
 var DEFAULT_DATA_TOKENS_NAME = MODULE_NAME;
-async function syncDataTokens(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
+async function syncDataTokens(context, projectMeta, projectConfig, projectLock, checksums) {
   const resourcePath = getDataTokensResourcePath(context, projectConfig);
   if (checksums.dataTokensChecksum && projectMeta.dataTokensBundle) {
     if (context.cliArgs.quiet !== true) {
@@ -485397,8 +485397,7 @@ async function syncDataTokens(context, projectMeta, projectConfig, projectLock,
     }
     if (context.config.code.lang === "js") {
       projectMeta.dataTokensBundle.module = await formatScript(
-        tsxToJsx(projectMeta.dataTokensBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.dataTokensBundle.module)
       );
     }
     writeFileContent(
@@ -485449,7 +485448,7 @@ init_import_meta_url();
 var import_lodash2 = __toESM(require_lodash());
 var COMPONENT_NAME = "PlasmicGlobalContextsProvider";
 var DEFAULT_GLOBAL_CONTEXTS_NAME = COMPONENT_NAME;
-async function syncGlobalContexts(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
+async function syncGlobalContexts(context, projectMeta, projectConfig, projectLock, checksums) {
   const resourcePath = getGlobalContextsResourcePath(context, projectConfig);
   if (checksums.globalContextsChecksum && projectMeta.globalContextBundle) {
     if (context.cliArgs.quiet !== true) {
@@ -485459,8 +485458,7 @@ async function syncGlobalContexts(context, projectMeta, projectConfig, projectLo
     }
     if (context.config.code.lang === "js") {
       projectMeta.globalContextBundle.contextModule = await formatScript(
-        tsxToJsx(projectMeta.globalContextBundle.contextModule),
-        baseDir
+        tsxToJsx(projectMeta.globalContextBundle.contextModule)
       );
     }
     await writeFileContent(
@@ -485471,7 +485469,7 @@ async function syncGlobalContexts(context, projectMeta, projectConfig, projectLo
     );
     projectConfig.globalContextsFilePath = resourcePath;
     const fl5 = projectLock.fileLocks.find(
-      (fl6) => fl6.assetId === projectConfig.projectId && fl6.type === "globalContexts"
+      (fileLock) => fileLock.assetId === projectConfig.projectId && fileLock.type === "globalContexts"
     );
     if (fl5) {
       fl5.checksum = checksums.globalContextsChecksum;
@@ -485714,7 +485712,7 @@ init_import_meta_url();
 var import_lodash5 = __toESM(require_lodash());
 var MODULE_NAME2 = "plasmic";
 var DEFAULT_PROJECT_MODULE_NAME = MODULE_NAME2;
-async function syncProjectModule(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
+async function syncProjectModule(context, projectMeta, projectConfig, projectLock, checksums) {
   const resourcePath = getProjectModuleResourcePath(context, projectConfig);
   if (checksums.projectModuleChecksum && projectMeta.projectModuleBundle) {
     if (context.cliArgs.quiet !== true) {
@@ -485724,8 +485722,7 @@ async function syncProjectModule(context, projectMeta, projectConfig, projectLoc
     }
     if (context.config.code.lang === "js") {
       projectMeta.projectModuleBundle.module = await formatScript(
-        tsxToJsx(projectMeta.projectModuleBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.projectModuleBundle.module)
       );
     }
     await writeFileContent(
@@ -485736,7 +485733,7 @@ async function syncProjectModule(context, projectMeta, projectConfig, projectLoc
     );
     projectConfig.projectModuleFilePath = resourcePath;
     const fl5 = projectLock.fileLocks.find(
-      (fl6) => fl6.assetId === projectConfig.projectId && fl6.type === "projectModule"
+      (fileLock) => fileLock.assetId === projectConfig.projectId && fileLock.type === "projectModule"
     );
     if (fl5) {
       fl5.checksum = checksums.projectModuleChecksum || "";
@@ -485771,7 +485768,7 @@ init_import_meta_url();
 var import_lodash6 = __toESM(require_lodash());
 var COMPONENT_NAME2 = "PlasmicSplitsProvider";
 var DEFAULT_SPLITS_PROVIDER_NAME = COMPONENT_NAME2;
-async function syncSplitsProvider(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
+async function syncSplitsProvider(context, projectMeta, projectConfig, projectLock, checksums) {
   const resourcePath = getSplitsProviderResourcePath(context, projectConfig);
   if (checksums.splitsProviderChecksum && projectMeta.splitsProviderBundle) {
     if (context.cliArgs.quiet !== true) {
@@ -485781,8 +485778,7 @@ async function syncSplitsProvider(context, projectMeta, projectConfig, projectLo
     }
     if (context.config.code.lang === "js") {
       projectMeta.splitsProviderBundle.module = await formatScript(
-        tsxToJsx(projectMeta.splitsProviderBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.splitsProviderBundle.module)
       );
     }
     await writeFileContent(
@@ -485793,7 +485789,7 @@ async function syncSplitsProvider(context, projectMeta, projectConfig, projectLo
     );
     projectConfig.splitsProviderFilePath = resourcePath;
     const fl5 = projectLock.fileLocks.find(
-      (fl6) => fl6.assetId === projectConfig.projectId && fl6.type === "splitsProvider"
+      (fileLock) => fileLock.assetId === projectConfig.projectId && fileLock.type === "splitsProvider"
     );
     if (fl5) {
       fl5.checksum = checksums.splitsProviderChecksum;
@@ -485828,7 +485824,7 @@ init_import_meta_url();
 var import_lodash7 = __toESM(require_lodash());
 var MODULE_NAME3 = "PlasmicStyleTokensProvider";
 var DEFAULT_STYLE_TOKENS_PROVIDER_NAME = MODULE_NAME3;
-async function syncStyleTokensProvider(context, projectMeta, projectConfig, projectLock, checksums, baseDir) {
+async function syncStyleTokensProvider(context, projectMeta, projectConfig, projectLock, checksums) {
   const resourcePath = getStyleTokensProviderResourcePath(
     context,
     projectConfig
@@ -485841,8 +485837,7 @@ async function syncStyleTokensProvider(context, projectMeta, projectConfig, proj
     }
     if (context.config.code.lang === "js") {
       projectMeta.styleTokensProviderBundle.module = await formatScript(
-        tsxToJsx(projectMeta.styleTokensProviderBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.styleTokensProviderBundle.module)
       );
     }
     writeFileContent(
@@ -485853,7 +485848,7 @@ async function syncStyleTokensProvider(context, projectMeta, projectConfig, proj
     );
     projectConfig.styleTokensProviderFilePath = resourcePath;
     const fl5 = projectLock.fileLocks.find(
-      (fl6) => fl6.assetId === projectConfig.projectId && fl6.type === "styleTokensProvider"
+      (fileLock) => fileLock.assetId === projectConfig.projectId && fileLock.type === "styleTokensProvider"
     );
     if (fl5) {
       fl5.checksum = checksums.styleTokensProviderChecksum || "";
@@ -485890,7 +485885,7 @@ var GLOBAL_SETTINGS = {
 };
 
 // src/utils/code-utils.ts
-async function formatAsLocal(content, filePath, baseDir, defaultOpts) {
+async function formatAsLocal(content, filePath, defaultOpts) {
   if (GLOBAL_SETTINGS.skipFormatting) {
     return content;
   }
@@ -485904,12 +485899,12 @@ async function formatAsLocal(content, filePath, baseDir, defaultOpts) {
   const res2 = await format2(res, opts);
   return res2;
 }
-async function nodeToFormattedCode(n26, baseDir, unformatted, commentsToRemove) {
+async function nodeToFormattedCode(n26, unformatted, commentsToRemove) {
   const c5 = (0, import_generator.default)(n26, {
     retainLines: true,
     shouldPrintComment: (comment) => !commentsToRemove || !commentsToRemove.has(comment)
   }).code;
-  return unformatted ? c5 : await formatAsLocal(c5, "/tmp/x.tsx", baseDir, {
+  return unformatted ? c5 : await formatAsLocal(c5, "/tmp/x.tsx", {
     arrowParens: "avoid"
   });
 }
@@ -485997,7 +485992,7 @@ function filterUnformattedMarker(code, changed) {
   code = lines.filter((line3) => !isUnformattedMarker(line3)).join("\n");
   return [code, changed];
 }
-async function replaceImports(context, code, fromPath, fixImportContext, removeImportDirective, baseDir, changed = false) {
+async function replaceImports(context, code, fromPath, fixImportContext, removeImportDirective, changed = false) {
   [code, changed] = filterUnformattedMarker(code, changed);
   const file = parser.parse(code, {
     strictMode: true,
@@ -486241,7 +486236,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
   if (!changed) {
     return code;
   }
-  return nodeToFormattedCode(file, baseDir, !changed, commentsToRemove);
+  return nodeToFormattedCode(file, !changed, commentsToRemove);
 }
 function throwMissingReference(context, itemType, uuid, fromPath) {
   let recFix = `Please make sure projects that "${uuid}" depends on have already been synced.`;
@@ -486322,7 +486317,7 @@ var mkFixImportContext = (config) => {
     projects
   };
 };
-async function fixAllImportStatements(context, baseDir, summary) {
+async function fixAllImportStatements(context, summary) {
   logger.info("Fixing import statements...");
   const config = context.config;
   const fixImportContext = mkFixImportContext(config);
@@ -486330,12 +486325,7 @@ async function fixAllImportStatements(context, baseDir, summary) {
   for (const project of config.projects) {
     for (const compConfig of project.components) {
       try {
-        await fixRscModulesImports(
-          context,
-          baseDir,
-          fixImportContext,
-          compConfig
-        );
+        await fixRscModulesImports(context, fixImportContext, compConfig);
       } catch (err) {
         lastError = err;
       }
@@ -486350,8 +486340,7 @@ async function fixAllImportStatements(context, baseDir, summary) {
             context,
             compConfig,
             fixImportContext,
-            fixSkeletonModule,
-            baseDir
+            fixSkeletonModule
           );
         } catch (err) {
           logger.error(
@@ -486363,7 +486352,7 @@ async function fixAllImportStatements(context, baseDir, summary) {
     }
   }
   try {
-    await fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+    await fixGlobalContextImportStatements(context, fixImportContext);
   } catch (err) {
     logger.error(
       `Error encountered while fixing imports for global contexts: ${err}`
@@ -486374,7 +486363,6 @@ async function fixAllImportStatements(context, baseDir, summary) {
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "splitsProviderFilePath",
       getSplitsProviderResourcePath
     );
@@ -486388,7 +486376,6 @@ async function fixAllImportStatements(context, baseDir, summary) {
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "projectModuleFilePath",
       getProjectModuleResourcePath
     );
@@ -486402,7 +486389,6 @@ async function fixAllImportStatements(context, baseDir, summary) {
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "styleTokensProviderFilePath",
       getStyleTokensProviderResourcePath
     );
@@ -486416,7 +486402,6 @@ async function fixAllImportStatements(context, baseDir, summary) {
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "dataTokensFilePath",
       getDataTokensResourcePath
     );
@@ -486430,14 +486415,13 @@ async function fixAllImportStatements(context, baseDir, summary) {
     throw lastError;
   }
 }
-async function fixComponentImportStatements(context, compConfig, fixImportContext, fixSkeletonModule, baseDir) {
+async function fixComponentImportStatements(context, compConfig, fixImportContext, fixSkeletonModule) {
   if (compConfig.type !== "mapped" && isLocalModulePath(compConfig.importSpec.modulePath) && fixSkeletonModule) {
     await fixFileImportStatements(
       context,
       compConfig.importSpec.modulePath,
       fixImportContext,
-      true,
-      baseDir
+      true
     );
   }
   let renderModuleChanged = false;
@@ -486460,11 +486444,10 @@ async function fixComponentImportStatements(context, compConfig, fixImportContex
     compConfig.renderModuleFilePath,
     fixImportContext,
     false,
-    baseDir,
     renderModuleChanged
   );
 }
-async function fixFileImportStatements(context, srcDirFilePath, fixImportContext, removeImportDirective, baseDir, fileHasChanged = false) {
+async function fixFileImportStatements(context, srcDirFilePath, fixImportContext, removeImportDirective, fileHasChanged = false) {
   const filePath = makeFilePath(context, srcDirFilePath);
   if (!existsBuffered(filePath)) {
     logger.warn(
@@ -486479,7 +486462,6 @@ async function fixFileImportStatements(context, srcDirFilePath, fixImportContext
     srcDirFilePath,
     fixImportContext,
     removeImportDirective,
-    baseDir,
     fileHasChanged
   );
   if (prevContent !== newContent) {
@@ -486528,15 +486510,15 @@ var tsxToJsx = (code) => {
   });
   return fixPostTranspile(result.outputText);
 };
-async function maybeConvertTsxToJsx(fileName, content, baseDir) {
+async function maybeConvertTsxToJsx(fileName, content) {
   if (fileName.endsWith("tsx")) {
     const jsFileName = stripExtension(fileName) + ".jsx";
-    const jsContent = await formatScript(tsxToJsx(content), baseDir);
+    const jsContent = await formatScript(tsxToJsx(content));
     return [jsFileName, jsContent];
   }
   return [fileName, content];
 }
-async function formatScript(code, baseDir) {
+async function formatScript(code) {
   const file = parser.parse(code, {
     strictMode: true,
     sourceType: "module",
@@ -486554,18 +486536,18 @@ async function formatScript(code, baseDir) {
       }
     }
   });
-  const withmarkers = await nodeToFormattedCode(file, baseDir, true);
+  const withmarkers = await nodeToFormattedCode(file, true);
   const withNewLines = withmarkers.replace(
     new RegExp(`"${newLineMarker}"`, "g"),
     "\n"
   );
-  return await formatAsLocal(withNewLines, "/tmp/x.tsx", baseDir, {
+  return await formatAsLocal(withNewLines, "/tmp/x.tsx", {
     printWidth: 80,
     tabWidth: 2,
     useTabs: false
   });
 }
-async function fixGlobalContextImportStatements(context, fixImportContext, baseDir) {
+async function fixGlobalContextImportStatements(context, fixImportContext) {
   for (const project of context.config.projects) {
     if (!project.globalContextsFilePath) {
       continue;
@@ -486588,7 +486570,6 @@ async function fixGlobalContextImportStatements(context, fixImportContext, baseD
       resourcePath,
       fixImportContext,
       false,
-      baseDir,
       true
     );
     if (prevContent !== newContent) {
@@ -486598,7 +486579,7 @@ async function fixGlobalContextImportStatements(context, fixImportContext, baseD
     }
   }
 }
-async function fixImportStatements(context, fixImportContext, baseDir, configKey, getResourcePath) {
+async function fixImportStatements(context, fixImportContext, configKey, getResourcePath) {
   for (const project of context.config.projects) {
     if (!project[configKey]) {
       continue;
@@ -486621,7 +486602,6 @@ async function fixImportStatements(context, fixImportContext, baseDir, configKey
       resourcePath,
       fixImportContext,
       false,
-      baseDir,
       true
     );
     if (prevContent !== newContent) {
@@ -486631,7 +486611,7 @@ async function fixImportStatements(context, fixImportContext, baseDir, configKey
     }
   }
 }
-async function fixRscModulesImports(context, baseDir, fixImportContext, compConfig) {
+async function fixRscModulesImports(context, fixImportContext, compConfig) {
   var _a8, _b2;
   const errors = [];
   for (const modulePath of [
@@ -486646,8 +486626,7 @@ async function fixRscModulesImports(context, baseDir, fixImportContext, compConf
         context,
         modulePath,
         fixImportContext,
-        false,
-        baseDir
+        false
       );
     } catch (err) {
       logger.error(
@@ -487343,7 +487322,7 @@ function readConfig(configFile, autoFillDefaults) {
     throw e7;
   }
 }
-async function writeConfig(configFile, config, baseDir) {
+async function writeConfig(configFile, config) {
   await writeFileContentRaw(
     configFile,
     await formatAsLocal(
@@ -487355,31 +487334,26 @@ async function writeConfig(configFile, config, baseDir) {
         void 0,
         2
       ),
-      configFile,
-      baseDir
+      configFile
     ),
     {
       force: true
     }
   );
 }
-async function writeLock(lockFile, lock, baseDir) {
+async function writeLock(lockFile, lock) {
   await writeFileContentRaw(
     lockFile,
-    await formatAsLocal(
-      JSON.stringify(lock, void 0, 2),
-      "/tmp/x.json",
-      baseDir
-    ),
+    await formatAsLocal(JSON.stringify(lock, void 0, 2), "/tmp/x.json"),
     {
       force: true
     }
   );
 }
-async function updateConfig(context, newConfig, baseDir) {
-  await writeConfig(context.configFile, newConfig, baseDir);
+async function updateConfig(context, newConfig) {
+  await writeConfig(context.configFile, newConfig);
   context.config = newConfig;
-  await writeLock(context.lockFile, context.lock, baseDir);
+  await writeLock(context.lockFile, context.lock);
 }
 function getOrAddProjectConfig(context, projectId, base) {
   let project = context.config.projects.find((p5) => p5.projectId === projectId);
@@ -487902,11 +487876,18 @@ var import_upath5 = __toESM(require_upath());
 // src/utils/envdetect.ts
 init_import_meta_url();
 var import_findup_sync2 = __toESM(require_findup_sync());
+var import_semver2 = __toESM(require_semver2());
 function detectTypescript() {
   return (0, import_findup_sync2.default)("tsconfig.json");
 }
 function detectNextJs() {
-  if ((0, import_findup_sync2.default)("next.config.js") || (0, import_findup_sync2.default)(".next") || (0, import_findup_sync2.default)("next-env.d.ts")) {
+  if ((0, import_findup_sync2.default)([
+    "next.config.js",
+    "next.config.ts",
+    "next.config.mjs",
+    ".next/",
+    "next-env.d.ts"
+  ])) {
     return true;
   }
   try {
@@ -487917,12 +487898,36 @@ function detectNextJs() {
   }
 }
 function detectNextJsAppDir() {
-  var _a8, _b2;
+  var _a8, _b2, _c3;
+  if (!detectNextJs()) {
+    return false;
+  }
   const nextConfigPath = (0, import_findup_sync2.default)("next.config.js");
-  if (!nextConfigPath) {
+  if (nextConfigPath && ((_b2 = (_a8 = require(nextConfigPath)) == null ? void 0 : _a8.experimental) == null ? void 0 : _b2.appDir)) {
+    return true;
+  }
+  if (!(0, import_findup_sync2.default)("app")) {
     return false;
   }
-  return ((_b2 = (_a8 = require(nextConfigPath)) == null ? void 0 : _a8.experimental) == null ? void 0 : _b2.appDir) || false;
+  if (!(0, import_findup_sync2.default)("pages")) {
+    return true;
+  }
+  try {
+    const packageJson = getParsedPackageJson();
+    const nextVersion = (_c3 = packageJson.dependencies) == null ? void 0 : _c3.next;
+    if (nextVersion) {
+      if (nextVersion === "latest") {
+        return true;
+      }
+      const coercedVersion = import_semver2.default.coerce(nextVersion);
+      if (coercedVersion && import_semver2.default.gte(coercedVersion, "13.4.0")) {
+        return true;
+      }
+    }
+  } catch {
+    return false;
+  }
+  return false;
 }
 function detectGatsby() {
   return (0, import_findup_sync2.default)("gatsby-config.js") || (0, import_findup_sync2.default)("gatsby-config.ts");
@@ -487946,8 +487951,9 @@ function detectTanStackApp() {
 
 // src/actions/init.ts
 async function initPlasmic(opts) {
-  if (!opts.baseDir)
+  if (!opts.baseDir) {
     opts.baseDir = process.cwd();
+  }
   await getOrStartAuth(opts);
   const configFile = opts.config || findConfigFile(opts.baseDir, { traverseParents: false });
   if (configFile && existsBuffered(configFile)) {
@@ -487959,7 +487965,7 @@ async function initPlasmic(opts) {
   const newConfigFile = opts.config || import_upath5.default.join(opts.baseDir, CONFIG_FILE_NAME);
   const answers = await deriveInitAnswers(opts);
   const initConfig = createInitConfig(answers);
-  await writeConfig(newConfigFile, initConfig, opts.baseDir);
+  await writeConfig(newConfigFile, initConfig);
   if (!process.env.QUIET) {
     logger.info("Successfully created plasmic.json.\n");
   }
@@ -488023,7 +488029,7 @@ function simulatePrompt(question, defaultAnswer, bold = false) {
 }
 async function deriveInitAnswers(opts) {
   const plasmicRootDir = opts.config ? import_upath5.default.dirname(opts.config) : opts.baseDir;
-  const platform = !!opts.platform ? opts.platform : detectNextJs() ? "nextjs" : detectGatsby() ? "gatsby" : detectTanStackApp() ? "tanstack" : detectCreateReactApp() ? "react" : "";
+  const platform = opts.platform ? opts.platform : detectNextJs() ? "nextjs" : detectGatsby() ? "gatsby" : detectTanStackApp() ? "tanstack" : detectCreateReactApp() ? "react" : "";
   const isCra = platform === "react";
   const isNext = platform === "nextjs";
   const isNextAppDir = isNext && detectNextJsAppDir();
@@ -488091,7 +488097,6 @@ async function deriveInitAnswers(opts) {
     pagesDir: getDefaultAnswer("pagesDir", void 0),
     reactRuntime: getDefaultAnswer("reactRuntime", "classic")
   };
-  const prominentAnswers = import_lodash11.default.omit(answers, "codeScheme");
   if (process.env.QUIET) {
     return answers;
   }
@@ -488423,7 +488428,7 @@ function getYargsOption(key2, defaultOverride) {
 init_import_meta_url();
 var import_chalk3 = __toESM(require_source());
 var import_lodash13 = __toESM(require_lodash());
-var import_semver2 = __toESM(require_semver2());
+var import_semver3 = __toESM(require_semver2());
 var import_upath7 = __toESM(require_upath());
 
 // src/migrations/0.1.110-fileLocks.ts
@@ -488574,7 +488579,7 @@ async function runNecessaryMigrations(configFile, lockFile, baseDir, yes) {
   };
   const cur = readConfig(configFile, false);
   const curVersion = cur.cliVersion;
-  if (!!curVersion && import_semver2.default.lt(cliVersion, curVersion)) {
+  if (!!curVersion && import_semver3.default.lt(cliVersion, curVersion)) {
     const confirm = await confirmWithUser(
       `Project requires @plasmicapp/cli>=${curVersion} (You currently have ${cliVersion}). Would you like to upgrade it?`,
       yes
@@ -488594,9 +488599,9 @@ async function runNecessaryMigrations(configFile, lockFile, baseDir, yes) {
   const context = {
     absoluteSrcDir: import_upath7.default.isAbsolute(cur.srcDir) ? cur.srcDir : import_upath7.default.resolve(import_upath7.default.dirname(configFile), cur.srcDir)
   };
-  const greaterVersions = import_semver2.default.sort(
+  const greaterVersions = import_semver3.default.sort(
     [...import_lodash13.default.keys(MIGRATIONS), ...import_lodash13.default.keys(LOCK_MIGRATIONS)].filter(
-      (v7) => !curVersion || import_semver2.default.gt(v7, curVersion)
+      (v7) => !curVersion || import_semver3.default.gt(v7, curVersion)
     )
   );
   for (const version of greaterVersions) {
@@ -488606,21 +488611,21 @@ async function runNecessaryMigrations(configFile, lockFile, baseDir, yes) {
       const prev2 = readConfig(configFile, false);
       const next = migrationFunc(prev2, context);
       next.cliVersion = version;
-      await writeConfig(configFile, next, baseDir);
+      await writeConfig(configFile, next);
     }
     const lockMigrationFunc = LOCK_MIGRATIONS[version];
     if (lockMigrationFunc !== void 0) {
       const prev2 = maybeReadLock();
       if (prev2) {
         const next = lockMigrationFunc(prev2, context);
-        await writeLock(lockFile, next, baseDir);
+        await writeLock(lockFile, next);
       }
     }
   }
   const latestConfig = readConfig(configFile, false);
   if (latestConfig.cliVersion !== cliVersion) {
     latestConfig.cliVersion = cliVersion;
-    await writeConfig(configFile, latestConfig, baseDir);
+    await writeConfig(configFile, latestConfig);
   }
 }
 
@@ -489022,7 +489027,7 @@ async function exportProjectsCli(opts) {
     const outPath = import_path12.default.resolve(opts.outDir);
     const writeFile = async (fileName, content) => {
       if (typeof content === "string" && !opts.skipFormatting) {
-        content = await formatAsLocal(content, fileName, opts.outDir);
+        content = await formatAsLocal(content, fileName);
       }
       const projectName = (0, import_lodash15.snakeCase)(bundle.projectConfig.projectName);
       await import_fs5.promises.mkdir(import_path12.default.join(outPath, projectName), { recursive: true });
@@ -489076,109 +489081,106 @@ async function exportProjectsCli(opts) {
     }
   };
   await Promise.all(result.map((res) => writeProj(res)));
-  await fixAllImportStatements(
-    {
-      configFile: "",
-      lockFile: "",
-      rootDir: import_path12.default.resolve(opts.outDir),
-      absoluteSrcDir: import_path12.default.resolve(opts.outDir),
-      config: {
-        platform: opts.platform || "react",
-        srcDir: "./",
-        defaultPlasmicDir: "./",
-        preserveJsImportExtensions: false,
-        code: {
-          lang: opts.codeLang || "ts",
-          scheme: "blackbox",
-          reactRuntime: "classic"
-        },
-        images: {
-          scheme: opts.imagesScheme || "files"
-        },
-        style: {
-          scheme: opts.styleScheme || "css-modules",
-          defaultStyleCssFilePath: ""
-        },
-        tokens: {},
-        globalVariants: {
-          variantGroups: result.flatMap((bundle) => {
-            const projectName = (0, import_lodash15.snakeCase)(bundle.projectConfig.projectName);
-            return bundle.globalVariants.map((gv) => ({
-              id: gv.id,
-              name: gv.name,
-              projectId: bundle.projectConfig.projectId,
-              contextFilePath: `./${projectName}/${gv.contextFileName}`
-            }));
-          })
-        },
-        projects: result.map((bundle) => {
-          var _a9;
+  await fixAllImportStatements({
+    configFile: "",
+    lockFile: "",
+    rootDir: import_path12.default.resolve(opts.outDir),
+    absoluteSrcDir: import_path12.default.resolve(opts.outDir),
+    config: {
+      platform: opts.platform || "react",
+      srcDir: "./",
+      defaultPlasmicDir: "./",
+      preserveJsImportExtensions: false,
+      code: {
+        lang: opts.codeLang || "ts",
+        scheme: "blackbox",
+        reactRuntime: "classic"
+      },
+      images: {
+        scheme: opts.imagesScheme || "files"
+      },
+      style: {
+        scheme: opts.styleScheme || "css-modules",
+        defaultStyleCssFilePath: ""
+      },
+      tokens: {},
+      globalVariants: {
+        variantGroups: result.flatMap((bundle) => {
           const projectName = (0, import_lodash15.snakeCase)(bundle.projectConfig.projectName);
-          return {
+          return bundle.globalVariants.map((gv) => ({
+            id: gv.id,
+            name: gv.name,
             projectId: bundle.projectConfig.projectId,
-            projectName: bundle.projectConfig.projectName,
-            version: "latest",
-            cssFilePath: `${projectName}/${bundle.projectConfig.cssFileName}`,
-            globalContextsFilePath: bundle.projectConfig.globalContextBundle ? `${projectName}/${DEFAULT_GLOBAL_CONTEXTS_NAME}.${extx}` : "",
-            splitsProviderFilePath: bundle.projectConfig.splitsProviderBundle ? `${projectName}/${DEFAULT_SPLITS_PROVIDER_NAME}.${extx}` : "",
-            styleTokensProviderFilePath: bundle.projectConfig.styleTokensProviderBundle ? `${projectName}/${DEFAULT_STYLE_TOKENS_PROVIDER_NAME}.${extx}` : "",
-            dataTokensFilePath: bundle.projectConfig.dataTokensBundle ? `${projectName}/${DEFAULT_DATA_TOKENS_NAME}.${opts.codeLang}` : "",
-            projectModuleFilePath: bundle.projectConfig.projectModuleBundle ? `${projectName}/${DEFAULT_PROJECT_MODULE_NAME}.${extx}` : "",
-            components: bundle.components.map((comp) => ({
-              id: comp.id,
-              name: comp.componentName,
-              projectId: bundle.projectConfig.projectId,
-              type: "managed",
-              importSpec: {
-                modulePath: `${projectName}/${comp.skeletonModuleFileName}`
-              },
-              renderModuleFilePath: `${projectName}/${comp.skeletonModuleFileName}`,
-              cssFilePath: `${projectName}/${comp.cssFileName}`,
-              scheme: "blackbox",
-              componentType: `${comp.isPage ? "page" : "component"}`,
-              plumeType: comp.plumeType
-            })),
-            codeComponents: bundle.codeComponentMetas.map((comp) => ({
-              id: comp.id,
-              name: comp.name,
-              displayName: comp.displayName,
-              componentImportPath: comp.importPath,
-              helper: comp.helper
-            })),
-            customFunctionMetas: ((_a9 = bundle.customFunctionMetas) != null ? _a9 : []).map(
-              (meta) => {
-                var _a10;
-                return {
-                  id: meta.id,
-                  name: meta.name,
-                  importPath: meta.importPath,
-                  defaultExport: meta.defaultExport,
-                  namespace: (_a10 = meta.namespace) != null ? _a10 : null
-                };
-              }
-            ),
-            icons: bundle.iconAssets.map((icon) => ({
-              id: icon.id,
-              name: icon.name,
-              moduleFilePath: `${projectName}/${icon.fileName}`
-            })),
-            images: bundle.imageAssets.map((image) => ({
-              id: image.id,
-              name: image.name,
-              filePath: `${projectName}/${image.fileName}`
-            })),
-            indirect: false
-          };
-        }),
-        wrapPagesWithGlobalContexts: true
+            contextFilePath: `./${projectName}/${gv.contextFileName}`
+          }));
+        })
       },
-      lock: {},
-      auth: {},
-      api,
-      cliArgs: {}
+      projects: result.map((bundle) => {
+        var _a9;
+        const projectName = (0, import_lodash15.snakeCase)(bundle.projectConfig.projectName);
+        return {
+          projectId: bundle.projectConfig.projectId,
+          projectName: bundle.projectConfig.projectName,
+          version: "latest",
+          cssFilePath: `${projectName}/${bundle.projectConfig.cssFileName}`,
+          globalContextsFilePath: bundle.projectConfig.globalContextBundle ? `${projectName}/${DEFAULT_GLOBAL_CONTEXTS_NAME}.${extx}` : "",
+          splitsProviderFilePath: bundle.projectConfig.splitsProviderBundle ? `${projectName}/${DEFAULT_SPLITS_PROVIDER_NAME}.${extx}` : "",
+          styleTokensProviderFilePath: bundle.projectConfig.styleTokensProviderBundle ? `${projectName}/${DEFAULT_STYLE_TOKENS_PROVIDER_NAME}.${extx}` : "",
+          dataTokensFilePath: bundle.projectConfig.dataTokensBundle ? `${projectName}/${DEFAULT_DATA_TOKENS_NAME}.${opts.codeLang}` : "",
+          projectModuleFilePath: bundle.projectConfig.projectModuleBundle ? `${projectName}/${DEFAULT_PROJECT_MODULE_NAME}.${extx}` : "",
+          components: bundle.components.map((comp) => ({
+            id: comp.id,
+            name: comp.componentName,
+            projectId: bundle.projectConfig.projectId,
+            type: "managed",
+            importSpec: {
+              modulePath: `${projectName}/${comp.skeletonModuleFileName}`
+            },
+            renderModuleFilePath: `${projectName}/${comp.skeletonModuleFileName}`,
+            cssFilePath: `${projectName}/${comp.cssFileName}`,
+            scheme: "blackbox",
+            componentType: `${comp.isPage ? "page" : "component"}`,
+            plumeType: comp.plumeType
+          })),
+          codeComponents: bundle.codeComponentMetas.map((comp) => ({
+            id: comp.id,
+            name: comp.name,
+            displayName: comp.displayName,
+            componentImportPath: comp.importPath,
+            helper: comp.helper
+          })),
+          customFunctionMetas: ((_a9 = bundle.customFunctionMetas) != null ? _a9 : []).map(
+            (meta) => {
+              var _a10;
+              return {
+                id: meta.id,
+                name: meta.name,
+                importPath: meta.importPath,
+                defaultExport: meta.defaultExport,
+                namespace: (_a10 = meta.namespace) != null ? _a10 : null
+              };
+            }
+          ),
+          icons: bundle.iconAssets.map((icon) => ({
+            id: icon.id,
+            name: icon.name,
+            moduleFilePath: `${projectName}/${icon.fileName}`
+          })),
+          images: bundle.imageAssets.map((image) => ({
+            id: image.id,
+            name: image.name,
+            filePath: `${projectName}/${image.fileName}`
+          })),
+          indirect: false
+        };
+      }),
+      wrapPagesWithGlobalContexts: true
     },
-    opts.outDir
-  );
+    lock: {},
+    auth: {},
+    api,
+    cliArgs: {}
+  });
 }
 async function exportProjects(api, opts) {
   var _a8;
@@ -489233,53 +489235,46 @@ async function exportProjects(api, opts) {
       for (const comp of proj.components) {
         [comp.skeletonModuleFileName, comp.skeletonModule] = await maybeConvertTsxToJsx(
           comp.skeletonModuleFileName,
-          comp.skeletonModule,
-          "."
+          comp.skeletonModule
         );
       }
       for (const icon of proj.iconAssets) {
         [icon.fileName, icon.module] = await maybeConvertTsxToJsx(
           icon.fileName,
-          icon.module,
-          "."
+          icon.module
         );
       }
       for (const gv of proj.globalVariants) {
         [gv.contextFileName, gv.contextModule] = await maybeConvertTsxToJsx(
           gv.contextFileName,
-          gv.contextModule,
-          "."
+          gv.contextModule
         );
       }
       if (proj.projectConfig.globalContextBundle) {
         const res = await maybeConvertTsxToJsx(
           `${DEFAULT_GLOBAL_CONTEXTS_NAME}.tsx`,
-          proj.projectConfig.globalContextBundle.contextModule,
-          "."
+          proj.projectConfig.globalContextBundle.contextModule
         );
         proj.projectConfig.globalContextBundle.contextModule = res[1];
       }
       if (proj.projectConfig.splitsProviderBundle) {
         const res = await maybeConvertTsxToJsx(
           `${DEFAULT_SPLITS_PROVIDER_NAME}.tsx`,
-          proj.projectConfig.splitsProviderBundle.module,
-          "."
+          proj.projectConfig.splitsProviderBundle.module
         );
         proj.projectConfig.splitsProviderBundle.module = res[1];
       }
       if (proj.projectConfig.styleTokensProviderBundle) {
         const res = await maybeConvertTsxToJsx(
           `${DEFAULT_STYLE_TOKENS_PROVIDER_NAME}.tsx`,
-          proj.projectConfig.styleTokensProviderBundle.module,
-          "."
+          proj.projectConfig.styleTokensProviderBundle.module
         );
         proj.projectConfig.styleTokensProviderBundle.module = res[1];
       }
       if (proj.projectConfig.projectModuleBundle) {
         const res = await maybeConvertTsxToJsx(
           `${DEFAULT_PROJECT_MODULE_NAME}.tsx`,
-          proj.projectConfig.projectModuleBundle.module,
-          "."
+          proj.projectConfig.projectModuleBundle.module
         );
         proj.projectConfig.projectModuleBundle.module = res[1];
       }
@@ -489291,14 +489286,15 @@ async function exportProjects(api, opts) {
 // src/actions/fix-imports.ts
 init_import_meta_url();
 async function fixImports(opts) {
-  if (!opts.baseDir)
+  if (!opts.baseDir) {
     opts.baseDir = process.cwd();
+  }
   if (opts.skipFormatting) {
     GLOBAL_SETTINGS.skipFormatting = true;
   }
   const context = await getContext(opts, { enableSkipAuth: true });
-  await updateConfig(context, context.config, opts.baseDir);
-  await fixAllImportStatements(context, opts.baseDir);
+  await updateConfig(context, context.config);
+  await fixAllImportStatements(context);
 }
 
 // src/actions/info.ts
@@ -489823,30 +489819,43 @@ async function syncRscFiles(context, project, bundle, compConfig, opts) {
         clientModulePath: ""
       };
     }
-    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
-      }
-    );
-    const clientModuleFilePath = compConfig.importSpec.modulePath.replace(
-      /\.tsx$/,
+    await writeFileContent(context, serverModuleFilePath, serverModuleContent, {
+      force: true
+    });
+    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
         }
@@ -489856,7 +489865,7 @@ async function syncRscFiles(context, project, bundle, compConfig, opts) {
 }
 
 // src/actions/sync-components.ts
-async function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, summary, projectLock, checksums, baseDir) {
+async function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, summary, projectLock, checksums) {
   var _a8;
   const componentsFromChecksums = /* @__PURE__ */ new Set([
     ...checksums.cssRulesChecksums.map(([id2, _7]) => id2),
@@ -489920,7 +489929,6 @@ async function syncProjectComponents(context, project, version, componentBundles
       componentName,
       id: id2,
       scheme,
-      nameInIdToUuid,
       isPage,
       path: pagePath,
       plumeType
@@ -489966,7 +489974,6 @@ async function syncProjectComponents(context, project, version, componentBundles
       await writeFileContent(context, skeletonPath, skeletonModule, {
         force: false
       });
-    } else if (compConfig.type === "mapped") {
     } else if (compConfig.type === "managed") {
       compConfig.componentType = isPage ? "page" : "component";
       let editedFile;
@@ -490087,8 +490094,7 @@ async function syncProjectComponents(context, project, version, componentBundles
       );
       const formattedCssRules = await formatAsLocal(
         cssRules,
-        compConfig.cssFilePath,
-        baseDir
+        compConfig.cssFilePath
       );
       await writeFileContent(
         context,
@@ -490110,7 +490116,7 @@ async function syncProjectComponents(context, project, version, componentBundles
 init_import_meta_url();
 var import_lodash20 = __toESM(require_lodash());
 var import_upath10 = __toESM(require_upath());
-async function syncGlobalVariants(context, projectMeta, bundles, checksums, branchName, baseDir) {
+async function syncGlobalVariants(context, projectMeta, bundles, checksums, branchName) {
   const projectId = projectMeta.projectId;
   const projectLock = getOrAddProjectLock(context, projectId, branchName);
   const existingVariantConfigs = import_lodash20.default.keyBy(
@@ -490183,11 +490189,7 @@ async function syncGlobalVariants(context, projectMeta, bundles, checksums, bran
     await writeFileContent(
       context,
       variantConfig.contextFilePath,
-      await formatAsLocal(
-        bundle.contextModule,
-        variantConfig.contextFilePath,
-        baseDir
-      ),
+      await formatAsLocal(bundle.contextModule, variantConfig.contextFilePath),
       { force: !isNew }
     );
   }
@@ -490215,7 +490217,7 @@ async function syncGlobalVariants(context, projectMeta, bundles, checksums, bran
 init_import_meta_url();
 var import_lodash21 = __toESM(require_lodash());
 var import_upath11 = __toESM(require_upath());
-async function syncProjectIconAssets(context, projectId, branchName, version, iconBundles, checksums, baseDir) {
+async function syncProjectIconAssets(context, projectId, branchName, version, iconBundles, checksums) {
   const project = getOrAddProjectConfig(context, projectId);
   if (!project.icons) {
     project.icons = [];
@@ -490284,7 +490286,7 @@ async function syncProjectIconAssets(context, projectId, branchName, version, ic
     await writeFileContent(
       context,
       iconConfig.moduleFilePath,
-      await formatAsLocal(bundle.module, iconConfig.moduleFilePath, baseDir),
+      await formatAsLocal(bundle.module, iconConfig.moduleFilePath),
       {
         force: !isNew
       }
@@ -490574,7 +490576,7 @@ async function sync(opts, metadataDefaults) {
         }
       });
     }
-    await fixAllImportStatements(context, opts.baseDir, summary);
+    await fixAllImportStatements(context, summary);
     const codegenVersion = await context.api.latestCodegenVersion();
     context.lock.projects.forEach((p5) => {
       if (projectsToSync.some(
@@ -490583,7 +490585,7 @@ async function sync(opts, metadataDefaults) {
         p5.codegenVersion = codegenVersion;
       }
     });
-    await updateConfig(context, context.config, baseDir);
+    await updateConfig(context, context.config);
   };
   if (opts.skipBuffering) {
     await doSync();
@@ -490733,27 +490735,23 @@ async function syncProject(context, opts, projectIdsAndTokens, projectId, branch
     for (const c5 of projectBundle.components) {
       [c5.renderModuleFileName, c5.renderModule] = await maybeConvertTsxToJsx(
         c5.renderModuleFileName,
-        c5.renderModule,
-        opts.baseDir
+        c5.renderModule
       );
       [c5.skeletonModuleFileName, c5.skeletonModule] = await maybeConvertTsxToJsx(
         c5.skeletonModuleFileName,
-        c5.skeletonModule,
-        opts.baseDir
+        c5.skeletonModule
       );
     }
     for (const icon of projectBundle.iconAssets) {
       [icon.fileName, icon.module] = await maybeConvertTsxToJsx(
         icon.fileName,
-        icon.module,
-        opts.baseDir
+        icon.module
       );
     }
     for (const gv of projectBundle.globalVariants) {
       [gv.contextFileName, gv.contextModule] = await maybeConvertTsxToJsx(
         gv.contextFileName,
-        gv.contextModule,
-        opts.baseDir
+        gv.contextModule
       );
     }
   }
@@ -490762,8 +490760,7 @@ async function syncProject(context, opts, projectIdsAndTokens, projectId, branch
     projectBundle.projectConfig,
     projectBundle.globalVariants,
     projectBundle.checksums,
-    branchName,
-    opts.baseDir
+    branchName
   );
   await syncProjectConfig(
     context,
@@ -490776,7 +490773,6 @@ async function syncProject(context, opts, projectIdsAndTokens, projectId, branch
     opts.forceOverwrite,
     summary,
     projectBundle.checksums,
-    opts.baseDir,
     indirect
   );
   syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
@@ -490796,8 +490792,7 @@ async function syncProject(context, opts, projectIdsAndTokens, projectId, branch
     branchName,
     projectVersion,
     projectBundle.iconAssets,
-    projectBundle.checksums,
-    opts.baseDir
+    projectBundle.checksums
   );
   await syncProjectImageAssets(
     context,
@@ -490824,7 +490819,7 @@ async function syncStyleConfig(context, response) {
     force: true
   });
 }
-async function syncProjectConfig(context, projectBundle, projectApiToken, branchName, version, dependencies, componentBundles, forceOverwrite, summary, checksums, baseDir, indirect) {
+async function syncProjectConfig(context, projectBundle, projectApiToken, branchName, version, dependencies, componentBundles, forceOverwrite, summary, checksums, indirect) {
   const defaultCssFilePath = defaultResourcePath(
     context,
     projectBundle.projectName,
@@ -490860,8 +490855,7 @@ async function syncProjectConfig(context, projectBundle, projectApiToken, branch
   if (projectBundle.cssRules) {
     const formattedCssRules = await formatAsLocal(
       projectBundle.cssRules,
-      projectConfig.cssFilePath,
-      baseDir
+      projectConfig.cssFilePath
     );
     await writeFileContent(
       context,
@@ -490885,40 +490879,35 @@ async function syncProjectConfig(context, projectBundle, projectApiToken, branch
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
   await syncSplitsProvider(
     context,
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
   await syncProjectModule(
     context,
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
   await syncStyleTokensProvider(
     context,
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
   await syncDataTokens(
     context,
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
   await syncProjectComponents(
     context,
@@ -490928,8 +490917,7 @@ async function syncProjectConfig(context, projectBundle, projectApiToken, branch
     forceOverwrite,
     summary,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 }
 function syncCodeComponentsMeta(context, projectId, codeComponentBundles) {