@plasmicapp/cli 0.1.186 → 0.1.188

package/dist/__mocks__/api.d.ts

@@ -1,5 +1,6 @@
 export interface MockProject {
     projectId: string;
+    branchName: string;
     projectApiToken: string;
     version: string;
     projectName: string;
@@ -12,5 +13,6 @@ export interface MockComponent {
     id: string;
     name: string;
     projectId?: string;
+    branchName?: string;
     version?: string;
 }

package/dist/__mocks__/api.js

@@ -59,14 +59,16 @@ function mockProjectToProjectVersionMeta(mock, componentIdOrNames) {
  */
 function addMockProject(proj) {
     const projectId = proj.projectId;
+    const branchName = proj.branchName;
     const version = proj.version;
     // Populate projectId and version into each component
     // will be useful when reading / writing components to files
     proj.components = proj.components.map((c) => {
         return Object.assign(Object.assign({}, c), { projectId,
+            branchName,
             version });
     });
-    const existing = getMockProject(projectId, version);
+    const existing = getMockProject(projectId, branchName, version);
     if (!existing) {
         PROJECTS.push(proj);
     }
@@ -96,18 +98,21 @@ function stringToMockComponent(data) {
 function mockComponentToString(component) {
     return "// " + JSON.stringify(component);
 }
-function getMockProject(projectId, version) {
-    return PROJECTS.find((m) => m.projectId === projectId && m.version === version);
+function getMockProject(projectId, branchName, version) {
+    return PROJECTS.find((m) => m.projectId === projectId &&
+        m.branchName === branchName &&
+        m.version === version);
 }
 /**
  * Only fetch top-level components that match the projectId (optionally also componentIdOrNames + version)
  * Does not crawl the dependency tree
  * @param projectId
+ * @param branchName
  * @param componentIdOrNames
  * @param versionRange
  */
-function getMockComponents(projectId, version, componentIdOrNames) {
-    const project = getMockProject(projectId, version);
+function getMockComponents(projectId, branchName, version, componentIdOrNames) {
+    const project = getMockProject(projectId, branchName, version);
     return !project
         ? []
         : project.components.filter((c) => !componentIdOrNames ||
@@ -156,7 +161,7 @@ function* getDeps(projects) {
     while (queue.length > 0) {
         const curr = lang_utils_1.ensure(queue.shift());
         for (const [projectId, version] of lodash_1.default.toPairs(curr.dependencies)) {
-            const mockProject = lang_utils_1.ensure(getMockProject(projectId, version));
+            const mockProject = lang_utils_1.ensure(getMockProject(projectId, "main", version));
             const projectMeta = mockProjectToProjectVersionMeta(mockProject);
             yield projectMeta;
             queue.push(projectMeta);
@@ -194,7 +199,7 @@ class PlasmicApi {
                 const availableVersions = availableProjects.map((p) => p.version);
                 const version = semver.maxSatisfying(availableVersions, proj.versionRange);
                 if (version) {
-                    const mockProject = lang_utils_1.ensure(getMockProject(proj.projectId, version));
+                    const mockProject = lang_utils_1.ensure(getMockProject(proj.projectId, proj.branchName, version));
                     const projectMeta = mockProjectToProjectVersionMeta(mockProject, proj.componentIdOrNames);
                     results.projects.push(projectMeta);
                 }
@@ -212,7 +217,7 @@ class PlasmicApi {
             return true;
         });
     }
-    projectComponents(projectId, opts) {
+    projectComponents(projectId, branchName, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const { componentIdOrNames, version } = opts;
             if (PROJECTS.length <= 0) {
@@ -229,7 +234,7 @@ class PlasmicApi {
             if (!deps.every((dep) => this.lastProjectIdsAndTokens.find((p) => p.projectId === dep.projectId))) {
                 throw new Error("No user+token and project API tokens don't match on a dependency");
             }
-            const mockComponents = getMockComponents(projectId, version, componentIdOrNames);
+            const mockComponents = getMockComponents(projectId, branchName, version, componentIdOrNames);
             if (mockComponents.length <= 0) {
                 throw new Error(`Code gen failed: no components match the parameters ${JSON.stringify({ projectId, version, componentIdOrNames }, undefined, 2)}`);
             }
@@ -262,12 +267,12 @@ class PlasmicApi {
             throw new Error("Unimplemented");
         });
     }
-    projectStyleTokens(projectId) {
+    projectStyleTokens(projectId, branchName) {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error("Unimplemented");
         });
     }
-    projectIcons(projectId) {
+    projectIcons(projectId, branchName) {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error("Unimplemented");
         });

package/dist/__tests__/project-api-token-spec.js

@@ -96,7 +96,7 @@ describe("Project API tokens", () => {
         // We sync project1 which got updated, but the dependency is still same version.
         fixtures_1.opts.force = false;
         removeAuth();
-        fixtures_1.mockApi.getMockProject("projectId1", "1.2.3").version = "1.2.4";
+        fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3").version = "1.2.4";
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
     }));
     test("should prompt for auth if you have only irrelevant tokens", () => __awaiter(void 0, void 0, void 0, function* () {
@@ -134,7 +134,7 @@ describe("Project API tokens", () => {
         // We sync project1 which got updated, but the dependency is still same version.
         fixtures_1.opts.force = false;
         removeAuth();
-        fixtures_1.mockApi.getMockProject("projectId1", "1.2.3").version = "1.2.4";
+        fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3").version = "1.2.4";
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
     }));
     test("should fail in loader mode if not available", () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/__tests__/versioned-sync-spec.js

@@ -45,7 +45,7 @@ describe("versioned-sync", () => {
         fixtures_1.opts.projects = ["projectId1"];
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
         // Change component name server-side
-        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "1.2.3");
+        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3");
         const buttonData = mockProject.components.find((c) => c.id === "buttonId");
         buttonData.name = "NewButton";
         mockProject.version = "2.0.0";
@@ -64,7 +64,7 @@ describe("versioned-sync", () => {
         fixtures_1.opts.projects = ["projectId1"];
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
         // Change component version server-side
-        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "1.2.3");
+        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3");
         mockProject.version = "1.3.4";
         fixtures_1.mockApi.addMockProject(mockProject);
         // Try syncing again and see if things show up
@@ -79,7 +79,7 @@ describe("versioned-sync", () => {
         fixtures_1.opts.nonRecursive = true;
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
         // Change component version server-side
-        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "1.2.3");
+        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3");
         mockProject.version = "2.0.0";
         fixtures_1.mockApi.addMockProject(mockProject);
         // Read in updated plasmic.json post-sync
@@ -104,7 +104,7 @@ describe("versioned-sync", () => {
         fixtures_1.opts.nonRecursive = true;
         yield expect(sync_1.sync(fixtures_1.opts)).resolves.toBeUndefined();
         // Change component version server-side
-        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "1.2.3");
+        const mockProject = fixtures_1.mockApi.getMockProject("projectId1", "main", "1.2.3");
         mockProject.version = "1.10.1";
         fixtures_1.mockApi.addMockProject(mockProject);
         // Update plasmic.json to use semver

package/dist/actions/localization-strings.d.ts

@@ -1,6 +1,8 @@
-export interface LocalizationStringsArgs {
+import { CommonArgs } from "..";
+export interface LocalizationStringsArgs extends CommonArgs {
     host: string;
     projects: readonly string[];
+    projectTokens?: readonly string[];
     format: "po" | "json" | "lingui";
     output: string;
     forceOverwrite: boolean;

package/dist/actions/localization-strings.js

@@ -14,31 +14,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localizationStrings = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const lodash_1 = require("lodash");
 const api_1 = require("../api");
 const deps_1 = require("../deps");
 const lib_1 = require("../lib");
 const auth_utils_1 = require("../utils/auth-utils");
 const config_utils_1 = require("../utils/config-utils");
 const file_utils_1 = require("../utils/file-utils");
+const get_context_1 = require("../utils/get-context");
 const user_utils_1 = require("../utils/user-utils");
 function localizationStrings(opts) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (!opts.projects || opts.projects.length === 0) {
             throw new lib_1.HandledError(`Missing projects.`);
         }
+        if (!opts.baseDir)
+            opts.baseDir = process.cwd();
+        const parsedProjectTokens = ((_a = opts.projectTokens) !== null && _a !== void 0 ? _a : []).map((val) => {
+            const [projectId, projectApiToken] = val.split(":");
+            if (!projectId || !projectApiToken) {
+                throw new Error(`Invalid value passed to '--project-tokens': ${val}\nPlease provide the API tokens with the format PROJECT_ID:PROJECT_API_TOKEN`);
+            }
+            return {
+                projectId: projectId.trim(),
+                projectApiToken: projectApiToken.trim(),
+            };
+        });
         const output = !opts.output
             ? opts.format === "po"
                 ? "data.po"
                 : "data.json"
             : opts.output;
-        const auth = yield auth_utils_1.getOrStartAuth({
-            baseDir: "",
-            host: opts.host || config_utils_1.DEFAULT_HOST,
-        });
-        if (auth) {
-            const api = new api_1.PlasmicApi(auth);
+        const projectTokensFromConfig = [];
+        const auth = yield auth_utils_1.getCurrentAuth(opts.auth);
+        const maybeConfigFile = opts.config || config_utils_1.findConfigFile(opts.baseDir, { traverseParents: true });
+        if (maybeConfigFile) {
+            const context = yield get_context_1.getContext(opts, { enableSkipAuth: true });
+            context.config.projects.forEach((p) => {
+                projectTokensFromConfig.push(lodash_1.pick(p, "projectId", "projectApiToken"));
+            });
+        }
+        const projectIdsAndTokens = [
+            ...parsedProjectTokens,
+            ...projectTokensFromConfig,
+        ].filter((v) => !!v && !!v.projectId && !!v.projectApiToken);
+        if (auth || projectIdsAndTokens.length > 0) {
+            const api = new api_1.PlasmicApi(auth !== null && auth !== void 0 ? auth : {
+                host: config_utils_1.DEFAULT_HOST,
+                user: "",
+                token: "",
+            });
             deps_1.logger.info(`Generating localization strings for ${chalk_1.default.bold(opts.projects.join(", "))}...`);
-            const data = yield api.genLocalizationStrings(opts.projects, opts.format);
+            const data = yield api.genLocalizationStrings(opts.projects, opts.format, projectIdsAndTokens);
             if (file_utils_1.existsBuffered(output)) {
                 const overwrite = yield user_utils_1.confirmWithUser(`File ${output} already exists. Do you want to overwrite?`, opts.forceOverwrite);
                 if (!overwrite) {
@@ -49,7 +77,10 @@ function localizationStrings(opts) {
             deps_1.logger.info(`Localization strings have been written to ${output}`);
         }
         else {
-            deps_1.logger.error("Missing auth information");
+            deps_1.logger.error(`Missing auth information. You can follow any of the steps below to fix it:
+- Run 'plasmic auth'
+- Provide the project API token to 'plasmic.json'
+- Or provide the project API token through '--project-tokens' flag`);
         }
     });
 }

package/dist/actions/project-token.js

@@ -27,7 +27,7 @@ exports.getProjectApiToken = (projectId, host) => __awaiter(void 0, void 0, void
     if (auth) {
         const api = new api_1.PlasmicApi(auth);
         const versionResolution = yield api.resolveSync([
-            { projectId, componentIdOrNames: undefined },
+            { projectId, branchName: "main", componentIdOrNames: undefined },
         ]);
         return (_a = versionResolution.projects[0]) === null || _a === void 0 ? void 0 : _a.projectApiToken;
     }

package/dist/actions/sync-components.js

@@ -34,7 +34,7 @@ const updateDirectSkeleton = (newFileContent, editedFileContent, context, compCo
     });
     const mergedFiles = yield code_merger_1.mergeFiles(componentByUuid, compConfig.projectId, code_merger_1.makeCachedProjectSyncDataProvider((projectId, revision) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            return yield context.api.projectSyncMetadata(projectId, revision, true);
+            return yield context.api.projectSyncMetadata(projectId, "main", revision, true);
         }
         catch (e) {
             if (e instanceof api_1.AppServerError &&

package/dist/actions/sync-global-variants.d.ts

@@ -1,3 +1,3 @@
 import { ChecksumBundle, GlobalVariantBundle, ProjectMetaBundle } from "../api";
 import { PlasmicContext } from "../utils/config-utils";
-export declare function syncGlobalVariants(context: PlasmicContext, projectMeta: ProjectMetaBundle, bundles: GlobalVariantBundle[], checksums: ChecksumBundle, baseDir: string): Promise<void>;
+export declare function syncGlobalVariants(context: PlasmicContext, projectMeta: ProjectMetaBundle, bundles: GlobalVariantBundle[], checksums: ChecksumBundle, branchName: string, baseDir: string): Promise<void>;

package/dist/actions/sync-global-variants.js

@@ -20,10 +20,10 @@ const code_utils_1 = require("../utils/code-utils");
 const config_utils_1 = require("../utils/config-utils");
 const file_utils_1 = require("../utils/file-utils");
 const lang_utils_1 = require("../utils/lang-utils");
-function syncGlobalVariants(context, projectMeta, bundles, checksums, baseDir) {
+function syncGlobalVariants(context, projectMeta, bundles, checksums, branchName, baseDir) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectId = projectMeta.projectId;
-        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId);
+        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId, branchName);
         const existingVariantConfigs = lodash_1.default.keyBy(context.config.globalVariants.variantGroups.filter((group) => group.projectId === projectId), (c) => c.id);
         const globalVariantFileLocks = lodash_1.default.keyBy(projectLock.fileLocks.filter((fileLock) => fileLock.type === "globalVariant"), (fl) => fl.assetId);
         const id2VariantChecksum = new Map(checksums.globalVariantChecksums);

package/dist/actions/sync-icons.d.ts

@@ -4,4 +4,4 @@ import { PlasmicContext } from "../utils/config-utils";
 export interface SyncIconsArgs extends CommonArgs {
     projects: readonly string[];
 }
-export declare function syncProjectIconAssets(context: PlasmicContext, projectId: string, version: string, iconBundles: IconBundle[], checksums: ChecksumBundle, baseDir: string): Promise<void>;
+export declare function syncProjectIconAssets(context: PlasmicContext, projectId: string, branchName: string, version: string, iconBundles: IconBundle[], checksums: ChecksumBundle, baseDir: string): Promise<void>;

package/dist/actions/sync-icons.js

@@ -20,13 +20,13 @@ const code_utils_1 = require("../utils/code-utils");
 const config_utils_1 = require("../utils/config-utils");
 const file_utils_1 = require("../utils/file-utils");
 const lang_utils_1 = require("../utils/lang-utils");
-function syncProjectIconAssets(context, projectId, version, iconBundles, checksums, baseDir) {
+function syncProjectIconAssets(context, projectId, branchName, version, iconBundles, checksums, baseDir) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = config_utils_1.getOrAddProjectConfig(context, projectId);
         if (!project.icons) {
             project.icons = [];
         }
-        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId);
+        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId, branchName);
         const knownIconConfigs = lodash_1.default.keyBy(project.icons, (i) => i.id);
         const iconFileLocks = lodash_1.default.keyBy(projectLock.fileLocks.filter((fileLock) => fileLock.type === "icon"), (fl) => fl.assetId);
         const id2IconChecksum = new Map(checksums.iconChecksums);

package/dist/actions/sync-images.d.ts

@@ -1,6 +1,6 @@
 import { ChecksumBundle, ImageBundle } from "../api";
 import { FixImportContext } from "../utils/code-utils";
 import { PlasmicContext } from "../utils/config-utils";
-export declare function syncProjectImageAssets(context: PlasmicContext, projectId: string, version: string, imageBundles: ImageBundle[], checksums: ChecksumBundle): Promise<void>;
+export declare function syncProjectImageAssets(context: PlasmicContext, projectId: string, branchName: string, version: string, imageBundles: ImageBundle[], checksums: ChecksumBundle): Promise<void>;
 export declare function fixComponentCssReferences(context: PlasmicContext, fixImportContext: FixImportContext, cssFilePath: string): Promise<void>;
 export declare function fixComponentImagesReferences(context: PlasmicContext, fixImportContext: FixImportContext, renderModuleFilePath: string): Promise<boolean>;

package/dist/actions/sync-images.js

@@ -19,10 +19,10 @@ const deps_1 = require("../deps");
 const config_utils_1 = require("../utils/config-utils");
 const file_utils_1 = require("../utils/file-utils");
 const lang_utils_1 = require("../utils/lang-utils");
-function syncProjectImageAssets(context, projectId, version, imageBundles, checksums) {
+function syncProjectImageAssets(context, projectId, branchName, version, imageBundles, checksums) {
     return __awaiter(this, void 0, void 0, function* () {
         const project = config_utils_1.getOrAddProjectConfig(context, projectId);
-        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId);
+        const projectLock = config_utils_1.getOrAddProjectLock(context, projectId, branchName);
         const knownImageConfigs = lodash_1.default.keyBy(project.images, (i) => i.id);
         const imageBundleIds = lodash_1.default.keyBy(imageBundles, (i) => i.id);
         const imageFileLocks = lodash_1.default.keyBy(projectLock.fileLocks.filter((fileLock) => fileLock.type === "image"), (fl) => fl.assetId);

package/dist/actions/sync-styles.d.ts

@@ -1,3 +1,3 @@
 import { StyleTokensMap } from "../api";
 import { PlasmicContext } from "../utils/config-utils";
-export declare function upsertStyleTokens(context: PlasmicContext, newStyleMap: StyleTokensMap): Promise<void>;
+export declare function upsertStyleTokens(context: PlasmicContext, newStyleMap: StyleTokensMap, projectId: string): Promise<void>;

package/dist/actions/sync-styles.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upsertStyleTokens = void 0;
 const error_1 = require("../utils/error");
 const file_utils_1 = require("../utils/file-utils");
-function upsertStyleTokens(context, newStyleMap) {
+function upsertStyleTokens(context, newStyleMap, projectId) {
     return __awaiter(this, void 0, void 0, function* () {
         const curStyleMap = yield readCurStyleMap(context);
         for (const prop of newStyleMap.props) {
@@ -24,6 +24,19 @@ function upsertStyleTokens(context, newStyleMap) {
                 curStyleMap.props.push(prop);
             }
         }
+        const allNewPropIds = new Set(newStyleMap.props.map((prop) => prop.meta.id));
+        curStyleMap.props = curStyleMap.props.filter((prop) => {
+            if (prop.meta.projectId !== projectId) {
+                // Keep all tokens from other projects
+                return true;
+            }
+            if (allNewPropIds.has(prop.meta.id)) {
+                // Keep the current tokens in this project
+                return true;
+            }
+            // Delete the tokens that have been removed from the project
+            return false;
+        });
         curStyleMap.props.sort((prop1, prop2) => prop1.name === prop2.name ? 0 : prop1.name < prop2.name ? -1 : 1);
         yield file_utils_1.writeFileContent(context, context.config.tokens.tokensFilePath, JSON.stringify(curStyleMap, undefined, 2), { force: true });
     });

package/dist/actions/sync.js

@@ -150,12 +150,13 @@ function sync(opts, metadataDefaults) {
         // Resolve what will be synced
         const projectConfigMap = lodash_1.default.keyBy(context.config.projects, (p) => p.projectId);
         const projectWithVersion = opts.projects.map((p) => {
-            var _a;
+            var _a, _b, _c;
             const [projectIdToken, versionRange] = p.split("@");
             const [projectId, projectApiToken] = projectIdToken.split(":");
             return {
                 projectId,
-                versionRange: versionRange || ((_a = projectConfigMap[projectId]) === null || _a === void 0 ? void 0 : _a.version) || "latest",
+                branchName: (_b = (_a = projectConfigMap[projectId]) === null || _a === void 0 ? void 0 : _a.projectBranchName) !== null && _b !== void 0 ? _b : "main",
+                versionRange: versionRange || ((_c = projectConfigMap[projectId]) === null || _c === void 0 ? void 0 : _c.version) || "latest",
                 componentIdOrNames: undefined,
                 projectApiToken: projectApiToken || projectIdToToken.get(projectId),
                 indirect: false,
@@ -163,13 +164,17 @@ function sync(opts, metadataDefaults) {
         });
         const projectSyncParams = projectWithVersion.length
             ? projectWithVersion
-            : context.config.projects.map((p) => ({
-                projectId: p.projectId,
-                versionRange: p.version,
-                componentIdOrNames: undefined,
-                projectApiToken: p.projectApiToken,
-                indirect: !!p.indirect,
-            }));
+            : context.config.projects.map((p) => {
+                var _a;
+                return ({
+                    projectId: p.projectId,
+                    branchName: (_a = p.projectBranchName) !== null && _a !== void 0 ? _a : "main",
+                    versionRange: p.version,
+                    componentIdOrNames: undefined,
+                    projectApiToken: p.projectApiToken,
+                    indirect: !!p.indirect,
+                });
+            });
         // Short-circuit if nothing to sync
         if (projectSyncParams.length === 0) {
             throw new error_1.HandledError("Don't know which projects to sync. Please specify via --projects");
@@ -224,7 +229,7 @@ function sync(opts, metadataDefaults) {
             // Sync in sequence (no parallelism)
             // going in reverse to get leaves of the dependency tree first
             for (const projectMeta of projectsToSync) {
-                yield syncProject(context, opts, projectIdsAndTokens, projectMeta.projectId, projectMeta.componentIds, projectMeta.version, projectMeta.dependencies, summary, pendingMerge, projectMeta.indirect, externalNpmPackages, externalCssImports, metadataDefaults);
+                yield syncProject(context, opts, projectIdsAndTokens, projectMeta.projectId, projectMeta.branchName, projectMeta.componentIds, projectMeta.version, projectMeta.dependencies, summary, pendingMerge, projectMeta.indirect, externalNpmPackages, externalCssImports, metadataDefaults);
             }
             // Materialize scheme into each component config.
             context.config.projects.forEach((p) => p.components.forEach((c) => {
@@ -339,7 +344,7 @@ function fixFileExtension(context) {
         });
     });
 }
-function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds, projectVersion, dependencies, summary, pendingMerge, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
+function syncProject(context, opts, projectIdsAndTokens, projectId, branchName, componentIds, projectVersion, dependencies, summary, pendingMerge, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const newComponentScheme = opts.newComponentScheme || context.config.code.scheme;
@@ -348,7 +353,7 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
         const projectApiToken = lang_utils_1.ensure((_a = projectIdsAndTokens.find((p) => p.projectId === projectId)) === null || _a === void 0 ? void 0 : _a.projectApiToken, `Could not find the API token for project ${projectId} in list: ${JSON.stringify(projectIdsAndTokens)}`);
         const existingChecksums = checksum_1.getChecksums(context, opts, projectId, componentIds);
         // Server-side code-gen
-        const projectBundle = yield context.api.projectComponents(projectId, {
+        const projectBundle = yield context.api.projectComponents(projectId, branchName, {
             platform: context.config.platform,
             newCompScheme: newComponentScheme,
             existingCompScheme,
@@ -378,12 +383,12 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
                 [theme.themeFileName, theme.themeModule] = code_utils_1.maybeConvertTsxToJsx(theme.themeFileName, theme.themeModule, opts.baseDir);
             });
         }
-        yield sync_global_variants_1.syncGlobalVariants(context, projectBundle.projectConfig, projectBundle.globalVariants, projectBundle.checksums, opts.baseDir);
-        yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, !!opts.appendJsxOnMissingBase, summary, pendingMerge, projectBundle.checksums, opts.baseDir, indirect);
+        yield sync_global_variants_1.syncGlobalVariants(context, projectBundle.projectConfig, projectBundle.globalVariants, projectBundle.checksums, branchName, opts.baseDir);
+        yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, branchName, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, !!opts.appendJsxOnMissingBase, summary, pendingMerge, projectBundle.checksums, opts.baseDir, indirect);
         syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
-        yield sync_styles_1.upsertStyleTokens(context, projectBundle.usedTokens);
-        yield sync_icons_1.syncProjectIconAssets(context, projectId, projectVersion, projectBundle.iconAssets, projectBundle.checksums, opts.baseDir);
-        yield sync_images_1.syncProjectImageAssets(context, projectId, projectVersion, projectBundle.imageAssets, projectBundle.checksums);
+        yield sync_styles_1.upsertStyleTokens(context, projectBundle.usedTokens, projectBundle.projectConfig.projectId);
+        yield sync_icons_1.syncProjectIconAssets(context, projectId, branchName, projectVersion, projectBundle.iconAssets, projectBundle.checksums, opts.baseDir);
+        yield sync_images_1.syncProjectImageAssets(context, projectId, branchName, projectVersion, projectBundle.imageAssets, projectBundle.checksums);
         (projectBundle.usedNpmPackages || []).forEach((pkg) => externalNpmPackages.add(pkg));
         (projectBundle.externalCssImports || []).forEach((css) => externalCssImports.add(css));
     });
@@ -398,7 +403,7 @@ function syncStyleConfig(context, response) {
         });
     });
 }
-function syncProjectConfig(context, projectBundle, projectApiToken, version, dependencies, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, checksums, baseDir, indirect) {
+function syncProjectConfig(context, projectBundle, projectApiToken, branchName, version, dependencies, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, checksums, baseDir, indirect) {
     return __awaiter(this, void 0, void 0, function* () {
         const defaultCssFilePath = file_utils_1.defaultResourcePath(context, projectBundle.projectName, projectBundle.cssFileName);
         const isNew = !context.config.projects.find((p) => p.projectId === projectBundle.projectId);
@@ -416,7 +421,7 @@ function syncProjectConfig(context, projectBundle, projectApiToken, version, dep
             projectConfig.cssFilePath = defaultCssFilePath;
         }
         // plasmic.lock
-        const projectLock = config_utils_1.getOrAddProjectLock(context, projectConfig.projectId);
+        const projectLock = config_utils_1.getOrAddProjectLock(context, projectConfig.projectId, branchName);
         projectLock.version = version;
         projectLock.dependencies = dependencies;
         projectLock.lang = context.config.code.lang;

package/dist/api.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="socket.io-client" />
 import { ProjectSyncMetadataModel } from "@plasmicapp/code-merger";
+import { Socket } from "socket.io-client";
 import { AuthConfig, CodeConfig, ImagesConfig, StyleConfig } from "./utils/config-utils";
 import { Metadata } from "./utils/get-context";
 export declare class AppServerError extends Error {
@@ -56,6 +56,7 @@ export interface ImageBundle {
 }
 export interface ProjectVersionMeta {
     projectId: string;
+    branchName: string;
     projectApiToken: string;
     version: string;
     projectName: string;
@@ -155,6 +156,7 @@ export declare class PlasmicApi {
      */
     resolveSync(projects: {
         projectId: string;
+        branchName: string;
         versionRange?: string;
         componentIdOrNames: readonly string[] | undefined;
         projectApiToken?: string;
@@ -164,9 +166,10 @@ export declare class PlasmicApi {
     latestCodegenVersion(): Promise<string>;
     /**
      * Code-gen endpoint.
-     * This will fetch components at an exact specified version.
+     * This will fetch components from a given branch at an exact specified version.
      * If you don't know what version should be used, call `resolveSync` first.
      * @param projectId
+     * @param branchName
      * @param cliVersion
      * @param reactWebVersion
      * @param newCompScheme
@@ -174,7 +177,7 @@ export declare class PlasmicApi {
      * @param componentIdOrNames
      * @param version
      */
-    projectComponents(projectId: string, opts: {
+    projectComponents(projectId: string, branchName: string, opts: {
         platform: string;
         newCompScheme: "blackbox" | "direct";
         existingCompScheme: Array<[string, "blackbox" | "direct"]>;
@@ -189,12 +192,12 @@ export declare class PlasmicApi {
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     projectMeta(projectId: string): Promise<ProjectMetaInfo>;
-    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui"): Promise<string>;
+    genLocalizationStrings(projects: readonly string[], format: "po" | "json" | "lingui", projectIdsAndTokens: ProjectIdAndToken[]): Promise<string>;
     uploadBundle(projectId: string, bundleName: string, bundleJs: string, css: string[], metaJson: string, genModulePath: string | undefined, genCssPaths: string[], pkgVersion: string | undefined, extraPropMetaJson: string | undefined, themeProviderWrapper: string | undefined, themeModule: string | undefined): Promise<StyleTokensMap>;
-    projectStyleTokens(projectId: string, versionRange?: string): Promise<StyleTokensMap>;
-    projectIcons(projectId: string, versionRange?: string, iconIds?: string[]): Promise<ProjectIconsResponse>;
-    projectSyncMetadata(projectId: string, revision: number, rethrowAppError: boolean): Promise<ProjectSyncMetadataModel>;
-    connectSocket(): SocketIOClient.Socket;
+    projectStyleTokens(projectId: string, branchName: string, versionRange?: string): Promise<StyleTokensMap>;
+    projectIcons(projectId: string, branchName: string, versionRange?: string, iconIds?: string[]): Promise<ProjectIconsResponse>;
+    projectSyncMetadata(projectId: string, branchName: string, revision: number, rethrowAppError: boolean): Promise<ProjectSyncMetadataModel>;
+    connectSocket(): Socket;
     private post;
     private get;
     private makeErrorMessage;

package/dist/api.js

@@ -77,9 +77,10 @@ class PlasmicApi {
     }
     /**
      * Code-gen endpoint.
-     * This will fetch components at an exact specified version.
+     * This will fetch components from a given branch at an exact specified version.
      * If you don't know what version should be used, call `resolveSync` first.
      * @param projectId
+     * @param branchName
      * @param cliVersion
      * @param reactWebVersion
      * @param newCompScheme
@@ -87,9 +88,9 @@ class PlasmicApi {
      * @param componentIdOrNames
      * @param version
      */
-    projectComponents(projectId, opts) {
+    projectComponents(projectId, branchName, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/components`, Object.assign({}, opts));
+            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/components?branchName=${branchName}`, Object.assign({}, opts));
             return result.data;
         });
     }
@@ -99,11 +100,15 @@ class PlasmicApi {
             return result.data;
         });
     }
-    genLocalizationStrings(projects, format) {
+    genLocalizationStrings(projects, format, projectIdsAndTokens) {
         return __awaiter(this, void 0, void 0, function* () {
             const result = yield this.get(`${this.codegenHost}/api/v1/localization/gen-texts?format=${format}&preview=true&${projects
                 .map((p) => `projectId=${p}`)
-                .join("&")}`);
+                .join("&")}`, undefined, {
+                "x-plasmic-api-project-tokens": projectIdsAndTokens
+                    .map(({ projectId, projectApiToken }) => `${projectId}:${projectApiToken}`)
+                    .join(","),
+            });
             return result.data;
         });
     }
@@ -125,26 +130,26 @@ class PlasmicApi {
             return result.data;
         });
     }
-    projectStyleTokens(projectId, versionRange) {
+    projectStyleTokens(projectId, branchName, versionRange) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/tokens`, { versionRange });
+            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/tokens?branchName=${branchName}`, { versionRange });
             return result.data;
         });
     }
-    projectIcons(projectId, versionRange, iconIds) {
+    projectIcons(projectId, branchName, versionRange, iconIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/icons`, { versionRange, iconIds });
+            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/icons?branchName=${branchName}`, { versionRange, iconIds });
             return result.data;
         });
     }
-    projectSyncMetadata(projectId, revision, rethrowAppError) {
+    projectSyncMetadata(projectId, branchName, revision, rethrowAppError) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/project-sync-metadata`, { revision }, rethrowAppError);
+            const result = yield this.post(`${this.codegenHost}/api/v1/projects/${projectId}/code/project-sync-metadata?branchName=${branchName}`, { revision }, rethrowAppError);
             return code_merger_1.ProjectSyncMetadataModel.fromJson(result.data);
         });
     }
     connectSocket() {
-        const socket = socket_io_client_1.default.connect(this.studioHost, {
+        const socket = socket_io_client_1.default(this.studioHost, {
             path: `/api/v1/socket`,
             transportOptions: {
                 polling: {
@@ -176,11 +181,11 @@ class PlasmicApi {
             }
         });
     }
-    get(url, rethrowAppError) {
+    get(url, rethrowAppError, extraHeaders) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 return yield axios_1.default.get(url, {
-                    headers: this.makeHeaders(),
+                    headers: Object.assign(Object.assign({}, this.makeHeaders()), (extraHeaders !== null && extraHeaders !== void 0 ? extraHeaders : {})),
                 });
             }
             catch (e) {