@plasmicapp/cli 0.1.173 → 0.1.174

package/dist/actions/sync.js

@@ -50,11 +50,11 @@ const resolve_utils_1 = require("../utils/resolve-utils");
 const semver = __importStar(require("../utils/semver"));
 const user_utils_1 = require("../utils/user-utils");
 const sync_components_1 = require("./sync-components");
+const sync_global_contexts_1 = require("./sync-global-contexts");
 const sync_global_variants_1 = require("./sync-global-variants");
 const sync_icons_1 = require("./sync-icons");
 const sync_images_1 = require("./sync-images");
 const sync_styles_1 = require("./sync-styles");
-const sync_global_contexts_1 = require("./sync-global-contexts");
 function ensureRequiredPackages(context, baseDir, yes) {
     return __awaiter(this, void 0, void 0, function* () {
         const requireds = yield context.api.requiredPackages();
@@ -302,23 +302,33 @@ function checkExternalPkgs(context, baseDir, opts, pkgs) {
         }
     });
 }
-function maybeRenamePathExt(context, path, ext) {
+function maybeRenamePathExt(context, path, ext, opts) {
     if (!path) {
         return path;
     }
     const correctPath = `${file_utils_1.stripExtension(path, true)}${ext}`;
     if (path !== correctPath) {
-        file_utils_1.renameFile(context, path, correctPath);
+        try {
+            file_utils_1.renameFile(context, path, correctPath);
+        }
+        catch (e) {
+            if (!(opts === null || opts === void 0 ? void 0 : opts.continueOnFailure)) {
+                throw e;
+            }
+            else {
+                deps_1.logger.warn(e);
+            }
+        }
     }
     return correctPath;
 }
 function fixFileExtension(context) {
     const cssExt = context.config.style.scheme === "css-modules" ? ".module.css" : ".css";
-    context.config.style.defaultStyleCssFilePath = maybeRenamePathExt(context, context.config.style.defaultStyleCssFilePath, cssExt);
+    context.config.style.defaultStyleCssFilePath = maybeRenamePathExt(context, context.config.style.defaultStyleCssFilePath, cssExt, { continueOnFailure: true });
     context.config.projects.forEach((project) => {
-        project.cssFilePath = maybeRenamePathExt(context, project.cssFilePath, cssExt);
+        project.cssFilePath = maybeRenamePathExt(context, project.cssFilePath, cssExt, { continueOnFailure: true });
         project.components.forEach((component) => {
-            component.cssFilePath = maybeRenamePathExt(context, component.cssFilePath, cssExt);
+            component.cssFilePath = maybeRenamePathExt(context, component.cssFilePath, cssExt, { continueOnFailure: true });
         });
     });
 }

package/dist/utils/get-context.js

@@ -104,6 +104,14 @@ function removeMissingFilesFromLock(context, config, lock) {
         return project;
     });
 }
