@plasmicapp/cli 0.1.352 → 0.1.354

package/src/actions/sync-data-tokens.ts

@@ -22,8 +22,7 @@ export async function syncDataTokens(
   projectMeta: ProjectMetaBundle,
   projectConfig: ProjectConfig,
   projectLock: ProjectLock,
-  checksums: ChecksumBundle,
-  baseDir: string
+  checksums: ChecksumBundle
 ) {
   const resourcePath = getDataTokensResourcePath(context, projectConfig);
   if (checksums.dataTokensChecksum && projectMeta.dataTokensBundle) {
@@ -34,8 +33,7 @@ export async function syncDataTokens(
     }
     if (context.config.code.lang === "js") {
       projectMeta.dataTokensBundle.module = await formatScript(
-        tsxToJsx(projectMeta.dataTokensBundle.module),
-        baseDir
+        tsxToJsx(projectMeta.dataTokensBundle.module)
       );
     }
     writeFileContent(

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
@@ -757,17 +748,12 @@ async function syncProjectConfig(
     checksum: checksums.projectCssChecksum,
   });
 
-  if (projectConfig.jsBundleThemes?.length === 0) {
-    delete projectConfig.jsBundleThemes;
-  }
-
   await syncGlobalContexts(
     context,
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncSplitsProvider(
@@ -775,8 +761,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncProjectModule(
@@ -784,8 +769,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncStyleTokensProvider(
@@ -793,8 +777,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   await syncDataTokens(
@@ -802,8 +785,7 @@ async function syncProjectConfig(
     projectBundle,
     projectConfig,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 
   // Write out components
@@ -815,8 +797,7 @@ async function syncProjectConfig(
     forceOverwrite,
     summary,
     projectLock,
-    checksums,
-    baseDir
+    checksums
   );
 }
 

package/src/api.ts

@@ -81,12 +81,6 @@ export interface ProjectModuleBundle {
   module: string;
 }
 
-export interface JsBundleTheme {
-  themeFileName: string;
-  themeModule: string;
-  bundleName: string;
-}
-
 export interface ProjectMetaBundle {
   projectId: string;
   projectName: string;
@@ -420,63 +414,6 @@ export class PlasmicApi {
     return result.data as string;
   }
 
-  async uploadBundle(
-    projectId: string,
-    bundleName: string,
-    bundleJs: string,
-    css: string[],
-    metaJson: string,
-    genModulePath: string | undefined,
-    genCssPaths: string[],
-    pkgVersion: string | undefined,
-    extraPropMetaJson: string | undefined,
-    themeProviderWrapper: string | undefined,
-    themeModule: string | undefined
-  ): Promise<StyleTokensMap> {
-    const result = await this.post(
-      `${this.apiHost}/api/v1/projects/${projectId}/jsbundle/upload`,
-      {
-        projectId,
-        bundleName,
-        bundleJs,
-        css,
-        metaJson,
-        genModulePath,
-        genCssPaths,
-        pkgVersion,
-        extraPropMetaJson,
-        themeProviderWrapper,
-        themeModule,
-      }
-    );
-    return result.data as StyleTokensMap;
-  }
-
-  async projectStyleTokens(
-    projectId: string,
-    branchName: string,
-    versionRange?: string
-  ): Promise<StyleTokensMap> {
-    const result = await this.post(
-      `${this.apiHost}/api/v1/projects/${projectId}/code/tokens?branchName=${branchName}`,
-      { versionRange }
-    );
-    return result.data as StyleTokensMap;
-  }
-
-  async projectIcons(
-    projectId: string,
-    branchName: string,
-    versionRange?: string,
-    iconIds?: string[]
-  ): Promise<ProjectIconsResponse> {
-    const result = await this.post(
-      `${this.apiHost}/api/v1/projects/${projectId}/code/icons?branchName=${branchName}`,
-      { versionRange, iconIds }
-    );
-    return result.data as ProjectIconsResponse;
-  }
-
   connectSocket(): ReturnType<typeof socketio> {
     const socket = socketio(this.studioHost, {
       path: `/api/v1/socket`,

package/src/index.ts

@@ -13,7 +13,6 @@ import {
 import * as projectToken from "./actions/project-token";
 import { StatusArgs, showProjectStatus } from "./actions/status";
 import { SyncArgs, sync } from "./actions/sync";
-import { UploadBundleArgs, uploadJsBundle } from "./actions/upload-bundle";
 import { WatchArgs, watchProjects } from "./actions/watch";
 import { handleError } from "./utils/error";
 
@@ -182,67 +181,6 @@ yargs
       handleError(printProjectInfo(argv));
     }
   )
-  .command<UploadBundleArgs>(
-    "upload-bundle",
-    false,
-    (yargs2) =>
-      yargs2
-        .option("project", {
-          alias: "p",
-          describe: "ID of Plasmic project to upload the bundle to.",
-          type: "string",
-        })
-        .option("bundleName", {
-          describe: "Name of the bundle",
-          type: "string",
-        })
-        .option("bundleJsFile", {
-          describe: "Path of the bundled Javascript file in AMD format",
-          type: "string",
-        })
-        .option("cssFiles", {
-          describe: "Path of the bundled css files to load",
-          type: "array",
-          default: [],
-        })
-        .option("metaJsonFile", {
-          describe:
-            "Path of the meta data file (in JSON format) describing the component",
-          type: "string",
-        })
-        .option("extraPropMetaJsonFile", {
-          describe:
-            "Path of the extra meta data file (in JSON format) describing the component's additional controlled properties and initial properties",
-          type: "string",
-        })
-        .option("pkgVersion", {
-          describe:
-            "version of the package to include in the generated package.json",
-          type: "string",
-          default: "latest",
-        })
-        .option("genModulePath", {
-          describe:
-            "the path of include when generating import statement and generate package.json for. Default to bundleName.",
-          type: "string",
-        })
-        .option("themeProviderWrapper", {
-          describe: "the wrapper that inject theme to the bundle.",
-          type: "string",
-        })
-        .option("themeModuleFile", {
-          describe:
-            "the typescript file that contains and exports the implementation of themeProviderWrapper. Used for code generation. It must be specified together with themeProviderWrapper.",
-          type: "string",
-        })
-        .option("genCssPaths", {
-          describe:
-            "the list of css paths to import in generate code whenever a component in this bundle is used",
-          type: "array",
-          default: [],
-        }),
-    (argv) => handleError(uploadJsBundle(argv))
-  )
   .command<projectToken.ProjectTokenArgs>(
     "project-token <projectId>",
     "Get projectApiToken for a given project",

package/src/lib.ts

@@ -1,18 +1,17 @@
-export { auth, AuthArgs } from "./actions/auth";
-export { fixImports, FixImportsArgs } from "./actions/fix-imports";
+export { AuthArgs, auth } from "./actions/auth";
+export {
+  ExportArgs,
+  exportProjectsCli as exportProjects,
+} from "./actions/export";
+export { FixImportsArgs, fixImports } from "./actions/fix-imports";
 export { InitArgs, initPlasmic } from "./actions/init";
+export {
+  LocalizationStringsArgs,
+  localizationStrings,
+} from "./actions/localization-strings";
 export { getProjectApiToken } from "./actions/project-token";
-export { sync, SyncArgs } from "./actions/sync";
-export { UploadBundleArgs, uploadJsBundle } from "./actions/upload-bundle";
+export { SyncArgs, sync } from "./actions/sync";
 export { WatchArgs, watchProjects } from "./actions/watch";
 export { logger } from "./deps";
 export { HandledError, handleError } from "./utils/error";
 export { Metadata, setMetadataEnv } from "./utils/get-context";
-export {
-  localizationStrings,
-  LocalizationStringsArgs,
-} from "./actions/localization-strings";
-export {
-  exportProjectsCli as exportProjects,
-  ExportArgs,
-} from "./actions/export";

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);
   }
 }