@plasmicapp/cli 0.1.353 → 0.1.355

package/src/actions/sync-global-contexts.ts

@@ -22,8 +22,7 @@ export async function syncGlobalContexts(
   projectMeta: ProjectMetaBundle,
   projectConfig: ProjectConfig,
   projectLock: ProjectLock,
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const resourcePath = getGlobalContextsResourcePath(context, projectConfig);
   if (checksums.globalContextsChecksum && projectMeta.globalContextBundle) {
@@ -34,8 +33,7 @@ export async function syncGlobalContexts(
     }
     if (context.config.code.lang === "js") {
       projectMeta.globalContextBundle.contextModule = await formatScript(
-        tsxToJsx(projectMeta.globalContextBundle.contextModule),
-        baseDir
+        tsxToJsx(projectMeta.globalContextBundle.contextModule)
       );
     }
     await writeFileContent(
@@ -46,8 +44,9 @@ export async function syncGlobalContexts(
     );
     projectConfig.globalContextsFilePath = resourcePath;
     const fl = projectLock.fileLocks.find(
-      (fl) =>
-        fl.assetId === projectConfig.projectId && fl.type === "globalContexts"
+      (fileLock) =>
+        fileLock.assetId === projectConfig.projectId &&
+        fileLock.type === "globalContexts"
     );
     if (fl) {
       fl.checksum = checksums.globalContextsChecksum;

package/src/actions/sync-global-variants.ts

@@ -3,7 +3,7 @@ import path from "upath";
 import { ChecksumBundle, GlobalVariantBundle, ProjectMetaBundle } from "../api";
 import { logger } from "../deps";
 import { formatAsLocal } from "../utils/code-utils";
-import { getOrAddProjectLock, PlasmicContext } from "../utils/config-utils";
+import { PlasmicContext, getOrAddProjectLock } from "../utils/config-utils";
 import {
   defaultResourcePath,
   deleteFile,
@@ -18,8 +18,7 @@ export async function syncGlobalVariants(
   projectMeta: ProjectMetaBundle,
   bundles: GlobalVariantBundle[],
   checksums: ChecksumBundle,
-  branchName: string,
-  baseDir: string
+  branchName: string
 ) {
   const projectId = projectMeta.projectId;
   const projectLock = getOrAddProjectLock(context, projectId, branchName);
@@ -101,11 +100,7 @@ export async function syncGlobalVariants(
     await writeFileContent(
       context,
       variantConfig.contextFilePath,
-      await formatAsLocal(
-        bundle.contextModule,
-        variantConfig.contextFilePath,
-        baseDir
-      ),
+      await formatAsLocal(bundle.contextModule, variantConfig.contextFilePath),
       { force: !isNew }
     );
   }

package/src/actions/sync-icons.ts

@@ -5,9 +5,9 @@ import { ChecksumBundle, IconBundle } from "../api";
 import { logger } from "../deps";
 import { formatAsLocal } from "../utils/code-utils";
 import {
+  PlasmicContext,
   getOrAddProjectConfig,
   getOrAddProjectLock,
-  PlasmicContext,
 } from "../utils/config-utils";
 import {
   defaultResourcePath,
@@ -28,8 +28,7 @@ export async function syncProjectIconAssets(
   branchName: string,
   version: string,
   iconBundles: IconBundle[],
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const project = getOrAddProjectConfig(context, projectId);
   if (!project.icons) {
@@ -108,7 +107,7 @@ export async function syncProjectIconAssets(
     await writeFileContent(
       context,
       iconConfig.moduleFilePath,
-      await formatAsLocal(bundle.module, iconConfig.moduleFilePath, baseDir),
+      await formatAsLocal(bundle.module, iconConfig.moduleFilePath),
       {
         force: !isNew,
       }

package/src/actions/sync-project-module.ts

@@ -22,8 +22,7 @@ export async function syncProjectModule(
   projectMeta: ProjectMetaBundle,
   projectConfig: ProjectConfig,
   projectLock: ProjectLock,
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const resourcePath = getProjectModuleResourcePath(context, projectConfig);
   if (checksums.projectModuleChecksum && projectMeta.projectModuleBundle) {
@@ -34,8 +33,7 @@ export async function syncProjectModule(
     }
     if (context.config.code.lang === "js") {
       projectMeta.projectModuleBundle.module = await formatScript(
-        tsxToJsx(projectMeta.projectModuleBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.projectModuleBundle.module)
       );
     }
     await writeFileContent(
@@ -46,8 +44,9 @@ export async function syncProjectModule(
     );
     projectConfig.projectModuleFilePath = resourcePath;
     const fl = projectLock.fileLocks.find(
-      (fl) =>
-        fl.assetId === projectConfig.projectId && fl.type === "projectModule"
+      (fileLock) =>
+        fileLock.assetId === projectConfig.projectId &&
+        fileLock.type === "projectModule"
     );
     if (fl) {
       fl.checksum = checksums.projectModuleChecksum || "";

package/src/actions/sync-splits-provider.ts

@@ -22,8 +22,7 @@ export async function syncSplitsProvider(
   projectMeta: ProjectMetaBundle,
   projectConfig: ProjectConfig,
   projectLock: ProjectLock,
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const resourcePath = getSplitsProviderResourcePath(context, projectConfig);
   if (checksums.splitsProviderChecksum && projectMeta.splitsProviderBundle) {
@@ -34,8 +33,7 @@ export async function syncSplitsProvider(
     }
     if (context.config.code.lang === "js") {
       projectMeta.splitsProviderBundle.module = await formatScript(
-        tsxToJsx(projectMeta.splitsProviderBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.splitsProviderBundle.module)
       );
     }
     await writeFileContent(
@@ -46,8 +44,9 @@ export async function syncSplitsProvider(
     );
     projectConfig.splitsProviderFilePath = resourcePath;
     const fl = projectLock.fileLocks.find(
-      (fl) =>
-        fl.assetId === projectConfig.projectId && fl.type === "splitsProvider"
+      (fileLock) =>
+        fileLock.assetId === projectConfig.projectId &&
+        fileLock.type === "splitsProvider"
     );
     if (fl) {
       fl.checksum = checksums.splitsProviderChecksum;

package/src/actions/sync-style-tokens-provider.ts

@@ -22,8 +22,7 @@ export async function syncStyleTokensProvider(
   projectMeta: ProjectMetaBundle,
   projectConfig: ProjectConfig,
   projectLock: ProjectLock,
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const resourcePath = getStyleTokensProviderResourcePath(
     context,
@@ -40,8 +39,7 @@ export async function syncStyleTokensProvider(
     }
     if (context.config.code.lang === "js") {
       projectMeta.styleTokensProviderBundle.module = await formatScript(
-        tsxToJsx(projectMeta.styleTokensProviderBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.styleTokensProviderBundle.module)
       );
     }
     writeFileContent(
@@ -52,9 +50,9 @@ export async function syncStyleTokensProvider(
     );
     projectConfig.styleTokensProviderFilePath = resourcePath;
     const fl = projectLock.fileLocks.find(
-      (fl) =>
-        fl.assetId === projectConfig.projectId &&
-        fl.type === "styleTokensProvider"
+      (fileLock) =>
+        fileLock.assetId === projectConfig.projectId &&
+        fileLock.type === "styleTokensProvider"
     );
     if (fl) {
       fl.checksum = checksums.styleTokensProviderChecksum || "";

package/src/actions/sync.ts

@@ -357,7 +357,7 @@ export async function sync(
     }
 
     // Now we know config.components are all correct, so we can go ahead and fix up all the import statements
-    await fixAllImportStatements(context, opts.baseDir, summary);
+    await fixAllImportStatements(context, summary);
 
     const codegenVersion = await context.api.latestCodegenVersion();
     context.lock.projects.forEach((p) => {
@@ -370,7 +370,7 @@ export async function sync(
       }
     });
     // Write the new ComponentConfigs to disk
-    await updateConfig(context, context.config, baseDir);
+    await updateConfig(context, context.config);
   };
 
   // Perform the actual sync
@@ -580,27 +580,23 @@ async function syncProject(
     for (const c of projectBundle.components) {
       [c.renderModuleFileName, c.renderModule] = await maybeConvertTsxToJsx(
         c.renderModuleFileName,
-        c.renderModule,
-        opts.baseDir
+        c.renderModule
       );
       [c.skeletonModuleFileName, c.skeletonModule] = await maybeConvertTsxToJsx(
         c.skeletonModuleFileName,
-        c.skeletonModule,
-        opts.baseDir
+        c.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
       );
     }
   }
@@ -609,8 +605,7 @@ async function syncProject(
     projectBundle.projectConfig,
     projectBundle.globalVariants,
     projectBundle.checksums,
-    branchName,
-    opts.baseDir
+    branchName
   );
 
   await syncProjectConfig(
@@ -624,7 +619,6 @@ async function syncProject(
     opts.forceOverwrite,
     summary,
     projectBundle.checksums,
-    opts.baseDir,
     indirect
   );
   syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
@@ -644,8 +638,7 @@ async function syncProject(
     branchName,
     projectVersion,
     projectBundle.iconAssets,
-    projectBundle.checksums,
-    opts.baseDir
+    projectBundle.checksums
   );
   await syncProjectImageAssets(
     context,
@@ -690,7 +683,6 @@ async function syncProjectConfig(
   forceOverwrite: boolean,
   summary: Map<string, ComponentUpdateSummary>,
   checksums: ChecksumBundle,
-  baseDir: string,
   indirect: boolean
 ) {
   const defaultCssFilePath = defaultResourcePath(
@@ -734,8 +726,7 @@ async function syncProjectConfig(
   if (projectBundle.cssRules) {
     const formattedCssRules = await formatAsLocal(
       projectBundle.cssRules,
-      projectConfig.cssFilePath,
-      baseDir
+      projectConfig.cssFilePath
     );
 
     // Write out project css
@@ -762,8 +753,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncSplitsProvider(
@@ -771,8 +761,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncProjectModule(
@@ -780,8 +769,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncStyleTokensProvider(
@@ -789,8 +777,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncDataTokens(
@@ -798,8 +785,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   // Write out components
@@ -811,8 +797,7 @@ async function syncProjectConfig(
     forceOverwrite,
     summary,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 }
 

package/src/migrations/migrations.ts

@@ -125,7 +125,7 @@ export async function runNecessaryMigrations(
       const prev = readConfig(configFile, false);
       const next = migrationFunc(prev, context);
       next.cliVersion = version;
-      await writeConfig(configFile, next, baseDir);
+      await writeConfig(configFile, next);
     }
 
     const lockMigrationFunc = LOCK_MIGRATIONS[version];
@@ -133,7 +133,7 @@ export async function runNecessaryMigrations(
       const prev = maybeReadLock();
       if (prev) {
         const next = lockMigrationFunc(prev, context);
-        await writeLock(lockFile, next, baseDir);
+        await writeLock(lockFile, next);
       }
     }
   }
@@ -142,6 +142,6 @@ export async function runNecessaryMigrations(
   const latestConfig = readConfig(configFile, false);
   if (latestConfig.cliVersion !== cliVersion) {
     latestConfig.cliVersion = cliVersion;
-    await writeConfig(configFile, latestConfig, baseDir);
+    await writeConfig(configFile, latestConfig);
   }
 }

package/src/utils/code-utils.ts

@@ -44,7 +44,6 @@ import { assert, flatMap } from "./lang-utils";
 export async function formatAsLocal(
   content: string,
   filePath: string,
-  baseDir: string,
   defaultOpts?: Options
 ): Promise<string> {
   if (GLOBAL_SETTINGS.skipFormatting) {
@@ -56,7 +55,7 @@ export async function formatAsLocal(
   // createPlasmicElementProxy.  So we're going to stop for now until we find
   // a better solution, like maybe letting user specify a prettier config
   // file in plasmic.json
-  // const opts = resolveConfig.sync(baseDir) || defaultOpts;
+  // const opts = resolveConfig.sync() || defaultOpts;
   const opts: Options = {
     trailingComma: "none",
     ...defaultOpts,
@@ -73,7 +72,6 @@ export async function formatAsLocal(
 
 async function nodeToFormattedCode(
   n: Node,
-  baseDir: string,
   unformatted?: boolean,
   commentsToRemove?: Set<string>
 ): Promise<string> {
@@ -84,7 +82,7 @@ async function nodeToFormattedCode(
   }).code;
   return unformatted
     ? c
-    : await formatAsLocal(c, "/tmp/x.tsx", baseDir, {
+    : await formatAsLocal(c, "/tmp/x.tsx", {
         arrowParens: "avoid",
       });
 }
@@ -242,7 +240,6 @@ export async function replaceImports(
   fromPath: string,
   fixImportContext: FixImportContext,
   removeImportDirective: boolean,
-  baseDir: string,
   changed = false
 ): Promise<string> {
   [code, changed] = filterUnformattedMarker(code, changed);
@@ -508,7 +505,7 @@ export async function replaceImports(
     return code;
   }
 
-  return nodeToFormattedCode(file, baseDir, !changed, commentsToRemove);
+  return nodeToFormattedCode(file, !changed, commentsToRemove);
 }
 
 function throwMissingReference(
@@ -630,7 +627,6 @@ export const mkFixImportContext = (config: PlasmicConfig): FixImportContext => {
  */
 export async function fixAllImportStatements(
   context: PlasmicContext,
-  baseDir: string,
   summary?: Map<string, ComponentUpdateSummary>
 ) {
   logger.info("Fixing import statements...");
@@ -640,12 +636,7 @@ export async function fixAllImportStatements(
   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;
       }
@@ -663,8 +654,7 @@ export async function fixAllImportStatements(
             context,
             compConfig,
             fixImportContext,
-            fixSkeletonModule,
-            baseDir
+            fixSkeletonModule
           );
         } catch (err) {
           logger.error(
@@ -677,7 +667,7 @@ export async function fixAllImportStatements(
   }
 
   try {
-    await fixGlobalContextImportStatements(context, fixImportContext, baseDir);
+    await fixGlobalContextImportStatements(context, fixImportContext);
   } catch (err) {
     logger.error(
       `Error encountered while fixing imports for global contexts: ${err}`
@@ -689,7 +679,6 @@ export async function fixAllImportStatements(
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "splitsProviderFilePath",
       getSplitsProviderResourcePath
     );
@@ -704,7 +693,6 @@ export async function fixAllImportStatements(
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "projectModuleFilePath",
       getProjectModuleResourcePath
     );
@@ -719,7 +707,6 @@ export async function fixAllImportStatements(
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "styleTokensProviderFilePath",
       getStyleTokensProviderResourcePath
     );
@@ -734,7 +721,6 @@ export async function fixAllImportStatements(
     await fixImportStatements(
       context,
       fixImportContext,
-      baseDir,
       "dataTokensFilePath",
       getDataTokensResourcePath
     );
@@ -754,8 +740,7 @@ async function fixComponentImportStatements(
   context: PlasmicContext,
   compConfig: ComponentConfig,
   fixImportContext: FixImportContext,
-  fixSkeletonModule: boolean,
-  baseDir: string
+  fixSkeletonModule: boolean
 ) {
   // If ComponentConfig.importPath is still a local file, we best-effort also fix up the import statements there.
   if (
@@ -767,8 +752,7 @@ async function fixComponentImportStatements(
       context,
       compConfig.importSpec.modulePath,
       fixImportContext,
-      true,
-      baseDir
+      true
     );
   }
 
@@ -795,7 +779,6 @@ async function fixComponentImportStatements(
     compConfig.renderModuleFilePath,
     fixImportContext,
     false,
-    baseDir,
     renderModuleChanged
   );
 }
@@ -805,7 +788,6 @@ async function fixFileImportStatements(
   srcDirFilePath: string,
   fixImportContext: FixImportContext,
   removeImportDirective: boolean,
-  baseDir: string,
   fileHasChanged = false
 ) {
   const filePath = makeFilePath(context, srcDirFilePath);
@@ -824,7 +806,6 @@ async function fixFileImportStatements(
     srcDirFilePath,
     fixImportContext,
     removeImportDirective,
-    baseDir,
     fileHasChanged
   );
   if (prevContent !== newContent) {
@@ -886,21 +867,17 @@ export const tsxToJsx = (code: string) => {
 
 export async function maybeConvertTsxToJsx(
   fileName: string,
-  content: string,
-  baseDir: string
+  content: string
 ): Promise<[string, string]> {
   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];
 }
 
-export async function formatScript(
-  code: string,
-  baseDir: string
-): Promise<string> {
+export async function formatScript(code: string): Promise<string> {
   const file = parser.parse(code, {
     strictMode: true,
     sourceType: "module",
@@ -922,12 +899,12 @@ export async function formatScript(
     },
   });
 
-  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,
@@ -936,8 +913,7 @@ export async function formatScript(
 
 async function fixGlobalContextImportStatements(
   context: PlasmicContext,
-  fixImportContext: FixImportContext,
-  baseDir: string
+  fixImportContext: FixImportContext
 ) {
   for (const project of context.config.projects) {
     if (!project.globalContextsFilePath) {
@@ -963,7 +939,6 @@ async function fixGlobalContextImportStatements(
       resourcePath,
       fixImportContext,
       false,
-      baseDir,
       true
     );
 
@@ -978,7 +953,6 @@ async function fixGlobalContextImportStatements(
 async function fixImportStatements(
   context: PlasmicContext,
   fixImportContext: FixImportContext,
-  baseDir: string,
   configKey: keyof ProjectConfig,
   getResourcePath: (ctx: PlasmicContext, project: ProjectConfig) => string
 ) {
@@ -1007,7 +981,6 @@ async function fixImportStatements(
       resourcePath,
       fixImportContext,
       false,
-      baseDir,
       true
     );
 
@@ -1021,7 +994,6 @@ async function fixImportStatements(
 
 export async function fixRscModulesImports(
   context: PlasmicContext,
-  baseDir: string,
   fixImportContext: FixImportContext,
   compConfig: ComponentConfig
 ) {
@@ -1040,8 +1012,7 @@ export async function fixRscModulesImports(
         context,
         modulePath,
         fixImportContext,
-        false,
-        baseDir
+        false
       );
     } catch (err) {
       logger.error(

package/src/utils/config-utils.ts

@@ -549,11 +549,7 @@ export function readConfig(
   }
 }
 
-export async function writeConfig(
-  configFile: string,
-  config: PlasmicConfig,
-  baseDir: string
-) {
+export async function writeConfig(configFile: string, config: PlasmicConfig) {
   await writeFileContentRaw(
     configFile,
     await formatAsLocal(
@@ -565,8 +561,7 @@ export async function writeConfig(
         undefined,
         2
       ),
-      configFile,
-      baseDir
+      configFile
     ),
     {
       force: true,
@@ -574,18 +569,10 @@ export async function writeConfig(
   );
 }
 
-export async function writeLock(
-  lockFile: string,
-  lock: PlasmicLock,
-  baseDir: string
-) {
+export async function writeLock(lockFile: string, lock: PlasmicLock) {
   await writeFileContentRaw(
     lockFile,
-    await formatAsLocal(
-      JSON.stringify(lock, undefined, 2),
-      "/tmp/x.json",
-      baseDir
-    ),
+    await formatAsLocal(JSON.stringify(lock, undefined, 2), "/tmp/x.json"),
     {
       force: true,
     }
@@ -594,15 +581,14 @@ export async function writeLock(
 
 export async function updateConfig(
   context: PlasmicContext,
-  newConfig: PlasmicConfig,
-  baseDir: string
+  newConfig: PlasmicConfig
 ) {
   // plasmic.json
-  await writeConfig(context.configFile, newConfig, baseDir);
+  await writeConfig(context.configFile, newConfig);
   context.config = newConfig;
 
   // plasmic.lock
-  await writeLock(context.lockFile, context.lock, baseDir);
+  await writeLock(context.lockFile, context.lock);
 }
 
 export function getOrAddProjectConfig(