@plasmicapp/cli 0.1.174 → 0.1.175

package/dist/actions/sync.js

@@ -353,6 +353,7 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
             codeOpts: context.config.code,
             metadata: get_context_1.generateMetadata(Object.assign(Object.assign({}, metadataDefaults), { platform: context.config.platform }), opts.metadata),
             indirect,
+            wrapPagesWithGlobalContexts: context.config.wrapPagesWithGlobalContexts,
         });
         // Convert from TSX => JSX
         if (context.config.code.lang === "js") {

package/dist/api.d.ts

@@ -184,6 +184,7 @@ export declare class PlasmicApi {
         codeOpts: CodeConfig;
         checksums: ChecksumBundle;
         indirect: boolean;
+        wrapPagesWithGlobalContexts: boolean;
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     projectMeta(projectId: string): Promise<ProjectMetaInfo>;

package/dist/plasmic.schema.json

@@ -458,6 +458,10 @@
         "tokens": {
             "$ref": "#/definitions/TokensConfig",
             "description": "Config for style tokens"
+        },
+        "wrapPagesWithGlobalContexts": {
+            "description": "Wether we should wrap the pages with the project global contexts or not",
+            "type": "boolean"
         }
     },
     "required": [
@@ -469,7 +473,8 @@
         "projects",
         "srcDir",
         "style",
-        "tokens"
+        "tokens",
+        "wrapPagesWithGlobalContexts"
     ],
     "type": "object"
 }

package/dist/test-common/fixtures.js

@@ -32,6 +32,7 @@ exports.defaultPlasmicJson = {
     globalVariants: {
         variantGroups: [],
     },
+    wrapPagesWithGlobalContexts: true,
     cliVersion: "0.1.44",
 };
 function standardTestSetup(includeDep = true) {

package/dist/utils/code-utils.js

@@ -125,7 +125,7 @@ function tryParsePlasmicImportSpec(node) {
     if (!c) {
         return undefined;
     }
-    const m = c.value.match(/plasmic-import:\s+([\w-]+)(?:\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent))?/);
+    const m = c.value.match(/plasmic-import:\s+([\w-]+)(?:\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent|globalContext))?/);
     if (m) {
         return { id: m[1], type: m[2] };
     }
@@ -262,6 +262,14 @@ function replaceImports(context, code, fromPath, fixImportContext, removeImportD
                 stmt.source.value = meta.componentImportPath;
             }
         }
+        else if (type === "globalContext") {
+            const projectConfig = fixImportContext.projects[uuid];
+            if (!projectConfig) {
+                throwMissingReference(context, "project", uuid, fromPath);
+            }
+            const realPath = makeImportPath(context, fromPath, projectConfig.globalContextsFilePath, true);
+            stmt.source.value = realPath;
+        }
     });
     if (!changed) {
         return code;

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

@@ -56,6 +56,8 @@ export interface PlasmicConfig {
     globalVariants: GlobalVariantsConfig;
     /** Metadata for each project that has been synced */
     projects: ProjectConfig[];
+    /** Wether we should wrap the pages with the project global contexts or not */
+    wrapPagesWithGlobalContexts: boolean;
     /** The version of cli when this file was written */
     cliVersion?: string;
     /** Arbitrary command to run after `plasmic sync` has run; useful for linting and code formatting synced files */

package/dist/utils/config-utils.js

@@ -70,6 +70,7 @@ exports.DEFAULT_CONFIG = {
     globalVariants: {
         variantGroups: [],
     },
+    wrapPagesWithGlobalContexts: true,
 };
 exports.DEFAULT_PUBLIC_FILES_CONFIG = {
     scheme: "public-files",

package/package.json

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

package/src/actions/sync.ts

@@ -595,6 +595,7 @@ async function syncProject(
       opts.metadata
     ),
     indirect,
+    wrapPagesWithGlobalContexts: context.config.wrapPagesWithGlobalContexts,
   });
 
   // Convert from TSX => JSX

package/src/api.ts

@@ -266,6 +266,7 @@ export class PlasmicApi {
       codeOpts: CodeConfig;
       checksums: ChecksumBundle;
       indirect: boolean;
+      wrapPagesWithGlobalContexts: boolean;
       metadata?: Metadata;
     }
   ): Promise<ProjectBundle> {

package/src/test-common/fixtures.ts

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

package/src/utils/code-utils.ts

@@ -156,6 +156,7 @@ type PlasmicImportType =
   | "picture"
   | "jsBundle"
   | "codeComponent"
+  | "globalContext"
   | undefined;
 
 function tryParsePlasmicImportSpec(node: ImportDeclaration) {
@@ -164,7 +165,7 @@ function tryParsePlasmicImportSpec(node: ImportDeclaration) {
     return undefined;
   }
   const m = c.value.match(
-    /plasmic-import:\s+([\w-]+)(?:\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent))?/
+    /plasmic-import:\s+([\w-]+)(?:\/(component|css|render|globalVariant|projectcss|defaultcss|icon|picture|jsBundle|codeComponent|globalContext))?/
   );
   if (m) {
     return { id: m[1], type: m[2] as PlasmicImportType } as PlasmicImportSpec;
@@ -337,6 +338,18 @@ export function replaceImports(
         // npm package
         stmt.source.value = meta.componentImportPath;
       }
+    } else if (type === "globalContext") {
+      const projectConfig = fixImportContext.projects[uuid];
+      if (!projectConfig) {
+        throwMissingReference(context, "project", uuid, fromPath);
+      }
+      const realPath = makeImportPath(
+        context,
+        fromPath,
+        projectConfig.globalContextsFilePath,
+        true
+      );
+      stmt.source.value = realPath;
     }
   });
 

package/src/utils/config-utils.ts

@@ -85,6 +85,9 @@ export interface PlasmicConfig {
   /** Metadata for each project that has been synced */
   projects: ProjectConfig[];
 
+  /** Wether we should wrap the pages with the project global contexts or not */
+  wrapPagesWithGlobalContexts: boolean;
+
   /** The version of cli when this file was written */
   cliVersion?: string;
 
@@ -411,6 +414,7 @@ export const DEFAULT_CONFIG: PlasmicConfig = {
   globalVariants: {
     variantGroups: [],
   },
+  wrapPagesWithGlobalContexts: true,
 };
 
 export const DEFAULT_PUBLIC_FILES_CONFIG: ImagesConfig = {