@plasmicapp/cli 0.1.190 → 0.1.192

package/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Plasmic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/build.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-yarn eslint 'src/**'
+./node_modules/.bin/eslint 'src/**'
 tsc
 cp ./tsconfig-transform.json ./dist
 typescript-json-schema tsconfig.json 'PlasmicConfig' --excludePrivate --required > ./dist/plasmic.schema.json

package/dist/__mocks__/api.js

@@ -277,11 +277,6 @@ class PlasmicApi {
             throw new Error("Unimplemented");
         });
     }
-    projectSyncMetadata(projectId, revision, rethrowAppError) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("Unimplemented");
-        });
-    }
     latestCodegenVersion() {
         return __awaiter(this, void 0, void 0, function* () {
             return "0.0.1";

package/dist/__tests__/code-utils-spec.js

@@ -346,7 +346,6 @@ function _CodeSandboxDialogContent(props) {
     canEdit: !sc.canEditProject() ? "no" : undefined,
     scheme: codeScheme === "direct" ? "direct" : "blackbox",
   };
-
   const args = {};
   // The following code block is fully managed by Plasmic. Don't edit - it will
   // be overwritten after every "plasmic sync".

package/dist/actions/init.d.ts

@@ -3,7 +3,7 @@ export interface InitArgs extends CommonArgs {
     host: string;
     platform: "" | "react" | "nextjs" | "gatsby";
     codeLang: "" | "ts" | "js";
-    codeScheme: "" | "blackbox" | "direct";
+    codeScheme: "" | "blackbox";
     styleScheme: "" | "css" | "css-modules";
     imagesScheme: "" | "inlined" | "files" | "public-files";
     imagesPublicDir: string;

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

@@ -6,6 +6,6 @@ export interface LocalizationStringsArgs extends CommonArgs {
     format: "po" | "json" | "lingui";
     output: string;
     forceOverwrite: boolean;
-    keyScheme: "content" | "hash";
+    keyScheme: "content" | "hash" | undefined;
 }
 export declare function localizationStrings(opts: LocalizationStringsArgs): Promise<void>;

package/dist/actions/localization-strings.js

@@ -24,7 +24,7 @@ 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;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         if (!opts.projects || opts.projects.length === 0) {
             throw new lib_1.HandledError(`Missing projects.`);
@@ -46,6 +46,7 @@ function localizationStrings(opts) {
                 ? "data.po"
                 : "data.json"
             : opts.output;
+        let keyScheme = opts.keyScheme;
         const projectTokensFromConfig = [];
         const auth = yield auth_utils_1.getCurrentAuth(opts.auth);
         const maybeConfigFile = opts.config || config_utils_1.findConfigFile(opts.baseDir, { traverseParents: true });
@@ -54,6 +55,9 @@ function localizationStrings(opts) {
             context.config.projects.forEach((p) => {
                 projectTokensFromConfig.push(lodash_1.pick(p, "projectId", "projectApiToken"));
             });
+            if (!keyScheme) {
+                keyScheme = (_b = context.config.i18n) === null || _b === void 0 ? void 0 : _b.keyScheme;
+            }
         }
         const projectIdsAndTokens = [
             ...parsedProjectTokens,
@@ -66,7 +70,7 @@ function localizationStrings(opts) {
                 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, opts.keyScheme, projectIdsAndTokens);
+            const data = yield api.genLocalizationStrings(opts.projects, opts.format, keyScheme !== null && keyScheme !== void 0 ? keyScheme : "content", 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) {

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

@@ -1,10 +1,4 @@
 import { ChecksumBundle, ComponentBundle } from "../api";
 import { ComponentUpdateSummary } from "../utils/code-utils";
 import { PlasmicContext, ProjectConfig, ProjectLock } from "../utils/config-utils";
-export interface ComponentPendingMerge {
-    skeletonModulePath: string;
-    editedSkeletonFile: string;
-    newSkeletonFile: string;
-    merge: (resolvedNewSkeletonFile: string, resolvedEditedSkeletonFile: string) => Promise<void>;
-}
-export declare function syncProjectComponents(context: PlasmicContext, project: ProjectConfig, version: string, componentBundles: ComponentBundle[], forceOverwrite: boolean, appendJsxOnMissingBase: boolean, summary: Map<string, ComponentUpdateSummary>, pendingMerge: ComponentPendingMerge[], projectLock: ProjectLock, checksums: ChecksumBundle, baseDir: string): Promise<void>;
+export declare function syncProjectComponents(context: PlasmicContext, project: ProjectConfig, version: string, componentBundles: ComponentBundle[], forceOverwrite: boolean, summary: Map<string, ComponentUpdateSummary>, projectLock: ProjectLock, checksums: ChecksumBundle, baseDir: string): Promise<void>;

package/dist/actions/sync-components.js

@@ -13,59 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncProjectComponents = void 0;
-const code_merger_1 = require("@plasmicapp/code-merger");
 const lodash_1 = __importDefault(require("lodash"));
 const upath_1 = __importDefault(require("upath"));
-const api_1 = require("../api");
 const deps_1 = require("../deps");
 const code_utils_1 = require("../utils/code-utils");
 const config_utils_1 = require("../utils/config-utils");
-const error_1 = require("../utils/error");
 const file_utils_1 = require("../utils/file-utils");
 const lang_utils_1 = require("../utils/lang-utils");
 const user_utils_1 = require("../utils/user-utils");
-const updateDirectSkeleton = (newFileContent, editedFileContent, context, compConfig, forceOverwrite, nameInIdToUuid, appendJsxOnMissingBase) => __awaiter(void 0, void 0, void 0, function* () {
-    // merge code!
-    const componentByUuid = new Map();
-    componentByUuid.set(compConfig.id, {
-        editedFile: editedFileContent,
-        newFile: newFileContent,
-        newNameInIdToUuid: new Map(nameInIdToUuid),
-    });
-    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, "main", revision, true);
-        }
-        catch (e) {
-            if (e instanceof api_1.AppServerError &&
-                /revision \d+ not found/.test(e.message)) {
-                throw e;
-            }
-            else {
-                lang_utils_1.assert(e instanceof Error);
-                throw new error_1.HandledError(e.message);
-            }
-        }
-    })), () => { }, appendJsxOnMissingBase);
-    const merged = mergedFiles === null || mergedFiles === void 0 ? void 0 : mergedFiles.get(compConfig.id);
-    if (merged) {
-        yield file_utils_1.writeFileContent(context, compConfig.importSpec.modulePath, merged, {
-            force: true,
-        });
-    }
-    else {
-        if (!forceOverwrite) {
-            throw new error_1.HandledError(`Cannot merge ${compConfig.importSpec.modulePath}. If you just switched the code scheme for the component from blackbox to direct, use --force-overwrite option to force the switch.`);
-        }
-        else {
-            deps_1.logger.warn(`Overwrite ${compConfig.importSpec.modulePath} despite merge failure`);
-            yield file_utils_1.writeFileContent(context, compConfig.importSpec.modulePath, newFileContent, {
-                force: true,
-            });
-        }
-    }
-});
-function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, projectLock, checksums, baseDir) {
+function syncProjectComponents(context, project, version, componentBundles, forceOverwrite, summary, projectLock, checksums, baseDir) {
     return __awaiter(this, void 0, void 0, function* () {
         const componentsFromChecksums = new Set([
             ...checksums.cssRulesChecksums.map(([id, _]) => id),
@@ -181,16 +137,7 @@ function syncProjectComponents(context, project, version, componentBundles, forc
                 }
                 compConfig.plumeType = plumeType;
                 if (scheme === "direct") {
-                    // We cannot merge right now, but wait until all the imports are resolved
-                    pendingMerge.push({
-                        skeletonModulePath: compConfig.importSpec.modulePath,
-                        editedSkeletonFile: editedFile,
-                        newSkeletonFile: skeletonModule,
-                        merge: (resolvedNewFile, resolvedEditedFile) => __awaiter(this, void 0, void 0, function* () {
-                            return updateDirectSkeleton(resolvedNewFile, resolvedEditedFile, context, compConfig, forceOverwrite, nameInIdToUuid, appendJsxOnMissingBase);
-                        }),
-                    });
-                    skeletonModuleModified = true;
+                    throw new Error(`Direct update codegen scheme is no longer supported`);
                 }
                 else if (/\/\/\s*plasmic-managed-jsx\/\d+/.test(editedFile)) {
                     if (forceOverwrite) {

package/dist/actions/sync.d.ts

@@ -3,8 +3,6 @@ import { Metadata } from "../utils/get-context";
 export interface SyncArgs extends CommonArgs {
     projects: readonly string[];
     forceOverwrite: boolean;
-    newComponentScheme?: "blackbox" | "direct";
-    appendJsxOnMissingBase?: boolean;
     yes?: boolean;
     force?: boolean;
     nonRecursive?: boolean;

package/dist/actions/sync.js

@@ -208,7 +208,6 @@ function sync(opts, metadataDefaults) {
             return;
         }
         const summary = new Map();
-        const pendingMerge = new Array();
         // The resolveSync call returns the project API tokens for all relevant projects (sources and dependencies).
         // resolveSync is what does this because it's what is computing all concrete versions to sync, and the dependency
         // graph can change with any version. Subsequent API calls require the exact API tokens, not to redo this work on each
@@ -229,7 +228,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.branchName, 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, projectMeta.indirect, externalNpmPackages, externalCssImports, metadataDefaults);
             }
             // Materialize scheme into each component config.
             context.config.projects.forEach((p) => p.components.forEach((c) => {
@@ -253,13 +252,6 @@ function sync(opts, metadataDefaults) {
                     }
                 });
             }
-            // Fix imports
-            const fixImportContext = code_utils_1.mkFixImportContext(context.config);
-            for (const m of pendingMerge) {
-                const resolvedEditedFile = code_utils_1.replaceImports(context, m.editedSkeletonFile, m.skeletonModulePath, fixImportContext, true, baseDir);
-                const resolvedNewFile = code_utils_1.replaceImports(context, m.newSkeletonFile, m.skeletonModulePath, fixImportContext, true, baseDir);
-                yield m.merge(resolvedNewFile, resolvedEditedFile);
-            }
             // Now we know config.components are all correct, so we can go ahead and fix up all the import statements
             yield code_utils_1.fixAllImportStatements(context, opts.baseDir, summary);
             if (process.env.PLASMIC_LOADER) {
@@ -344,10 +336,9 @@ function fixFileExtension(context) {
         });
     });
 }
-function syncProject(context, opts, projectIdsAndTokens, projectId, branchName, componentIds, projectVersion, dependencies, summary, pendingMerge, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
+function syncProject(context, opts, projectIdsAndTokens, projectId, branchName, componentIds, projectVersion, dependencies, summary, indirect, externalNpmPackages, externalCssImports, metadataDefaults) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const newComponentScheme = opts.newComponentScheme || context.config.code.scheme;
         const existingProject = context.config.projects.find((p) => p.projectId === projectId);
         const existingCompScheme = ((existingProject === null || existingProject === void 0 ? void 0 : existingProject.components) || []).map((c) => [c.id, c.scheme]);
         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)}`);
@@ -355,12 +346,11 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, branchName,
         // Server-side code-gen
         const projectBundle = yield context.api.projectComponents(projectId, branchName, {
             platform: context.config.platform,
-            newCompScheme: newComponentScheme,
-            existingCompScheme,
             componentIdOrNames: componentIds,
             version: projectVersion,
             imageOpts: context.config.images,
             stylesOpts: context.config.style,
+            i18nOpts: context.config.i18n,
             checksums: existingChecksums,
             codeOpts: context.config.code,
             metadata: get_context_1.generateMetadata(Object.assign(Object.assign({}, metadataDefaults), { platform: context.config.platform }), opts.metadata),
@@ -384,7 +374,7 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, branchName,
             });
         }
         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);
+        yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, branchName, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, summary, projectBundle.checksums, opts.baseDir, indirect);
         syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
         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);
@@ -403,7 +393,7 @@ function syncStyleConfig(context, response) {
         });
     });
 }
-function syncProjectConfig(context, projectBundle, projectApiToken, branchName, version, dependencies, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, checksums, baseDir, indirect) {
+function syncProjectConfig(context, projectBundle, projectApiToken, branchName, version, dependencies, componentBundles, forceOverwrite, summary, 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);
@@ -470,7 +460,7 @@ function syncProjectConfig(context, projectBundle, projectApiToken, branchName,
         }
         yield sync_global_contexts_1.syncGlobalContexts(context, projectBundle, projectConfig, projectLock, checksums, baseDir);
         // Write out components
-        yield sync_components_1.syncProjectComponents(context, projectConfig, version, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, projectLock, checksums, baseDir);
+        yield sync_components_1.syncProjectComponents(context, projectConfig, version, componentBundles, forceOverwrite, summary, projectLock, checksums, baseDir);
     });
 }
 function syncCodeComponentsMeta(context, projectId, codeComponentBundles) {

package/dist/api.d.ts

@@ -1,6 +1,5 @@
-import { ProjectSyncMetadataModel } from "@plasmicapp/code-merger";
 import { Socket } from "socket.io-client";
-import { AuthConfig, CodeConfig, ImagesConfig, StyleConfig } from "./utils/config-utils";
+import { AuthConfig, CodeConfig, I18NConfig, ImagesConfig, StyleConfig } from "./utils/config-utils";
 import { Metadata } from "./utils/get-context";
 export declare class AppServerError extends Error {
     constructor(message: string);
@@ -179,12 +178,11 @@ export declare class PlasmicApi {
      */
     projectComponents(projectId: string, branchName: string, opts: {
         platform: string;
-        newCompScheme: "blackbox" | "direct";
-        existingCompScheme: Array<[string, "blackbox" | "direct"]>;
         componentIdOrNames: readonly string[] | undefined;
         version: string;
         imageOpts: ImagesConfig;
         stylesOpts: StyleConfig;
+        i18nOpts?: I18NConfig;
         codeOpts: CodeConfig;
         checksums: ChecksumBundle;
         indirect: boolean;
@@ -196,7 +194,6 @@ export declare class PlasmicApi {
     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, 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;

package/dist/api.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlasmicApi = exports.AppServerError = void 0;
-const code_merger_1 = require("@plasmicapp/code-merger");
 const axios_1 = __importDefault(require("axios"));
 const socket_io_client_1 = __importDefault(require("socket.io-client"));
 const config_utils_1 = require("./utils/config-utils");
@@ -142,12 +141,6 @@ class PlasmicApi {
             return result.data;
         });
     }
-    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?branchName=${branchName}`, { revision }, rethrowAppError);
-            return code_merger_1.ProjectSyncMetadataModel.fromJson(result.data);
-        });
-    }
     connectSocket() {
         const socket = socket_io_client_1.default(this.studioHost, {
             path: `/api/v1/socket`,

package/dist/index.js

@@ -205,10 +205,9 @@ yargs_1.default
     default: "json",
 })
     .option("key-scheme", {
-    describe: "What value to use as message keys; either the message content itself, or a hash of it",
+    describe: "What value to use as message keys; either the message content itself, or a hash of it. Defaults to whatever is specified in plasmic.json, or `content`",
     type: "string",
     choices: ["content", "hash"],
-    default: "content",
 })
     .option("output", {
     alias: "o",
@@ -257,16 +256,6 @@ function configureSyncArgs(yags, includeQuietOption = true) {
         type: "boolean",
         describe: "Overwrite the skeleton file with newly generated version. Useful when switching between codegen schemes.",
         default: false,
-    })
-        .option("append-jsx-on-missing-base", {
-        type: "boolean",
-        describe: "When the base metadata is missing to perform the three-way merge for direct edit component, append the jsx of the new version so that user can perform manual merge.",
-        default: false,
-    })
-        .option("new-component-scheme", {
-        type: "string",
-        choices: ["blackbox", "direct"],
-        describe: "Sync the new components using this code scheme rather than the default code scheme.",
     })
         .option("ignore-post-sync", {
         type: "boolean",

package/dist/plasmic.schema.json

@@ -40,8 +40,7 @@
                 "scheme": {
                     "description": "The default code generation scheme. Each component can override the scheme.",
                     "enum": [
-                        "blackbox",
-                        "direct"
+                        "blackbox"
                     ],
                     "type": "string"
                 }
@@ -161,6 +160,22 @@
             ],
             "type": "object"
         },
+        "I18NConfig": {
+            "properties": {
+                "keyScheme": {
+                    "description": "For localization, whether the extracted strings are keyed by its content\nor by a hash of its content",
+                    "enum": [
+                        "content",
+                        "hash"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "keyScheme"
+            ],
+            "type": "object"
+        },
         "IconConfig": {
             "properties": {
                 "id": {
@@ -414,6 +429,10 @@
             "$ref": "#/definitions/GlobalVariantsConfig",
             "description": "Metadata for global variant groups"
         },
+        "i18n": {
+            "$ref": "#/definitions/I18NConfig",
+            "description": "Configuration for localization"
+        },
         "images": {
             "$ref": "#/definitions/ImagesConfig",
             "description": "Config for pictures"

package/dist/test-common/fixtures.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectProjectAndDepPlasmicJson = exports.expectProject1PlasmicJson = exports.project1Config = exports.expectProject1Components = exports.standardTestTeardown = exports.standardTestSetup = exports.defaultPlasmicJson = exports.tmpRepo = exports.opts = exports.mockApi = void 0;
+/// <reference types="@types/jest" />
 const lodash_1 = __importDefault(require("lodash"));
 const test_utils_1 = require("../utils/test-utils");
 jest.mock("../api");
@@ -91,8 +92,6 @@ function standardTestSetup(includeDep = true) {
         nonRecursive: false,
         skipUpgradeCheck: true,
         forceOverwrite: true,
-        newComponentScheme: "blackbox",
-        appendJsxOnMissingBase: false,
         config: exports.tmpRepo.plasmicJsonPath(),
         auth: exports.tmpRepo.plasmicAuthPath(),
         loaderConfig: exports.tmpRepo.plasmicLoaderJsonPath(),

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

@@ -60,6 +60,8 @@ export interface PlasmicConfig {
     wrapPagesWithGlobalContexts: boolean;
     /** The version of cli when this file was written */
     cliVersion?: string;
+    /** Configuration for localization */
+    i18n?: I18NConfig;
     /** Arbitrary command to run after `plasmic sync` has run; useful for linting and code formatting synced files */
     postSyncCommands?: string[];
 }
@@ -67,7 +69,7 @@ export interface CodeConfig {
     /** Language to generate code in */
     lang: "ts" | "js";
     /** The default code generation scheme. Each component can override the scheme. */
-    scheme: "blackbox" | "direct";
+    scheme: "blackbox";
     reactRuntime: "classic" | "automatic";
 }
 export interface StyleConfig {
@@ -235,6 +237,13 @@ export interface ProjectLock {
     fileLocks: FileLock[];
     codegenVersion?: string;
 }
+export interface I18NConfig {
+    /**
+     * For localization, whether the extracted strings are keyed by its content
+     * or by a hash of its content
+     */
+    keyScheme: "content" | "hash";
+}
 export interface PlasmicLock {
     projects: ProjectLock[];
     cliVersion?: string;

package/dist/utils/semver.d.ts

@@ -10,14 +10,14 @@ export declare const latestTag = "latest";
 export declare const isLatest: (v: string) => boolean;
 export declare const valid: (v: string) => string | null;
 export declare const inc: (v: string, release: semverlib.ReleaseType) => string | null;
-export declare const prerelease: (v: string) => readonly string[] | null;
+export declare const prerelease: (v: string) => readonly (string | number)[] | null;
 export declare const major: (v: string) => number | "latest";
 export declare const minor: (v: string) => number | "latest";
 export declare const patch: (v: string) => number | "latest";
 export declare const eq: (v1: string, v2: string) => boolean;
 export declare const gt: (v1: string, v2: string) => boolean;
 export declare const lt: (v1: string, v2: string) => boolean;
-export declare const validRange: (range: string) => string;
+export declare const validRange: (range: string) => string | null;
 export declare const satisfies: (v: string, range: string) => boolean;
 export declare const toTildeRange: (v: string) => string | null;
 export declare const toCaretRange: (v: string) => string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.190",
+  "version": "0.1.192",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -51,7 +51,6 @@
     "@babel/generator": "^7.12.1",
     "@babel/parser": "^7.12.3",
     "@babel/traverse": "^7.12.1",
-    "@plasmicapp/code-merger": "^0.0.33",
     "@sentry/node": "^5.19.2",
     "axios": "^0.21.1",
     "chalk": "^4.1.0",
@@ -77,5 +76,6 @@
     "winston": "^3.3.3",
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
-  }
+  },
+  "gitHead": "e282c9cca3a168a822b34a1a5e6de3a6a072c00f"
 }

package/src/__mocks__/api.ts

@@ -1,4 +1,3 @@
-import { ProjectSyncMetadataModel } from "@plasmicapp/code-merger";
 import L from "lodash";
 import {
   ChecksumBundle,
@@ -386,14 +385,6 @@ class PlasmicApi {
     throw new Error("Unimplemented");
   }
 
-  async projectSyncMetadata(
-    projectId: string,
-    revision: number,
-    rethrowAppError: boolean
-  ): Promise<ProjectSyncMetadataModel> {
-    throw new Error("Unimplemented");
-  }
-
   async latestCodegenVersion(): Promise<string> {
     return "0.0.1";
   }

package/src/__tests__/code-utils-spec.ts

@@ -351,7 +351,6 @@ function _CodeSandboxDialogContent(props) {
     canEdit: !sc.canEditProject() ? "no" : undefined,
     scheme: codeScheme === "direct" ? "direct" : "blackbox",
   };
-
   const args = {};
   // The following code block is fully managed by Plasmic. Don't edit - it will
   // be overwritten after every "plasmic sync".
@@ -543,7 +542,7 @@ function _CodeSandboxDialogContent(props) {
       "/tmp/CodeSandbox.tsx",
       fixImportContext,
       false,
-      process.cwd(),
+      process.cwd()
     );
     const expectedCode = `// This is a skeleton starter React component generated by Plasmic.
 import React, { ReactNode } from "react";
@@ -622,7 +621,7 @@ function _CodeSandboxDialogContent(props) {
       "/tmp/CodeSandbox.tsx",
       fixImportContext,
       true,
-      process.cwd(),
+      process.cwd()
     );
     const expectedCode = `// This is a skeleton starter React component generated by Plasmic.
 import React, { ReactNode } from "react";
@@ -702,7 +701,7 @@ function _CodeSandboxDialogContent(props) {
       "/tmp/CodeSandbox.tsx",
       fixImportContext,
       false,
-      process.cwd(),
+      process.cwd()
     );
     const expectedCode = `// This is a skeleton starter React component generated by Plasmic.
 import React, { ReactNode } from "react";

package/src/actions/init.ts

@@ -34,7 +34,7 @@ export interface InitArgs extends CommonArgs {
   host: string;
   platform: "" | "react" | "nextjs" | "gatsby";
   codeLang: "" | "ts" | "js";
-  codeScheme: "" | "blackbox" | "direct";
+  codeScheme: "" | "blackbox";
   styleScheme: "" | "css" | "css-modules";
   imagesScheme: "" | "inlined" | "files" | "public-files";
   imagesPublicDir: string;

package/src/actions/localization-strings.ts

@@ -17,7 +17,7 @@ export interface LocalizationStringsArgs extends CommonArgs {
   format: "po" | "json" | "lingui";
   output: string;
   forceOverwrite: boolean;
-  keyScheme: "content" | "hash";
+  keyScheme: "content" | "hash" | undefined;
 }
 
 export async function localizationStrings(
@@ -46,6 +46,7 @@ export async function localizationStrings(
       ? "data.po"
       : "data.json"
     : opts.output;
+  let keyScheme = opts.keyScheme;
   const projectTokensFromConfig: ProjectIdAndToken[] = [];
   const auth = await getCurrentAuth(opts.auth);
   const maybeConfigFile =
@@ -55,6 +56,9 @@ export async function localizationStrings(
     context.config.projects.forEach((p) => {
       projectTokensFromConfig.push(pick(p, "projectId", "projectApiToken"));
     });
+    if (!keyScheme) {
+      keyScheme = context.config.i18n?.keyScheme;
+    }
   }
 
   const projectIdsAndTokens = [
@@ -78,7 +82,7 @@ export async function localizationStrings(
     const data = await api.genLocalizationStrings(
       opts.projects,
       opts.format,
-      opts.keyScheme,
+      keyScheme ?? "content",
       projectIdsAndTokens
     );
     if (existsBuffered(output)) {

package/src/actions/sync-components.ts

@@ -1,22 +1,15 @@
-import {
-  ComponentInfoForMerge,
-  makeCachedProjectSyncDataProvider,
-  mergeFiles,
-} from "@plasmicapp/code-merger";
 import L from "lodash";
 import path from "upath";
-import { AppServerError, ChecksumBundle, ComponentBundle } from "../api";
+import { ChecksumBundle, ComponentBundle } from "../api";
 import { logger } from "../deps";
 import { ComponentUpdateSummary, formatAsLocal } from "../utils/code-utils";
 import {
-  ComponentConfig,
   CONFIG_FILE_NAME,
   isPageAwarePlatform,
   PlasmicContext,
   ProjectConfig,
   ProjectLock,
 } from "../utils/config-utils";
-import { HandledError } from "../utils/error";
 import {
   defaultPagePath,
   defaultResourcePath,
@@ -30,96 +23,13 @@ import {
 import { assert, ensure } from "../utils/lang-utils";
 import { confirmWithUser } from "../utils/user-utils";
 
-export interface ComponentPendingMerge {
-  // path of the skeleton module
-  skeletonModulePath: string;
-  editedSkeletonFile: string;
-  newSkeletonFile: string;
-  // function to perform code merger using input whose import has been resolved.
-  merge: (
-    resolvedNewSkeletonFile: string,
-    resolvedEditedSkeletonFile: string
-  ) => Promise<void>;
-}
-
-const updateDirectSkeleton = async (
-  newFileContent: string,
-  editedFileContent: string,
-  context: PlasmicContext,
-  compConfig: ComponentConfig,
-  forceOverwrite: boolean,
-  nameInIdToUuid: [string, string][],
-  appendJsxOnMissingBase: boolean
-) => {
-  // merge code!
-  const componentByUuid = new Map<string, ComponentInfoForMerge>();
-
-  componentByUuid.set(compConfig.id, {
-    editedFile: editedFileContent,
-    newFile: newFileContent,
-    newNameInIdToUuid: new Map(nameInIdToUuid),
-  });
-  const mergedFiles = await mergeFiles(
-    componentByUuid,
-    compConfig.projectId,
-    makeCachedProjectSyncDataProvider(async (projectId, revision) => {
-      try {
-        return await context.api.projectSyncMetadata(
-          projectId,
-          "main",
-          revision,
-          true
-        );
-      } catch (e) {
-        if (
-          e instanceof AppServerError &&
-          /revision \d+ not found/.test(e.message)
-        ) {
-          throw e;
-        } else {
-          assert(e instanceof Error);
-          throw new HandledError(e.message);
-        }
-      }
-    }),
-    () => {},
-    appendJsxOnMissingBase
-  );
-  const merged = mergedFiles?.get(compConfig.id);
-  if (merged) {
-    await writeFileContent(context, compConfig.importSpec.modulePath, merged, {
-      force: true,
-    });
-  } else {
-    if (!forceOverwrite) {
-      throw new HandledError(
-        `Cannot merge ${compConfig.importSpec.modulePath}. If you just switched the code scheme for the component from blackbox to direct, use --force-overwrite option to force the switch.`
-      );
-    } else {
-      logger.warn(
-        `Overwrite ${compConfig.importSpec.modulePath} despite merge failure`
-      );
-      await writeFileContent(
-        context,
-        compConfig.importSpec.modulePath,
-        newFileContent,
-        {
-          force: true,
-        }
-      );
-    }
-  }
-};
-
 export async function syncProjectComponents(
   context: PlasmicContext,
   project: ProjectConfig,
   version: string,
   componentBundles: ComponentBundle[],
   forceOverwrite: boolean,
-  appendJsxOnMissingBase: boolean,
   summary: Map<string, ComponentUpdateSummary>,
-  pendingMerge: ComponentPendingMerge[],
   projectLock: ProjectLock,
   checksums: ChecksumBundle,
   baseDir: string
@@ -324,23 +234,7 @@ export async function syncProjectComponents(
       compConfig.plumeType = plumeType;
 
       if (scheme === "direct") {
-        // We cannot merge right now, but wait until all the imports are resolved
-        pendingMerge.push({
-          skeletonModulePath: compConfig.importSpec.modulePath,
-          editedSkeletonFile: editedFile,
-          newSkeletonFile: skeletonModule,
-          merge: async (resolvedNewFile, resolvedEditedFile) =>
-            updateDirectSkeleton(
-              resolvedNewFile,
-              resolvedEditedFile,
-              context,
-              compConfig,
-              forceOverwrite,
-              nameInIdToUuid,
-              appendJsxOnMissingBase
-            ),
-        });
-        skeletonModuleModified = true;
+        throw new Error(`Direct update codegen scheme is no longer supported`);
       } else if (/\/\/\s*plasmic-managed-jsx\/\d+/.test(editedFile)) {
         if (forceOverwrite) {
           skeletonModuleModified = true;

package/src/actions/sync.ts

@@ -18,8 +18,6 @@ import {
   fixAllImportStatements,
   formatAsLocal,
   maybeConvertTsxToJsx,
-  mkFixImportContext,
-  replaceImports,
 } from "../utils/code-utils";
 import {
   CONFIG_FILE_NAME,
@@ -56,10 +54,7 @@ import {
 import { checkVersionResolution } from "../utils/resolve-utils";
 import * as semver from "../utils/semver";
 import { confirmWithUser } from "../utils/user-utils";
-import {
-  ComponentPendingMerge,
-  syncProjectComponents,
-} from "./sync-components";
+import { syncProjectComponents } from "./sync-components";
 import { syncGlobalContexts } from "./sync-global-contexts";
 import { syncGlobalVariants } from "./sync-global-variants";
 import { syncProjectIconAssets } from "./sync-icons";
@@ -69,8 +64,6 @@ import { upsertStyleTokens } from "./sync-styles";
 export interface SyncArgs extends CommonArgs {
   projects: readonly string[];
   forceOverwrite: boolean;
-  newComponentScheme?: "blackbox" | "direct";
-  appendJsxOnMissingBase?: boolean;
   yes?: boolean;
   force?: boolean;
   nonRecursive?: boolean;
@@ -315,7 +308,6 @@ export async function sync(
     return;
   }
   const summary = new Map<string, ComponentUpdateSummary>();
-  const pendingMerge = new Array<ComponentPendingMerge>();
 
   // The resolveSync call returns the project API tokens for all relevant projects (sources and dependencies).
   // resolveSync is what does this because it's what is computing all concrete versions to sync, and the dependency
@@ -348,7 +340,6 @@ export async function sync(
         projectMeta.version,
         projectMeta.dependencies,
         summary,
-        pendingMerge,
         projectMeta.indirect,
         externalNpmPackages,
         externalCssImports,
@@ -388,27 +379,6 @@ export async function sync(
       });
     }
 
-    // Fix imports
-    const fixImportContext = mkFixImportContext(context.config);
-    for (const m of pendingMerge) {
-      const resolvedEditedFile = replaceImports(
-        context,
-        m.editedSkeletonFile,
-        m.skeletonModulePath,
-        fixImportContext,
-        true,
-        baseDir
-      );
-      const resolvedNewFile = replaceImports(
-        context,
-        m.newSkeletonFile,
-        m.skeletonModulePath,
-        fixImportContext,
-        true,
-        baseDir
-      );
-      await m.merge(resolvedNewFile, resolvedEditedFile);
-    }
     // Now we know config.components are all correct, so we can go ahead and fix up all the import statements
     await fixAllImportStatements(context, opts.baseDir, summary);
 
@@ -565,14 +535,11 @@ async function syncProject(
   projectVersion: string,
   dependencies: { [projectId: string]: string },
   summary: Map<string, ComponentUpdateSummary>,
-  pendingMerge: ComponentPendingMerge[],
   indirect: boolean,
   externalNpmPackages: Set<string>,
   externalCssImports: Set<string>,
   metadataDefaults?: Metadata
 ): Promise<void> {
-  const newComponentScheme =
-    opts.newComponentScheme || context.config.code.scheme;
   const existingProject = context.config.projects.find(
     (p) => p.projectId === projectId
   );
@@ -600,12 +567,11 @@ async function syncProject(
     branchName,
     {
       platform: context.config.platform,
-      newCompScheme: newComponentScheme,
-      existingCompScheme,
       componentIdOrNames: componentIds,
       version: projectVersion,
       imageOpts: context.config.images,
       stylesOpts: context.config.style,
+      i18nOpts: context.config.i18n,
       checksums: existingChecksums,
       codeOpts: context.config.code,
       metadata: generateMetadata(
@@ -674,9 +640,7 @@ async function syncProject(
     dependencies,
     projectBundle.components,
     opts.forceOverwrite,
-    !!opts.appendJsxOnMissingBase,
     summary,
-    pendingMerge,
     projectBundle.checksums,
     opts.baseDir,
     indirect
@@ -737,9 +701,7 @@ async function syncProjectConfig(
   dependencies: { [projectId: string]: string },
   componentBundles: ComponentBundle[],
   forceOverwrite: boolean,
-  appendJsxOnMissingBase: boolean,
   summary: Map<string, ComponentUpdateSummary>,
-  pendingMerge: ComponentPendingMerge[],
   checksums: ChecksumBundle,
   baseDir: string,
   indirect: boolean
@@ -858,9 +820,7 @@ async function syncProjectConfig(
     version,
     componentBundles,
     forceOverwrite,
-    appendJsxOnMissingBase,
     summary,
-    pendingMerge,
     projectLock,
     checksums,
     baseDir

package/src/api.ts

@@ -1,10 +1,10 @@
-import { ProjectSyncMetadataModel } from "@plasmicapp/code-merger";
 import axios, { AxiosError } from "axios";
 import socketio, { Socket } from "socket.io-client";
 import {
   AuthConfig,
   CodeConfig,
   DEFAULT_HOST,
+  I18NConfig,
   ImagesConfig,
   StyleConfig,
 } from "./utils/config-utils";
@@ -261,13 +261,11 @@ export class PlasmicApi {
     branchName: string,
     opts: {
       platform: string;
-      newCompScheme: "blackbox" | "direct";
-      // The list of existing components as [componentUuid, codeScheme]
-      existingCompScheme: Array<[string, "blackbox" | "direct"]>;
       componentIdOrNames: readonly string[] | undefined;
       version: string;
       imageOpts: ImagesConfig;
       stylesOpts: StyleConfig;
+      i18nOpts?: I18NConfig;
       codeOpts: CodeConfig;
       checksums: ChecksumBundle;
       indirect: boolean;
@@ -373,20 +371,6 @@ export class PlasmicApi {
     return result.data as ProjectIconsResponse;
   }
 
-  async projectSyncMetadata(
-    projectId: string,
-    branchName: string,
-    revision: number,
-    rethrowAppError: boolean
-  ): Promise<ProjectSyncMetadataModel> {
-    const result = await this.post(
-      `${this.codegenHost}/api/v1/projects/${projectId}/code/project-sync-metadata?branchName=${branchName}`,
-      { revision },
-      rethrowAppError
-    );
-    return ProjectSyncMetadataModel.fromJson(result.data);
-  }
-
   connectSocket(): Socket {
     const socket = socketio(this.studioHost, {
       path: `/api/v1/socket`,

package/src/index.ts

@@ -254,10 +254,9 @@ yargs
         })
         .option("key-scheme", {
           describe:
-            "What value to use as message keys; either the message content itself, or a hash of it",
+            "What value to use as message keys; either the message content itself, or a hash of it. Defaults to whatever is specified in plasmic.json, or `content`",
           type: "string",
           choices: ["content", "hash"],
-          default: "content",
         })
         .option("output", {
           alias: "o",
@@ -318,18 +317,6 @@ function configureSyncArgs(
         "Overwrite the skeleton file with newly generated version. Useful when switching between codegen schemes.",
       default: false,
     })
-    .option("append-jsx-on-missing-base", {
-      type: "boolean",
-      describe:
-        "When the base metadata is missing to perform the three-way merge for direct edit component, append the jsx of the new version so that user can perform manual merge.",
-      default: false,
-    })
-    .option("new-component-scheme", {
-      type: "string",
-      choices: ["blackbox", "direct"],
-      describe:
-        "Sync the new components using this code scheme rather than the default code scheme.",
-    })
     .option("ignore-post-sync", {
       type: "boolean",
       describe: "Ignore post-sync commands in plasmic.json",

package/src/test-common/fixtures.ts

@@ -1,3 +1,4 @@
+/// <reference types="@types/jest" />
 import L from "lodash";
 import { SyncArgs } from "../actions/sync";
 import { PlasmicConfig, ProjectConfig } from "../utils/config-utils";
@@ -96,8 +97,6 @@ export function standardTestSetup(includeDep = true) {
     nonRecursive: false,
     skipUpgradeCheck: true,
     forceOverwrite: true,
-    newComponentScheme: "blackbox",
-    appendJsxOnMissingBase: false,
     config: tmpRepo.plasmicJsonPath(),
     auth: tmpRepo.plasmicAuthPath(),
     loaderConfig: tmpRepo.plasmicLoaderJsonPath(),

package/src/utils/config-utils.ts

@@ -91,6 +91,9 @@ export interface PlasmicConfig {
   /** The version of cli when this file was written */
   cliVersion?: string;
 
+  /** Configuration for localization */
+  i18n?: I18NConfig;
+
   /** Arbitrary command to run after `plasmic sync` has run; useful for linting and code formatting synced files */
   postSyncCommands?: string[];
 }
@@ -100,7 +103,7 @@ export interface CodeConfig {
   lang: "ts" | "js";
 
   /** The default code generation scheme. Each component can override the scheme. */
-  scheme: "blackbox" | "direct";
+  scheme: "blackbox";
 
   reactRuntime: "classic" | "automatic";
 }
@@ -334,6 +337,14 @@ export interface ProjectLock {
   codegenVersion?: string;
 }
 
+export interface I18NConfig {
+  /**
+   * For localization, whether the extracted strings are keyed by its content
+   * or by a hash of its content
+   */
+  keyScheme: "content" | "hash";
+}
+
 export interface PlasmicLock {
   // One for each project that has been synced
   projects: ProjectLock[];

package/tsconfig.json

@@ -60,6 +60,8 @@
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
+    "skipLibCheck": true,
+
     /* Advanced Options */
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   },