@plasmicapp/cli 0.1.345 → 0.1.346

package/dist/index.js

@@ -488191,7 +488191,7 @@ async function formatAsLocal(content, filePath, baseDir, defaultOpts) {
 async function nodeToFormattedCode(n26, baseDir, unformatted, commentsToRemove) {
   const c5 = (0, import_generator.default)(n26, {
     retainLines: true,
-    shouldPrintComment: (c7) => !commentsToRemove || !commentsToRemove.has(c7)
+    shouldPrintComment: (comment) => !commentsToRemove || !commentsToRemove.has(comment)
   }).code;
   return unformatted ? c5 : await formatAsLocal(c5, "/tmp/x.tsx", baseDir, {
     arrowParens: "avoid"
@@ -488259,6 +488259,7 @@ function tryParsePlasmicImportSpec(node) {
     return void 0;
   }
   const m5 = c5.value.match(
+    // eslint-disable-next-line no-misleading-character-class
     new RegExp(
       [
         "plasmic-import:\\s+([",
@@ -488321,7 +488322,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
         ensureImportSpecifierWithAlias(stmt, exportName, compConfig.name);
       } else {
       }
-      const realPath = makeImportPath(context, fromPath, modulePath, true);
+      const realPath = makeImportPath(context, fromPath, modulePath);
       stmt.source.value = realPath;
     } else if (type === "render") {
       const compConfig = fixImportContext.components[uuid];
@@ -488331,8 +488332,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.renderModuleFilePath,
-        true
+        compConfig.renderModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "css") {
@@ -488343,8 +488343,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.cssFilePath,
-        false
+        compConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "globalVariant") {
@@ -488355,8 +488354,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        variantConfig.contextFilePath,
-        true
+        variantConfig.contextFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "icon") {
@@ -488367,8 +488365,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        iconConfig.moduleFilePath,
-        true
+        iconConfig.moduleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "picture") {
@@ -488376,12 +488373,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (!imageConfig) {
         throwMissingReference(context, "image", uuid, fromPath);
       }
-      const realPath = makeImportPath(
-        context,
-        fromPath,
-        imageConfig.filePath,
-        false
-      );
+      const realPath = makeImportPath(context, fromPath, imageConfig.filePath);
       stmt.source.value = realPath;
     } else if (type === "projectcss") {
       const projectConfig = fixImportContext.projects[uuid];
@@ -488391,16 +488383,14 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.cssFilePath,
-        false
+        projectConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "defaultcss") {
       const realPath = makeImportPath(
         context,
         fromPath,
-        fixImportContext.config.style.defaultStyleCssFilePath,
-        false
+        fixImportContext.config.style.defaultStyleCssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "codeComponent") {
@@ -488413,7 +488403,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.componentImportPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.componentImportPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.componentImportPath;
@@ -488428,7 +488418,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.helper.importPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.helper.importPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.helper.importPath;
@@ -488441,8 +488431,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.globalContextsFilePath,
-        true
+        projectConfig.globalContextsFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "customFunction") {
@@ -488455,7 +488444,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.importPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.importPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.importPath;
@@ -488468,8 +488457,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.splitsProviderFilePath,
-        true
+        projectConfig.splitsProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "styleTokensProvider") {
@@ -488480,8 +488468,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.styleTokensProviderFilePath,
-        true
+        projectConfig.styleTokensProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "projectModule") {
@@ -488492,8 +488479,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.projectModuleFilePath,
-        true
+        projectConfig.projectModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "rscClient") {
@@ -488507,12 +488493,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
           `Encountered Plasmic component "${uuid}" that is missing a rscClientModulePath.`
         );
       }
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        clientModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, clientModulePath);
     } else if (type === "rscServer") {
       const compConfig = fixImportContext.components[uuid];
       if (!compConfig) {
@@ -488527,12 +488508,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       logger.info(
         `Fixing "rscServer" with "${serverModulePath}" and from "${fromPath}"`
       );
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        serverModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, serverModulePath);
     }
   });
   if (!changed) {
@@ -488551,8 +488527,17 @@ function throwMissingReference(context, itemType, uuid, fromPath) {
     `Encountered Plasmic ${itemType} "${uuid}" in ${fromPath} that are being used but have not been synced. ${recFix}`
   );
 }
-function makeImportPath(context, fromPath, toPath2, stripExt, forceRelative = false) {
+function makeImportPath(context, fromPath, toPath2, forceRelative = false) {
   let result = toPath2;
+  const stripExt = context.config.preserveJsImportExtensions ? (
+    // Do not strip any extensions if the user has explicitly requested to preserve them
+    false
+  ) : (
+    // Strip extensions only for JavaScript/TypeScript modules
+    [".ts", ".tsx", ".js", ".jsx"].includes(
+      import_upath2.default.extname(toPath2).toLowerCase()
+    )
+  );
   if (forceRelative || isLocalModulePath(toPath2)) {
     result = import_upath2.default.relative(
       makeFilePath(context, import_upath2.default.dirname(fromPath)),
@@ -488800,7 +488785,7 @@ var tsxToJsx = (code) => {
     str = str.replace(usageMagic, "");
     return str;
   }
-  let result = ts7.transpileModule(prepForTranspile(code), {
+  const result = ts7.transpileModule(prepForTranspile(code), {
     compilerOptions: CompilerOptions.getOpts()
   });
   return fixPostTranspile(result.outputText);
@@ -488824,10 +488809,10 @@ async function formatScript(code, baseDir) {
     newLineMarker = newLineMarker + "_REALLY";
   }
   (0, import_traverse.default)(file, {
-    Statement: function(path28) {
-      if (file.program.body.includes(path28.node) && path28.node.type !== "ImportDeclaration") {
-        path28.insertBefore(babel.types.stringLiteral(newLineMarker));
-        path28.skip();
+    Statement: function(filePath) {
+      if (file.program.body.includes(filePath.node) && filePath.node.type !== "ImportDeclaration") {
+        filePath.insertBefore(babel.types.stringLiteral(newLineMarker));
+        filePath.skip();
       }
     }
   });
@@ -488844,8 +488829,9 @@ async function formatScript(code, baseDir) {
 }
 async function fixGlobalContextImportStatements(context, fixImportContext, baseDir) {
   for (const project of context.config.projects) {
-    if (!project.globalContextsFilePath)
+    if (!project.globalContextsFilePath) {
       continue;
+    }
     const resourcePath = getGlobalContextsResourcePath(context, project);
     let prevContent;
     try {
@@ -488876,8 +488862,9 @@ async function fixGlobalContextImportStatements(context, fixImportContext, baseD
 }
 async function fixImportStatements(context, fixImportContext, baseDir, configKey, getResourcePath) {
   for (const project of context.config.projects) {
-    if (!project[configKey])
+    if (!project[configKey]) {
       continue;
+    }
     const resourcePath = getResourcePath(context, project);
     let prevContent;
     try {
@@ -489586,7 +489573,8 @@ var DEFAULT_CONFIG = {
   globalVariants: {
     variantGroups: []
   },
-  wrapPagesWithGlobalContexts: true
+  wrapPagesWithGlobalContexts: true,
+  preserveJsImportExtensions: false
 };
 var DEFAULT_PUBLIC_FILES_CONFIG = {
   scheme: "public-files",
@@ -489657,7 +489645,7 @@ async function updateConfig(context, newConfig, baseDir) {
 function getOrAddProjectConfig(context, projectId, base) {
   let project = context.config.projects.find((p5) => p5.projectId === projectId);
   if (!project) {
-    project = !!base ? import_lodash9.default.cloneDeep(base) : {
+    project = base ? import_lodash9.default.cloneDeep(base) : {
       projectId,
       projectName: "",
       version: "latest",
@@ -489678,7 +489666,7 @@ function getOrAddProjectConfig(context, projectId, base) {
 function getOrAddProjectLock(context, projectId, branchName, base) {
   let project = context.lock.projects.find((p5) => p5.projectId === projectId);
   if (!project) {
-    project = !!base ? import_lodash9.default.cloneDeep(base) : {
+    project = base ? import_lodash9.default.cloneDeep(base) : {
       projectId,
       branchName,
       version: "",
@@ -491389,6 +491377,7 @@ async function exportProjectsCli(opts) {
         platform: opts.platform || "react",
         srcDir: "./",
         defaultPlasmicDir: "./",
+        preserveJsImportExtensions: false,
         code: {
           lang: opts.codeLang || "ts",
           scheme: "blackbox",
@@ -492730,8 +492719,9 @@ async function ensureRequiredPackages(context, baseDir, yes) {
   }
 }
 async function sync(opts, metadataDefaults) {
-  if (!opts.baseDir)
+  if (!opts.baseDir) {
     opts.baseDir = process.cwd();
+  }
   const baseDir = opts.baseDir;
   let context = await getContext(opts, { enableSkipAuth: true });
   if (opts.skipFormatting) {
@@ -492931,14 +492921,14 @@ async function checkExternalPkgs(context, baseDir, opts, pkgs) {
     }
   }
 }
-function maybeRenamePathExt(context, path28, ext, opts) {
-  if (!path28) {
-    return path28;
+function maybeRenamePathExt(context, filePath, fileExt, opts) {
+  if (!filePath) {
+    return filePath;
   }
-  const correctPath = `${stripExtension(path28, true)}${ext}`;
-  if (path28 !== correctPath) {
+  const correctPath = `${stripExtension(filePath, true)}${fileExt}`;
+  if (filePath !== correctPath) {
     try {
-      renameFile(context, path28, correctPath);
+      renameFile(context, filePath, correctPath);
     } catch (e7) {
       if (!(opts == null ? void 0 : opts.continueOnFailure)) {
         throw e7;
@@ -492976,10 +492966,6 @@ function fixFileExtension(context) {
 }
 async function syncProject(context, opts, projectIdsAndTokens, projectId, branchName, componentIds, projectVersion, dependencies, summary, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
   var _a8, _b2, _c3;
-  const existingProject = context.config.projects.find(
-    (p5) => p5.projectId === projectId
-  );
-  const existingCompScheme = ((existingProject == null ? void 0 : existingProject.components) || []).map((c5) => [c5.id, c5.scheme]);
   const projectApiToken = ensure(
     (_a8 = projectIdsAndTokens.find((p5) => p5.projectId === projectId)) == null ? void 0 : _a8.projectApiToken,
     `Could not find the API token for project ${projectId} in list: ${JSON.stringify(
@@ -493690,7 +493676,7 @@ import_yargs.default.usage("Usage: $0 <command> [options]").option("auth", {
 ).command(
   "info",
   "Fetches metadata for projects",
-  (yags) => yags.option("host", {
+  (yargs2) => yargs2.option("host", {
     describe: "Plasmic host to use",
     type: "string",
     default: "https://studio.plasmic.app"

package/dist/lib.js

@@ -483497,7 +483497,7 @@ async function formatAsLocal(content, filePath, baseDir, defaultOpts) {
 async function nodeToFormattedCode(n26, baseDir, unformatted, commentsToRemove) {
   const c5 = (0, import_generator.default)(n26, {
     retainLines: true,
-    shouldPrintComment: (c7) => !commentsToRemove || !commentsToRemove.has(c7)
+    shouldPrintComment: (comment) => !commentsToRemove || !commentsToRemove.has(comment)
   }).code;
   return unformatted ? c5 : await formatAsLocal(c5, "/tmp/x.tsx", baseDir, {
     arrowParens: "avoid"
@@ -483565,6 +483565,7 @@ function tryParsePlasmicImportSpec(node) {
     return void 0;
   }
   const m5 = c5.value.match(
+    // eslint-disable-next-line no-misleading-character-class
     new RegExp(
       [
         "plasmic-import:\\s+([",
@@ -483627,7 +483628,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
         ensureImportSpecifierWithAlias(stmt, exportName, compConfig.name);
       } else {
       }
-      const realPath = makeImportPath(context, fromPath, modulePath, true);
+      const realPath = makeImportPath(context, fromPath, modulePath);
       stmt.source.value = realPath;
     } else if (type === "render") {
       const compConfig = fixImportContext.components[uuid];
@@ -483637,8 +483638,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.renderModuleFilePath,
-        true
+        compConfig.renderModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "css") {
@@ -483649,8 +483649,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.cssFilePath,
-        false
+        compConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "globalVariant") {
@@ -483661,8 +483660,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        variantConfig.contextFilePath,
-        true
+        variantConfig.contextFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "icon") {
@@ -483673,8 +483671,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        iconConfig.moduleFilePath,
-        true
+        iconConfig.moduleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "picture") {
@@ -483682,12 +483679,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (!imageConfig) {
         throwMissingReference(context, "image", uuid, fromPath);
       }
-      const realPath = makeImportPath(
-        context,
-        fromPath,
-        imageConfig.filePath,
-        false
-      );
+      const realPath = makeImportPath(context, fromPath, imageConfig.filePath);
       stmt.source.value = realPath;
     } else if (type === "projectcss") {
       const projectConfig = fixImportContext.projects[uuid];
@@ -483697,16 +483689,14 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.cssFilePath,
-        false
+        projectConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "defaultcss") {
       const realPath = makeImportPath(
         context,
         fromPath,
-        fixImportContext.config.style.defaultStyleCssFilePath,
-        false
+        fixImportContext.config.style.defaultStyleCssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "codeComponent") {
@@ -483719,7 +483709,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.componentImportPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.componentImportPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.componentImportPath;
@@ -483734,7 +483724,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.helper.importPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.helper.importPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.helper.importPath;
@@ -483747,8 +483737,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.globalContextsFilePath,
-        true
+        projectConfig.globalContextsFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "customFunction") {
@@ -483761,7 +483750,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       if (meta.importPath[0] === ".") {
         const toPath2 = import_upath2.default.join(context.rootDir, meta.importPath);
         assert6(import_upath2.default.isAbsolute(toPath2));
-        const realPath = makeImportPath(context, fromPath, toPath2, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath2, true);
         stmt.source.value = realPath;
       } else {
         stmt.source.value = meta.importPath;
@@ -483774,8 +483763,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.splitsProviderFilePath,
-        true
+        projectConfig.splitsProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "styleTokensProvider") {
@@ -483786,8 +483774,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.styleTokensProviderFilePath,
-        true
+        projectConfig.styleTokensProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "projectModule") {
@@ -483798,8 +483785,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.projectModuleFilePath,
-        true
+        projectConfig.projectModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "rscClient") {
@@ -483813,12 +483799,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
           `Encountered Plasmic component "${uuid}" that is missing a rscClientModulePath.`
         );
       }
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        clientModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, clientModulePath);
     } else if (type === "rscServer") {
       const compConfig = fixImportContext.components[uuid];
       if (!compConfig) {
@@ -483833,12 +483814,7 @@ async function replaceImports(context, code, fromPath, fixImportContext, removeI
       logger.info(
         `Fixing "rscServer" with "${serverModulePath}" and from "${fromPath}"`
       );
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        serverModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, serverModulePath);
     }
   });
   if (!changed) {
@@ -483857,8 +483833,17 @@ function throwMissingReference(context, itemType, uuid, fromPath) {
     `Encountered Plasmic ${itemType} "${uuid}" in ${fromPath} that are being used but have not been synced. ${recFix}`
   );
 }
-function makeImportPath(context, fromPath, toPath2, stripExt, forceRelative = false) {
+function makeImportPath(context, fromPath, toPath2, forceRelative = false) {
   let result = toPath2;
+  const stripExt = context.config.preserveJsImportExtensions ? (
+    // Do not strip any extensions if the user has explicitly requested to preserve them
+    false
+  ) : (
+    // Strip extensions only for JavaScript/TypeScript modules
+    [".ts", ".tsx", ".js", ".jsx"].includes(
+      import_upath2.default.extname(toPath2).toLowerCase()
+    )
+  );
   if (forceRelative || isLocalModulePath(toPath2)) {
     result = import_upath2.default.relative(
       makeFilePath(context, import_upath2.default.dirname(fromPath)),
@@ -484106,7 +484091,7 @@ var tsxToJsx = (code) => {
     str = str.replace(usageMagic, "");
     return str;
   }
-  let result = ts7.transpileModule(prepForTranspile(code), {
+  const result = ts7.transpileModule(prepForTranspile(code), {
     compilerOptions: CompilerOptions.getOpts()
   });
   return fixPostTranspile(result.outputText);
@@ -484130,10 +484115,10 @@ async function formatScript(code, baseDir) {
     newLineMarker = newLineMarker + "_REALLY";
   }
   (0, import_traverse.default)(file, {
-    Statement: function(path28) {
-      if (file.program.body.includes(path28.node) && path28.node.type !== "ImportDeclaration") {
-        path28.insertBefore(babel.types.stringLiteral(newLineMarker));
-        path28.skip();
+    Statement: function(filePath) {
+      if (file.program.body.includes(filePath.node) && filePath.node.type !== "ImportDeclaration") {
+        filePath.insertBefore(babel.types.stringLiteral(newLineMarker));
+        filePath.skip();
       }
     }
   });
@@ -484150,8 +484135,9 @@ async function formatScript(code, baseDir) {
 }
 async function fixGlobalContextImportStatements(context, fixImportContext, baseDir) {
   for (const project of context.config.projects) {
-    if (!project.globalContextsFilePath)
+    if (!project.globalContextsFilePath) {
       continue;
+    }
     const resourcePath = getGlobalContextsResourcePath(context, project);
     let prevContent;
     try {
@@ -484182,8 +484168,9 @@ async function fixGlobalContextImportStatements(context, fixImportContext, baseD
 }
 async function fixImportStatements(context, fixImportContext, baseDir, configKey, getResourcePath) {
   for (const project of context.config.projects) {
-    if (!project[configKey])
+    if (!project[configKey]) {
       continue;
+    }
     const resourcePath = getResourcePath(context, project);
     let prevContent;
     try {
@@ -484892,7 +484879,8 @@ var DEFAULT_CONFIG = {
   globalVariants: {
     variantGroups: []
   },
-  wrapPagesWithGlobalContexts: true
+  wrapPagesWithGlobalContexts: true,
+  preserveJsImportExtensions: false
 };
 var DEFAULT_PUBLIC_FILES_CONFIG = {
   scheme: "public-files",
@@ -484963,7 +484951,7 @@ async function updateConfig(context, newConfig, baseDir) {
 function getOrAddProjectConfig(context, projectId, base) {
   let project = context.config.projects.find((p5) => p5.projectId === projectId);
   if (!project) {
-    project = !!base ? import_lodash9.default.cloneDeep(base) : {
+    project = base ? import_lodash9.default.cloneDeep(base) : {
       projectId,
       projectName: "",
       version: "latest",
@@ -484984,7 +484972,7 @@ function getOrAddProjectConfig(context, projectId, base) {
 function getOrAddProjectLock(context, projectId, branchName, base) {
   let project = context.lock.projects.find((p5) => p5.projectId === projectId);
   if (!project) {
-    project = !!base ? import_lodash9.default.cloneDeep(base) : {
+    project = base ? import_lodash9.default.cloneDeep(base) : {
       projectId,
       branchName,
       version: "",
@@ -487666,8 +487654,9 @@ async function ensureRequiredPackages(context, baseDir, yes) {
   }
 }
 async function sync(opts, metadataDefaults) {
-  if (!opts.baseDir)
+  if (!opts.baseDir) {
     opts.baseDir = process.cwd();
+  }
   const baseDir = opts.baseDir;
   let context = await getContext(opts, { enableSkipAuth: true });
   if (opts.skipFormatting) {
@@ -487867,14 +487856,14 @@ async function checkExternalPkgs(context, baseDir, opts, pkgs) {
     }
   }
 }
-function maybeRenamePathExt(context, path28, ext, opts) {
-  if (!path28) {
-    return path28;
+function maybeRenamePathExt(context, filePath, fileExt, opts) {
+  if (!filePath) {
+    return filePath;
   }
-  const correctPath = `${stripExtension(path28, true)}${ext}`;
-  if (path28 !== correctPath) {
+  const correctPath = `${stripExtension(filePath, true)}${fileExt}`;
+  if (filePath !== correctPath) {
     try {
-      renameFile(context, path28, correctPath);
+      renameFile(context, filePath, correctPath);
     } catch (e7) {
       if (!(opts == null ? void 0 : opts.continueOnFailure)) {
         throw e7;
@@ -487912,10 +487901,6 @@ function fixFileExtension(context) {
 }
 async function syncProject(context, opts, projectIdsAndTokens, projectId, branchName, componentIds, projectVersion, dependencies, summary, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
   var _a8, _b2, _c3;
-  const existingProject = context.config.projects.find(
-    (p5) => p5.projectId === projectId
-  );
-  const existingCompScheme = ((existingProject == null ? void 0 : existingProject.components) || []).map((c5) => [c5.id, c5.scheme]);
   const projectApiToken = ensure(
     (_a8 = projectIdsAndTokens.find((p5) => p5.projectId === projectId)) == null ? void 0 : _a8.projectApiToken,
     `Could not find the API token for project ${projectId} in list: ${JSON.stringify(
@@ -488513,6 +488498,7 @@ async function exportProjectsCli(opts) {
         platform: opts.platform || "react",
         srcDir: "./",
         defaultPlasmicDir: "./",
+        preserveJsImportExtensions: false,
         code: {
           lang: opts.codeLang || "ts",
           scheme: "blackbox",

package/dist/plasmic.schema.json

@@ -590,6 +590,10 @@
             },
             "type": "array"
         },
+        "preserveJsImportExtensions": {
+            "description": "Whether to preserve js / ts / jsx / tsx file extensions in import statements",
+            "type": "boolean"
+        },
         "projects": {
             "description": "Metadata for each project that has been synced",
             "items": {
@@ -630,6 +634,7 @@
         "globalVariants",
         "images",
         "platform",
+        "preserveJsImportExtensions",
         "projects",
         "srcDir",
         "style",

package/dist/utils/config-utils.d.ts

@@ -55,6 +55,8 @@ export interface PlasmicConfig {
     projects: ProjectConfig[];
     /** Wether we should wrap the pages with the project global contexts or not */
     wrapPagesWithGlobalContexts: boolean;
+    /** Whether to preserve js / ts / jsx / tsx file extensions in import statements */
+    preserveJsImportExtensions: boolean;
     /** The version of cli when this file was written */
     cliVersion?: string;
     /** Configuration for localization */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.345",
+  "version": "0.1.346",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -82,5 +82,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "0102f49e64d075420884fdd1679716cd9e1da77b"
+  "gitHead": "2495d0e2aac1b54715640be6c5c3eea5a49a3c69"
 }

package/src/actions/export.ts

@@ -170,6 +170,7 @@ export async function exportProjectsCli(opts: ExportArgs): Promise<void> {
         platform: opts.platform || "react",
         srcDir: "./",
         defaultPlasmicDir: "./",
+        preserveJsImportExtensions: false,
         code: {
           lang: opts.codeLang || "ts",
           scheme: "blackbox",

package/src/actions/sync.ts

@@ -181,7 +181,9 @@ export async function sync(
   // Initially allow for a missing auth. Only require an auth once we need to fetch new or updated API tokens for any
   // projects.
 
-  if (!opts.baseDir) opts.baseDir = process.cwd();
+  if (!opts.baseDir) {
+    opts.baseDir = process.cwd();
+  }
   const baseDir = opts.baseDir;
   let context = await getContext(opts, { enableSkipAuth: true });
 
@@ -456,19 +458,19 @@ async function checkExternalPkgs(
 
 function maybeRenamePathExt(
   context: PlasmicContext,
-  path: string,
-  ext: string,
+  filePath: string,
+  fileExt: string,
   opts?: {
     continueOnFailure?: boolean;
   }
 ) {
-  if (!path) {
-    return path;
+  if (!filePath) {
+    return filePath;
   }
-  const correctPath = `${stripExtension(path, true)}${ext}`;
-  if (path !== correctPath) {
+  const correctPath = `${stripExtension(filePath, true)}${fileExt}`;
+  if (filePath !== correctPath) {
     try {
-      renameFile(context, path, correctPath);
+      renameFile(context, filePath, correctPath);
     } catch (e) {
       if (!opts?.continueOnFailure) {
         throw e;
@@ -522,13 +524,6 @@ async function syncProject(
   externalCssImports: Set<string>,
   metadataDefaults?: Metadata
 ): Promise<void> {
-  const existingProject = context.config.projects.find(
-    (p) => p.projectId === projectId
-  );
-  const existingCompScheme: Array<[string, "blackbox" | "direct"]> = (
-    existingProject?.components || []
-  ).map((c) => [c.id, c.scheme]);
-
   const projectApiToken = ensure(
     projectIdsAndTokens.find((p) => p.projectId === projectId)?.projectApiToken,
     `Could not find the API token for project ${projectId} in list: ${JSON.stringify(

package/src/index.ts

@@ -2,17 +2,17 @@
 import yargs from "yargs";
 import * as auth from "./actions/auth";
 import { ExportArgs, exportProjectsCli } from "./actions/export";
-import { fixImports, FixImportsArgs } from "./actions/fix-imports";
+import { FixImportsArgs, fixImports } from "./actions/fix-imports";
 import { InfoArgs, printProjectInfo } from "./actions/info";
-import { getYargsOption, InitArgs, initPlasmic } from "./actions/init";
+import { InitArgs, getYargsOption, initPlasmic } from "./actions/init";
 import {
+  LocalizationStringsArgs,
   getLocalizationYargs,
   localizationStrings,
-  LocalizationStringsArgs,
 } from "./actions/localization-strings";
 import * as projectToken from "./actions/project-token";
-import { showProjectStatus, StatusArgs } from "./actions/status";
-import { sync, SyncArgs } from "./actions/sync";
+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";
@@ -110,8 +110,8 @@ yargs
   .command<StatusArgs>(
     "status",
     "Shows the status of local Plasmic projects.",
-    (yargs) =>
-      yargs.option("json", {
+    (yargs2) =>
+      yargs2.option("json", {
         describe: "Output status in JSON format",
         type: "boolean",
         default: false,
@@ -160,8 +160,8 @@ yargs
   .command<InfoArgs>(
     "info",
     "Fetches metadata for projects",
-    (yags) =>
-      yags
+    (yargs2) =>
+      yargs2
         .option("host", {
           describe: "Plasmic host to use",
           type: "string",
@@ -185,8 +185,8 @@ yargs
   .command<UploadBundleArgs>(
     "upload-bundle",
     false,
-    (yargs) =>
-      yargs
+    (yargs2) =>
+      yargs2
         .option("project", {
           alias: "p",
           describe: "ID of Plasmic project to upload the bundle to.",
@@ -246,8 +246,8 @@ yargs
   .command<projectToken.ProjectTokenArgs>(
     "project-token <projectId>",
     "Get projectApiToken for a given project",
-    (yargs) =>
-      yargs
+    (yargs2) =>
+      yargs2
         .positional("projectId", {
           describe: "projectId",
           type: "string",
@@ -262,8 +262,8 @@ yargs
   .command<LocalizationStringsArgs>(
     "localization-strings",
     "Generate localization strings",
-    (yargs) =>
-      yargs
+    (yargs2) =>
+      yargs2
         .option("projects", {
           alias: "p",
           describe:
@@ -310,8 +310,8 @@ yargs
   .command<ExportArgs>(
     "export",
     false,
-    (yargs) =>
-      yargs
+    (yargs2) =>
+      yargs2
         .option("projects", {
           alias: "p",
           describe: "ID of project to export from",

package/src/test-common/fixtures.ts

@@ -36,6 +36,7 @@ export const defaultPlasmicJson: PlasmicConfig = {
     variantGroups: [],
   },
   wrapPagesWithGlobalContexts: true,
+  preserveJsImportExtensions: false,
   cliVersion: "0.1.44",
 };
 export function standardTestSetup(includeDep = true) {

package/src/utils/code-utils.ts

@@ -78,7 +78,8 @@ async function nodeToFormattedCode(
 ): Promise<string> {
   const c = generate(n, {
     retainLines: true,
-    shouldPrintComment: (c) => !commentsToRemove || !commentsToRemove.has(c),
+    shouldPrintComment: (comment) =>
+      !commentsToRemove || !commentsToRemove.has(comment),
   }).code;
   return unformatted
     ? c
@@ -205,6 +206,7 @@ function tryParsePlasmicImportSpec(node: ImportDeclaration) {
     return undefined;
   }
   const m = c.value.match(
+    // eslint-disable-next-line no-misleading-character-class
     new RegExp(
       [
         "plasmic-import:\\s+([",
@@ -287,7 +289,7 @@ export async function replaceImports(
         // to name collisions.
         // ensureImportDefaultSpecifier(stmt, compConfig.name);
       }
-      const realPath = makeImportPath(context, fromPath, modulePath, true);
+      const realPath = makeImportPath(context, fromPath, modulePath);
       stmt.source.value = realPath;
     } else if (type === "render") {
       // import of the PP blackbox
@@ -298,8 +300,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.renderModuleFilePath,
-        true
+        compConfig.renderModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "css") {
@@ -311,8 +312,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        compConfig.cssFilePath,
-        false
+        compConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "globalVariant") {
@@ -324,8 +324,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        variantConfig.contextFilePath,
-        true
+        variantConfig.contextFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "icon") {
@@ -337,8 +336,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        iconConfig.moduleFilePath,
-        true
+        iconConfig.moduleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "picture") {
@@ -346,12 +344,7 @@ export async function replaceImports(
       if (!imageConfig) {
         throwMissingReference(context, "image", uuid, fromPath);
       }
-      const realPath = makeImportPath(
-        context,
-        fromPath,
-        imageConfig.filePath,
-        false
-      );
+      const realPath = makeImportPath(context, fromPath, imageConfig.filePath);
       stmt.source.value = realPath;
     } else if (type === "projectcss") {
       const projectConfig = fixImportContext.projects[uuid];
@@ -361,16 +354,14 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.cssFilePath,
-        false
+        projectConfig.cssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "defaultcss") {
       const realPath = makeImportPath(
         context,
         fromPath,
-        fixImportContext.config.style.defaultStyleCssFilePath,
-        false
+        fixImportContext.config.style.defaultStyleCssFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "codeComponent") {
@@ -384,7 +375,7 @@ export async function replaceImports(
         // Relative path from the project root
         const toPath = path.join(context.rootDir, meta.componentImportPath);
         assert(path.isAbsolute(toPath));
-        const realPath = makeImportPath(context, fromPath, toPath, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath, true);
         stmt.source.value = realPath;
       } else {
         // npm package
@@ -401,7 +392,7 @@ export async function replaceImports(
         // Relative path from the project root
         const toPath = path.join(context.rootDir, meta.helper.importPath);
         assert(path.isAbsolute(toPath));
-        const realPath = makeImportPath(context, fromPath, toPath, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath, true);
         stmt.source.value = realPath;
       } else {
         // npm package
@@ -415,8 +406,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.globalContextsFilePath,
-        true
+        projectConfig.globalContextsFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "customFunction") {
@@ -430,7 +420,7 @@ export async function replaceImports(
         // Relative path from the project root
         const toPath = path.join(context.rootDir, meta.importPath);
         assert(path.isAbsolute(toPath));
-        const realPath = makeImportPath(context, fromPath, toPath, true, true);
+        const realPath = makeImportPath(context, fromPath, toPath, true);
         stmt.source.value = realPath;
       } else {
         // npm package
@@ -444,8 +434,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.splitsProviderFilePath,
-        true
+        projectConfig.splitsProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "styleTokensProvider") {
@@ -456,8 +445,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.styleTokensProviderFilePath,
-        true
+        projectConfig.styleTokensProviderFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "projectModule") {
@@ -468,8 +456,7 @@ export async function replaceImports(
       const realPath = makeImportPath(
         context,
         fromPath,
-        projectConfig.projectModuleFilePath,
-        true
+        projectConfig.projectModuleFilePath
       );
       stmt.source.value = realPath;
     } else if (type === "rscClient") {
@@ -484,12 +471,7 @@ export async function replaceImports(
         );
       }
 
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        clientModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, clientModulePath);
     } else if (type === "rscServer") {
       const compConfig = fixImportContext.components[uuid];
       if (!compConfig) {
@@ -506,12 +488,7 @@ export async function replaceImports(
         `Fixing "rscServer" with "${serverModulePath}" and from "${fromPath}"`
       );
 
-      stmt.source.value = makeImportPath(
-        context,
-        fromPath,
-        serverModulePath,
-        true
-      );
+      stmt.source.value = makeImportPath(context, fromPath, serverModulePath);
     }
   });
 
@@ -543,10 +520,17 @@ function makeImportPath(
   context: PlasmicContext,
   fromPath: string,
   toPath: string,
-  stripExt: boolean,
   forceRelative = false
 ) {
   let result = toPath;
+  const stripExt = context.config.preserveJsImportExtensions
+    ? // Do not strip any extensions if the user has explicitly requested to preserve them
+      false
+    : // Strip extensions only for JavaScript/TypeScript modules
+      [".ts", ".tsx", ".js", ".jsx"].includes(
+        path.extname(toPath).toLowerCase()
+      );
+
   if (forceRelative || isLocalModulePath(toPath)) {
     result = path.relative(
       makeFilePath(context, path.dirname(fromPath)),
@@ -843,7 +827,7 @@ class CompilerOptions {
         curDir = path.join(curDir, "..");
         configPath = path.join(curDir, "tsconfig-transform.json");
       } while (!existsBuffered(configPath));
-      const c = ts.readConfigFile(configPath, (path) => readFileText(path));
+      const c = ts.readConfigFile(configPath, (path2) => readFileText(path2));
       this.opts = ts.convertCompilerOptionsFromJson(
         c.config.compilerOptions,
         "."
@@ -876,7 +860,7 @@ export const tsxToJsx = (code: string) => {
     return str;
   }
 
-  let result = ts.transpileModule(prepForTranspile(code), {
+  const result = ts.transpileModule(prepForTranspile(code), {
     compilerOptions: CompilerOptions.getOpts(),
   });
   return fixPostTranspile(result.outputText);
@@ -909,13 +893,13 @@ export async function formatScript(
     newLineMarker = newLineMarker + "_REALLY";
   }
   traverse(file, {
-    Statement: function (path) {
+    Statement: function (filePath) {
       if (
-        file.program.body.includes(path.node) &&
-        path.node.type !== "ImportDeclaration"
+        file.program.body.includes(filePath.node) &&
+        filePath.node.type !== "ImportDeclaration"
       ) {
-        path.insertBefore(babel.types.stringLiteral(newLineMarker));
-        path.skip();
+        filePath.insertBefore(babel.types.stringLiteral(newLineMarker));
+        filePath.skip();
       }
     },
   });
@@ -938,7 +922,9 @@ async function fixGlobalContextImportStatements(
   baseDir: string
 ) {
   for (const project of context.config.projects) {
-    if (!project.globalContextsFilePath) continue;
+    if (!project.globalContextsFilePath) {
+      continue;
+    }
     const resourcePath = getGlobalContextsResourcePath(context, project);
 
     let prevContent: string;
@@ -976,10 +962,12 @@ async function fixImportStatements(
   fixImportContext: FixImportContext,
   baseDir: string,
   configKey: keyof ProjectConfig,
-  getResourcePath: (context: PlasmicContext, project: ProjectConfig) => string
+  getResourcePath: (ctx: PlasmicContext, project: ProjectConfig) => string
 ) {
   for (const project of context.config.projects) {
-    if (!project[configKey]) continue;
+    if (!project[configKey]) {
+      continue;
+    }
 
     const resourcePath = getResourcePath(context, project);
 

package/src/utils/config-utils.ts

@@ -86,6 +86,9 @@ export interface PlasmicConfig {
   /** Wether we should wrap the pages with the project global contexts or not */
   wrapPagesWithGlobalContexts: boolean;
 
+  /** Whether to preserve js / ts / jsx / tsx file extensions in import statements */
+  preserveJsImportExtensions: boolean;
+
   /** The version of cli when this file was written */
   cliVersion?: string;
 
@@ -493,6 +496,7 @@ export const DEFAULT_CONFIG: PlasmicConfig = {
     variantGroups: [],
   },
   wrapPagesWithGlobalContexts: true,
+  preserveJsImportExtensions: false,
 };
 
 export const DEFAULT_PUBLIC_FILES_CONFIG: ImagesConfig = {
@@ -610,7 +614,7 @@ export function getOrAddProjectConfig(
 ): ProjectConfig {
   let project = context.config.projects.find((p) => p.projectId === projectId);
   if (!project) {
-    project = !!base
+    project = base
       ? L.cloneDeep(base)
       : {
           projectId,
@@ -639,7 +643,7 @@ export function getOrAddProjectLock(
 ): ProjectLock {
   let project = context.lock.projects.find((p) => p.projectId === projectId);
   if (!project) {
-    project = !!base
+    project = base
       ? L.cloneDeep(base)
       : {
           projectId,