@plasmicapp/cli 0.1.305 → 0.1.307

package/dist/actions/export.d.ts

@@ -8,8 +8,8 @@ export interface ExportArgs extends CommonArgs {
     imagesScheme: "" | "inlined" | "files" | "public-files";
     imagesPublicDir: string;
     imagesPublicUrlPrefix: string;
-    i18nKeyScheme: "" | I18NConfig["keyScheme"];
-    i18nTagPrefix: "" | I18NConfig["tagPrefix"];
+    i18NKeyScheme: "" | I18NConfig["keyScheme"];
+    i18NTagPrefix: "" | I18NConfig["tagPrefix"];
     skipFormatting?: boolean;
     outDir: string;
 }

package/dist/index.js

@@ -735135,7 +735135,7 @@ var formatAsLocal = (content, filePath, baseDir, defaultOpts = {}) => {
   if (GLOBAL_SETTINGS.skipFormatting) {
     return content;
   }
-  const opts = { ...defaultOpts };
+  const opts = { ...defaultOpts, pluginSearchDirs: false };
   opts.filepath = filePath;
   const res = Prettier.format(content, opts);
   const res2 = Prettier.format(res, opts);
@@ -735751,6 +735751,12 @@ function eqPagePath(a, b) {
   if (a === b) {
     return true;
   }
+  const normPagePathBrackets = (p) => {
+    return p.replace("[[", "[").replace("]]", "]");
+  };
+  if (normPagePathBrackets(a) === normPagePathBrackets(b)) {
+    return true;
+  }
   if (!a.endsWith("/index") && `${a}/index` === b) {
     return true;
   }
@@ -739562,6 +739568,9 @@ var import_fs3 = require("fs");
 var import_path2 = __toESM(require("path"));
 async function exportProjectsCli(opts) {
   var _a, _b;
+  if (!opts.outDir) {
+    opts.outDir = "./";
+  }
   if (!opts.baseDir)
     opts.baseDir = process.cwd();
   let configFile = opts.config || findConfigFile(opts.baseDir, { traverseParents: true });
@@ -739600,7 +739609,7 @@ async function exportProjectsCli(opts) {
     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 } : void 0
+    i18nOpts: opts.i18NKeyScheme ? { keyScheme: opts.i18NKeyScheme, tagPrefix: opts.i18NTagPrefix } : void 0
   });
   const extx = opts.codeLang === "js" ? "jsx" : "tsx";
   const writeProj = async (bundle) => {

package/dist/lib.js

@@ -730475,7 +730475,7 @@ var formatAsLocal = (content, filePath, baseDir, defaultOpts = {}) => {
   if (GLOBAL_SETTINGS.skipFormatting) {
     return content;
   }
-  const opts = { ...defaultOpts };
+  const opts = { ...defaultOpts, pluginSearchDirs: false };
   opts.filepath = filePath;
   const res = Prettier.format(content, opts);
   const res2 = Prettier.format(res, opts);
@@ -731091,6 +731091,12 @@ function eqPagePath(a, b) {
   if (a === b) {
     return true;
   }
+  const normPagePathBrackets = (p) => {
+    return p.replace("[[", "[").replace("]]", "]");
+  };
+  if (normPagePathBrackets(a) === normPagePathBrackets(b)) {
+    return true;
+  }
   if (!a.endsWith("/index") && `${a}/index` === b) {
     return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.305",
+  "version": "0.1.307",
   "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": "f1d5f4fddc0f8d528cffb91a803501e51c877b42"
+  "gitHead": "c436471bfd37a5b4ee96e71e634d82c52655b1e9"
 }

package/src/actions/export.ts

@@ -30,8 +30,8 @@ export interface ExportArgs extends CommonArgs {
   imagesScheme: "" | "inlined" | "files" | "public-files";
   imagesPublicDir: string;
   imagesPublicUrlPrefix: string;
-  i18nKeyScheme: "" | I18NConfig["keyScheme"];
-  i18nTagPrefix: "" | I18NConfig["tagPrefix"];
+  i18NKeyScheme: "" | I18NConfig["keyScheme"];
+  i18NTagPrefix: "" | I18NConfig["tagPrefix"];
 
   skipFormatting?: boolean;
 
@@ -39,6 +39,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 +84,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,
   });
 

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!

package/src/utils/file-utils.ts

@@ -135,6 +135,14 @@ export function eqPagePath(a: string, b: string) {
     return true;
   }
 
+  // We also let users rename [...page].js to [[...page]].js
+  const normPagePathBrackets = (p: string) => {
+    return p.replace("[[", "[").replace("]]", "]");
+  };
+  if (normPagePathBrackets(a) === normPagePathBrackets(b)) {
+    return true;
+  }
+
   // pages/about.* and pages/about/index.* resolve to the same URI, but
   // pages/index.* and pages/index/index.* do not.
   if (!a.endsWith("/index") && `${a}/index` === b) {