+/**
+ *
+ * @param context
+ * @param expectedPath
+ * @param baseNameToFiles
+ * @returns The path if we are able to find the file, undefined if we need to recreate it
+ * @throws if the user interrupts flow
+ */
 function attemptToRestoreFilePath(context, expectedPath, baseNameToFiles) {
     return __awaiter(this, void 0, void 0, function* () {
         // If the path is not set, always recreate.
@@ -163,16 +171,19 @@ function resolveMissingFilesInConfig(context, config) {
             });
         }
         context.config.globalVariants.variantGroups = yield filterFiles(context.config.globalVariants.variantGroups, "contextFilePath");
+        // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
         context.config.style.defaultStyleCssFilePath =
-            (yield attemptToRestoreFilePath(context, context.config.style.defaultStyleCssFilePath, baseNameToFiles)) || "";
+            (yield attemptToRestoreFilePath(context, context.config.style.defaultStyleCssFilePath, baseNameToFiles)) || context.config.style.defaultStyleCssFilePath;
+        // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
         for (const project of config.projects) {
             project.cssFilePath =
-                (yield attemptToRestoreFilePath(context, project.cssFilePath, baseNameToFiles)) || "";
+                (yield attemptToRestoreFilePath(context, project.cssFilePath, baseNameToFiles)) || project.cssFilePath;
             if (!project.globalContextsFilePath) {
                 project.globalContextsFilePath = "";
             }
+            // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
             project.globalContextsFilePath =
-                (yield attemptToRestoreFilePath(context, project.globalContextsFilePath, baseNameToFiles)) || "";
+                (yield attemptToRestoreFilePath(context, project.globalContextsFilePath, baseNameToFiles)) || project.globalContextsFilePath;
             project.images = yield filterFiles(project.images, "filePath");
             project.icons = yield filterFiles(project.icons, "moduleFilePath");
             project.jsBundleThemes = yield filterFiles(project.jsBundleThemes || [], "themeFilePath");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.173",
+  "version": "0.1.174",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"

package/src/actions/sync.ts

@@ -60,11 +60,11 @@ import {
   ComponentPendingMerge,
   syncProjectComponents,
 } from "./sync-components";
+import { syncGlobalContexts } from "./sync-global-contexts";
 import { syncGlobalVariants } from "./sync-global-variants";
 import { syncProjectIconAssets } from "./sync-icons";
 import { syncProjectImageAssets } from "./sync-images";
 import { upsertStyleTokens } from "./sync-styles";
-import { syncGlobalContexts } from "./sync-global-contexts";
 
 export interface SyncArgs extends CommonArgs {
   projects: readonly string[];
@@ -488,14 +488,25 @@ async function checkExternalPkgs(
 function maybeRenamePathExt(
   context: PlasmicContext,
   path: string,
-  ext: string
+  ext: string,
+  opts?: {
+    continueOnFailure?: boolean;
+  }
 ) {
   if (!path) {
     return path;
   }
   const correctPath = `${stripExtension(path, true)}${ext}`;
   if (path !== correctPath) {
-    renameFile(context, path, correctPath);
+    try {
+      renameFile(context, path, correctPath);
+    } catch (e) {
+      if (!opts?.continueOnFailure) {
+        throw e;
+      } else {
+        logger.warn(e);
+      }
+    }
   }
   return correctPath;
 }
@@ -506,19 +517,22 @@ function fixFileExtension(context: PlasmicContext) {
   context.config.style.defaultStyleCssFilePath = maybeRenamePathExt(
     context,
     context.config.style.defaultStyleCssFilePath,
-    cssExt
+    cssExt,
+    { continueOnFailure: true }
   );
   context.config.projects.forEach((project) => {
     project.cssFilePath = maybeRenamePathExt(
       context,
       project.cssFilePath,
-      cssExt
+      cssExt,
+      { continueOnFailure: true }
     );
     project.components.forEach((component) => {
       component.cssFilePath = maybeRenamePathExt(
         context,
         component.cssFilePath,
-        cssExt
+        cssExt,
+        { continueOnFailure: true }
       );
     });
   });

package/src/utils/get-context.ts

@@ -106,6 +106,14 @@ function removeMissingFilesFromLock(
     });
 }
 
+/**
+ *
+ * @param context
+ * @param expectedPath
+ * @param baseNameToFiles
+ * @returns The path if we are able to find the file, undefined if we need to recreate it
+ * @throws if the user interrupts flow
+ */
 async function attemptToRestoreFilePath(
   context: PlasmicContext,
   expectedPath: string,
@@ -193,30 +201,34 @@ async function resolveMissingFilesInConfig(
     "contextFilePath"
   );
 
+  // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
   context.config.style.defaultStyleCssFilePath =
     (await attemptToRestoreFilePath(
       context,
       context.config.style.defaultStyleCssFilePath,
       baseNameToFiles
-    )) || "";
+    )) || context.config.style.defaultStyleCssFilePath;
 
+  // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
   for (const project of config.projects) {
     project.cssFilePath =
       (await attemptToRestoreFilePath(
         context,
         project.cssFilePath,
         baseNameToFiles
-      )) || "";
+      )) || project.cssFilePath;
 
     if (!project.globalContextsFilePath) {
       project.globalContextsFilePath = "";
     }
+
+    // Try to find the file, otherwise recreate at either the specified path or default path (if both are falsey)
     project.globalContextsFilePath =
       (await attemptToRestoreFilePath(
         context,
         project.globalContextsFilePath,
         baseNameToFiles
-      )) || "";
+      )) || project.globalContextsFilePath;
 
     project.images = await filterFiles(project.images, "filePath");
     project.icons = await filterFiles(project.icons, "moduleFilePath");

package/dist/migrations/0.1.143-ensureImportModuleType.d.ts

@@ -1,2 +0,0 @@
-import { PlasmicConfig } from "../utils/config-utils";
-export declare function ensureImportModuleType(config: PlasmicConfig): PlasmicConfig;

package/dist/migrations/0.1.143-ensureImportModuleType.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureImportModuleType = void 0;
-function ensureImportModuleType(config) {
-    for (const project of config.projects) {
-        for (const component of project.components) {
-            component.importSpec.moduleType = "local";
-        }
-    }
-    return config;
-}
-exports.ensureImportModuleType = ensureImportModuleType;