@plasmicapp/cli 0.1.180 → 0.1.183

package/dist/__mocks__/api.js

@@ -287,6 +287,7 @@ class PlasmicApi {
             return {
                 "@plasmicapp/loader": "0.0.1",
                 "@plasmicapp/cli": "0.0.1",
+                "@plasmicapp/host": "0.0.1",
                 "@plasmicapp/react-web": "0.0.1",
                 "@plasmicapp/react-web-runtime": "0.0.1",
             };

package/dist/actions/init.js

@@ -42,9 +42,10 @@ function initPlasmic(opts) {
         if (!process.env.QUIET) {
             deps_1.logger.info("Successfully created plasmic.json.\n");
         }
-        const answer = yield user_utils_1.confirmWithUser("@plasmicapp/react-web is a small runtime required by Plasmic-generated code.\n  Do you want to add it now?", opts.yes);
+        const answer = yield user_utils_1.confirmWithUser("@plasmicapp/host and @plasmicapp/react-web are small runtimes required by Plasmic-generated code.\n  Do you want to add them now?", opts.yes);
         if (answer) {
             npm_utils_1.installUpgrade("@plasmicapp/react-web", opts.baseDir);
+            npm_utils_1.installUpgrade("@plasmicapp/host", opts.baseDir);
         }
     });
 }

package/dist/actions/sync.js

@@ -88,6 +88,13 @@ function ensureRequiredPackages(context, baseDir, yes) {
             semver.gt(requireds["@plasmicapp/react-web"], reactWebVersion)) {
             yield confirmInstall("@plasmicapp/react-web", requireds["@plasmicapp/react-web"], { global: false, dev: false });
         }
+        const hostVersion = npm_utils_1.findInstalledVersion(context, baseDir, "@plasmicapp/host");
+        if (!hostVersion || semver.gt(requireds["@plasmicapp/host"], hostVersion)) {
+            yield confirmInstall("@plasmicapp/host", requireds["@plasmicapp/host"], {
+                global: false,
+                dev: false,
+            });
+        }
         if (context.config.code.reactRuntime === "automatic") {
             // Using automatic runtime requires installing the @plasmicapp/react-web-runtime package
             const runtimeVersion = npm_utils_1.findInstalledVersion(context, baseDir, "@plasmicapp/react-web-runtime");

package/dist/api.d.ts

@@ -73,6 +73,7 @@ export interface VersionResolution {
 export interface RequiredPackages {
     "@plasmicapp/loader": string;
     "@plasmicapp/cli": string;
+    "@plasmicapp/host": string;
     "@plasmicapp/react-web": string;
     "@plasmicapp/react-web-runtime": string;
 }

package/dist/utils/code-utils.js

@@ -252,7 +252,7 @@ function replaceImports(context, code, fromPath, fixImportContext, removeImportD
             const meta = fixImportContext.codeComponentMetas[uuid];
             if (meta.componentImportPath[0] === ".") {
                 // Relative path from the project root
-                const toPath = upath_1.default.join(process.cwd(), meta.componentImportPath);
+                const toPath = upath_1.default.join(context.rootDir, meta.componentImportPath);
                 lang_utils_1.assert(upath_1.default.isAbsolute(toPath));
                 const realPath = makeImportPath(context, fromPath, toPath, true, true);
                 stmt.source.value = realPath;

package/dist/utils/file-utils.js

@@ -23,9 +23,10 @@ const code_utils_1 = require("./code-utils");
 const config_utils_1 = require("./config-utils");
 const lang_utils_1 = require("./lang-utils");
 const user_utils_1 = require("./user-utils");
+const findExtension = (filename) => { var _a; return (_a = filename === null || filename === void 0 ? void 0 : filename.substring(filename.indexOf("."))) !== null && _a !== void 0 ? _a : filename; };
 function stripExtension(filename, removeComposedPath = false) {
     const ext = removeComposedPath
-        ? filename.substring(filename.indexOf("."))
+        ? findExtension(lodash_1.default.last(filename.split("/")))
         : upath_1.default.extname(filename);
     if (!ext || filename === ext) {
         return filename;

package/package.json

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

package/src/__mocks__/api.ts

@@ -381,6 +381,7 @@ class PlasmicApi {
     return {
       "@plasmicapp/loader": "0.0.1",
       "@plasmicapp/cli": "0.0.1",
+      "@plasmicapp/host": "0.0.1",
       "@plasmicapp/react-web": "0.0.1",
       "@plasmicapp/react-web-runtime": "0.0.1",
     };

package/src/actions/init.ts

@@ -73,11 +73,12 @@ export async function initPlasmic(
   }
 
   const answer = await confirmWithUser(
-    "@plasmicapp/react-web is a small runtime required by Plasmic-generated code.\n  Do you want to add it now?",
+    "@plasmicapp/host and @plasmicapp/react-web are small runtimes required by Plasmic-generated code.\n  Do you want to add them now?",
     opts.yes
   );
   if (answer) {
     installUpgrade("@plasmicapp/react-web", opts.baseDir);
+    installUpgrade("@plasmicapp/host", opts.baseDir);
   }
 }
 

package/src/actions/sync.ts

@@ -143,6 +143,18 @@ async function ensureRequiredPackages(
     );
   }
 
+  const hostVersion = findInstalledVersion(
+    context,
+    baseDir,
+    "@plasmicapp/host"
+  );
+  if (!hostVersion || semver.gt(requireds["@plasmicapp/host"], hostVersion)) {
+    await confirmInstall("@plasmicapp/host", requireds["@plasmicapp/host"], {
+      global: false,
+      dev: false,
+    });
+  }
+
   if (context.config.code.reactRuntime === "automatic") {
     // Using automatic runtime requires installing the @plasmicapp/react-web-runtime package
     const runtimeVersion = findInstalledVersion(

package/src/api.ts

@@ -94,6 +94,7 @@ export interface VersionResolution {
 export interface RequiredPackages {
   "@plasmicapp/loader": string;
   "@plasmicapp/cli": string;
+  "@plasmicapp/host": string;
   "@plasmicapp/react-web": string;
   "@plasmicapp/react-web-runtime": string;
 }

package/src/utils/code-utils.ts

@@ -330,7 +330,7 @@ export function replaceImports(
       const meta = fixImportContext.codeComponentMetas[uuid];
       if (meta.componentImportPath[0] === ".") {
         // Relative path from the project root
-        const toPath = path.join(process.cwd(), meta.componentImportPath);
+        const toPath = path.join(context.rootDir, meta.componentImportPath);
         assert(path.isAbsolute(toPath));
         const realPath = makeImportPath(context, fromPath, toPath, true, true);
         stmt.source.value = realPath;

package/src/utils/file-utils.ts

@@ -15,9 +15,12 @@ import {
 import { ensureString } from "./lang-utils";
 import { confirmWithUser } from "./user-utils";
 
+const findExtension = (filename?: string) =>
+  filename?.substring(filename.indexOf(".")) ?? filename;
+
 export function stripExtension(filename: string, removeComposedPath = false) {
   const ext = removeComposedPath
-    ? filename.substring(filename.indexOf("."))
+    ? findExtension(L.last(filename.split("/")))
     : path.extname(filename);
   if (!ext || filename === ext) {
     return filename;