@plasmicapp/cli 0.1.306 → 0.1.308

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.306",
+  "version": "0.1.308",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -78,5 +78,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "cd709d627ae388ad77010119787ecef6d555362b"
+  "gitHead": "bf12f2268d3e2794698bee0996d4e2008b6827c5"
 }

package/src/actions/export.ts

@@ -1,6 +1,13 @@
+import { promises as fs } from "fs";
 import { keyBy, snakeCase } from "lodash";
+import path from "path";
 import { CommonArgs } from "..";
-import { ComponentBundle, PlasmicApi, ProjectBundle } from "../api";
+import { PlasmicApi, ProjectBundle } from "../api";
+import {
+  fixAllImportStatements,
+  formatAsLocal,
+  maybeConvertTsxToJsx,
+} from "../utils/code-utils";
 import {
   CodeConfig,
   I18NConfig,
@@ -11,27 +18,17 @@ import {
 } from "../utils/config-utils";
 import { getContext, getCurrentOrDefaultAuth } from "../utils/get-context";
 import { tuple } from "../utils/lang-utils";
-import {
-  fixAllImportStatements,
-  formatAsLocal,
-  maybeConvertTsxToJsx,
-} from "../utils/code-utils";
-import { promises as fs, write } from "fs";
-import path from "path";
 import { DEFAULT_GLOBAL_CONTEXTS_NAME } from "./sync-global-contexts";
 import { ensureImageAssetContents } from "./sync-images";
-import { logger } from "../deps";
 
 export interface ExportArgs extends CommonArgs {
   projects: readonly string[];
   platform: "" | "react" | "nextjs" | "gatsby";
   codeLang: "" | "ts" | "js";
   styleScheme: "" | "css" | "css-modules";
-  imagesScheme: "" | "inlined" | "files" | "public-files";
-  imagesPublicDir: string;
-  imagesPublicUrlPrefix: string;
-  i18nKeyScheme: "" | I18NConfig["keyScheme"];
-  i18nTagPrefix: "" | I18NConfig["tagPrefix"];
+  imagesScheme: "" | "inlined" | "files";
+  i18NKeyScheme: "" | I18NConfig["keyScheme"];
+  i18NTagPrefix: "" | I18NConfig["tagPrefix"];
 
   skipFormatting?: boolean;
 
@@ -39,6 +36,9 @@ export interface ExportArgs extends CommonArgs {
 }
 
 export async function exportProjectsCli(opts: ExportArgs): Promise<void> {
+  if (!opts.outDir) {
+    opts.outDir = "./";
+  }
   if (!opts.baseDir) opts.baseDir = process.cwd();
   let configFile =
     opts.config || findConfigFile(opts.baseDir, { traverseParents: true });
@@ -81,8 +81,8 @@ export async function exportProjectsCli(opts: ExportArgs): Promise<void> {
     codeOpts: { lang: opts.codeLang || "ts" },
     stylesOpts: { scheme: opts.styleScheme || "css-modules" },
     imageOpts: { scheme: opts.imagesScheme || "files" },
-    i18nOpts: opts.i18nKeyScheme
-      ? { keyScheme: opts.i18nKeyScheme, tagPrefix: opts.i18nTagPrefix }
+    i18nOpts: opts.i18NKeyScheme
+      ? { keyScheme: opts.i18NKeyScheme, tagPrefix: opts.i18NTagPrefix }
       : undefined,
   });
 
@@ -152,8 +152,6 @@ export async function exportProjectsCli(opts: ExportArgs): Promise<void> {
         },
         images: {
           scheme: opts.imagesScheme || "files",
-          publicDir: opts.imagesPublicDir,
-          publicUrlPrefix: opts.imagesPublicUrlPrefix,
         },
         style: {
           scheme: opts.styleScheme || "css-modules",

package/src/index.ts

@@ -314,12 +314,12 @@ yargs
         .option("code-lang", getYargsOption("codeLang"))
         .option("code-scheme", getYargsOption("codeScheme"))
         .option("style-scheme", getYargsOption("styleScheme"))
-        .option("images-scheme", getYargsOption("imagesScheme"))
-        .option("images-public-dir", getYargsOption("imagesPublicDir"))
-        .option(
-          "images-public-url-prefix",
-          getYargsOption("imagesPublicUrlPrefix")
-        )
+        .option("images-scheme", {
+          describe:
+            "How to reference used images in designs; either `inlined`, which puts base64-encoded images directly into the React component files, or `files`, which puts images on disk and imports them from component files.",
+          type: "string",
+          choices: ["inlined", "files"],
+        })
         .option("i18n-key-scheme", getLocalizationYargs("key-scheme"))
         .option("i18n-tag-prefix", getLocalizationYargs("tag-prefix")),
     (argv) => handleError(exportProjectsCli(argv))

package/src/lib.ts

@@ -12,3 +12,7 @@ export {
   localizationStrings,
   LocalizationStringsArgs,
 } from "./actions/localization-strings";
+export {
+  exportProjectsCli as exportProjects,
+  ExportArgs,
+} from "./actions/export";

package/src/utils/code-utils.ts

@@ -52,7 +52,7 @@ export const formatAsLocal = (
   // a better solution, like maybe letting user specify a prettier config
   // file in plasmic.json
   // const opts = resolveConfig.sync(baseDir) || defaultOpts;
-  const opts = { ...defaultOpts };
+  const opts: Options = { ...defaultOpts, pluginSearchDirs: false };
   opts.filepath = filePath;
 
   // Running Prettier multiple times may actually yield different results!