@plasmicapp/cli 0.1.226 → 0.1.228

package/dist/actions/sync-images.js

@@ -87,6 +87,11 @@ function syncProjectImageAssets(context, projectId, branchName, version, imageBu
     });
 }
 exports.syncProjectImageAssets = syncProjectImageAssets;
+function getImagePublicUrl(context, asset) {
+    return (lang_utils_1.ensure(context.config.images.publicUrlPrefix) +
+        (lang_utils_1.ensure(context.config.images.publicUrlPrefix).endsWith("/") ? "" : "/") +
+        upath_1.default.relative(lang_utils_1.ensure(context.config.images.publicDir), asset.filePath));
+}
 const RE_ASSETCSSREF_ALL = /var\(--image-([^\)]+)\)/g;
 function fixComponentCssReferences(context, fixImportContext, cssFilePath) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -98,11 +103,7 @@ function fixComponentCssReferences(context, fixImportContext, cssFilePath) {
             const asset = fixImportContext.images[assetId];
             if (asset) {
                 return context.config.images.scheme === "public-files"
-                    ? `url("${lang_utils_1.ensure(context.config.images.publicUrlPrefix) +
-                        (lang_utils_1.ensure(context.config.images.publicUrlPrefix).endsWith("/")
-                            ? ""
-                            : "/") +
-                        upath_1.default.relative(lang_utils_1.ensure(context.config.images.publicDir), asset.filePath)}")`
+                    ? `url("${getImagePublicUrl(context, asset)}")`
                     : `url("./${upath_1.default.relative(upath_1.default.dirname(cssFilePath), asset.filePath)}")`;
             }
             else {
@@ -122,7 +123,7 @@ function fixComponentImagesReferences(context, fixImportContext, renderModuleFil
         const newContent = prevContent.replace(RE_ASSETTSXREF_ALL, (sub, assetId) => {
             const asset = fixImportContext.images[assetId];
             if (asset) {
-                return upath_1.default.join("/", lang_utils_1.ensure(context.config.images.publicUrlPrefix), upath_1.default.relative(lang_utils_1.ensure(context.config.images.publicDir), asset.filePath));
+                return getImagePublicUrl(context, asset);
             }
             else {
                 return sub;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.226",
+  "version": "0.1.228",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.12.1",
-    "@plasmicapp/react-web": "0.2.170",
+    "@plasmicapp/react-web": "0.2.171",
     "@types/findup-sync": "^2.0.2",
     "@types/glob": "^7.1.3",
     "@types/inquirer": "^6.5.0",
@@ -77,5 +77,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "53959d3877857b2ef233711e5d5ba60d14b0c7d8"
+  "gitHead": "d2c2fb1d1c72dfc8c852b9a3f624bf3cca2e35d5"
 }

package/src/actions/sync-images.ts

@@ -6,6 +6,7 @@ import { FixImportContext } from "../utils/code-utils";
 import {
   getOrAddProjectConfig,
   getOrAddProjectLock,
+  ImageConfig,
   PlasmicContext,
 } from "../utils/config-utils";
 import {
@@ -124,6 +125,14 @@ export async function syncProjectImageAssets(
   );
 }
 
+function getImagePublicUrl(context: PlasmicContext, asset: ImageConfig) {
+  return (
+    ensure(context.config.images.publicUrlPrefix) +
+    (ensure(context.config.images.publicUrlPrefix).endsWith("/") ? "" : "/") +
+    path.relative(ensure(context.config.images.publicDir), asset.filePath)
+  );
+}
+
 const RE_ASSETCSSREF_ALL = /var\(--image-([^\)]+)\)/g;
 export async function fixComponentCssReferences(
   context: PlasmicContext,
@@ -139,16 +148,7 @@ export async function fixComponentCssReferences(
     const asset = fixImportContext.images[assetId];
     if (asset) {
       return context.config.images.scheme === "public-files"
-        ? `url("${
-            ensure(context.config.images.publicUrlPrefix) +
-            (ensure(context.config.images.publicUrlPrefix).endsWith("/")
-              ? ""
-              : "/") +
-            path.relative(
-              ensure(context.config.images.publicDir),
-              asset.filePath
-            )
-          }")`
+        ? `url("${getImagePublicUrl(context, asset)}")`
         : `url("./${path.relative(
             path.dirname(cssFilePath),
             asset.filePath
@@ -173,11 +173,7 @@ export async function fixComponentImagesReferences(
   const newContent = prevContent.replace(RE_ASSETTSXREF_ALL, (sub, assetId) => {
     const asset = fixImportContext.images[assetId];
     if (asset) {
-      return path.join(
-        "/",
-        ensure(context.config.images.publicUrlPrefix),
-        path.relative(ensure(context.config.images.publicDir), asset.filePath)
-      );
+      return getImagePublicUrl(context, asset);
     } else {
       return sub;
     }