@forge/cli 12.21.0 → 12.21.1-next.7-experimental-5c60439

package/out/command-line/view/module-view.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleView = void 0;
+const tslib_1 = require("tslib");
+const cli_shared_1 = require("@forge/cli-shared");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
 class ModuleView {
     ui;
     constructor(ui) {
@@ -15,9 +20,146 @@ class ModuleView {
     warn(warning) {
         this.ui.warn(warning);
     }
+    info(message) {
+        this.ui.info(message);
+    }
     async promptForText(message, defaultValue) {
         return this.ui.promptForText(message, defaultValue);
     }
+    renderApplyResult(result, depChanges) {
+        this.emptyLine();
+        this.info(cli_shared_1.Text.module.add.dryRunLabel);
+        if (result.plannedFiles.length) {
+            this.info(chalk_1.default.bold(cli_shared_1.Text.module.add.filesToBeCreatedHeader));
+            for (const f of result.plannedFiles) {
+                this.info('  ' + chalk_1.default.green('+ ' + f));
+            }
+            this.emptyLine();
+        }
+        this.renderFileChange(result.manifestChange);
+        this.renderDepAdditions(depChanges.additions ?? []);
+        this.renderDepAdditions(result.frontendDepChanges?.additions ?? []);
+    }
+    renderDepAdditions(additions) {
+        if (!additions.length)
+            return;
+        this.info(chalk_1.default.bold(cli_shared_1.Text.module.add.depAdditionsHeader));
+        for (const dep of additions) {
+            this.info('  ' + chalk_1.default.green(`+ ${dep.name}@${dep.next}`));
+        }
+        this.emptyLine();
+    }
+    renderDepConflictsBlocked(depChanges, scope) {
+        const conflicts = depChanges.conflicts ?? [];
+        if (!conflicts.length)
+            return;
+        this.renderDepTable(conflicts, [], () => cli_shared_1.Text.module.add.depConflictsStatusConflict, cli_shared_1.Text.module.add.depConflictsBlockedHeader(scope));
+        this.info('  ' + cli_shared_1.Text.module.add.depConflictsSummary(conflicts.length));
+        this.emptyLine();
+        this.info('  ' + chalk_1.default.bold(cli_shared_1.Text.module.add.depConflictsOptionsHeader));
+        this.info('    ' + cli_shared_1.Text.module.add.depConflictsOptionForce);
+        this.info('    ' + cli_shared_1.Text.module.add.depConflictsOptionNoInstall);
+        this.info('    ' + cli_shared_1.Text.module.add.depConflictsOptionForceNoInstall);
+        this.emptyLine();
+        this.info('  ' + chalk_1.default.yellow(cli_shared_1.Text.module.add.depConflictsFooter));
+        this.emptyLine();
+    }
+    renderDepConflictsResolved(depChanges, scope) {
+        const conflicts = depChanges.conflicts ?? [];
+        const matches = depChanges.matches ?? [];
+        if (!conflicts.length)
+            return;
+        const getStatus = (dep) => {
+            const current = dep.current ? semver_1.default.minVersion(dep.current) : null;
+            const next = semver_1.default.minVersion(dep.next);
+            if (current && next && semver_1.default.gt(current, next)) {
+                return cli_shared_1.Text.module.add.depConflictsStatusDowngraded;
+            }
+            return cli_shared_1.Text.module.add.depConflictsStatusUpgraded;
+        };
+        this.renderDepTable(conflicts, matches, getStatus, cli_shared_1.Text.module.add.depConflictsScopedHeader(scope));
+        this.info('  ' + chalk_1.default.green(cli_shared_1.Text.module.add.depConflictsUpgradedSummary(conflicts.length)));
+        this.emptyLine();
+    }
+    renderDepTable(conflicts, matches, getConflictStatus, header = cli_shared_1.Text.module.add.depConflictsHeader) {
+        this.emptyLine();
+        this.warn(chalk_1.default.bold(header));
+        this.emptyLine();
+        const rows = [
+            ...conflicts.map((d) => ({
+                name: d.name,
+                current: d.current ?? '',
+                next: d.next,
+                status: getConflictStatus(d),
+                isConflict: true
+            })),
+            ...matches.map((d) => ({
+                name: d.name,
+                current: d.current ?? '',
+                next: d.next,
+                status: cli_shared_1.Text.module.add.depConflictsStatusOk,
+                isConflict: false
+            }))
+        ];
+        const headers = {
+            name: cli_shared_1.Text.module.add.depConflictsColumnPackage,
+            current: cli_shared_1.Text.module.add.depConflictsColumnCurrent,
+            next: cli_shared_1.Text.module.add.depConflictsColumnTemplate,
+            status: cli_shared_1.Text.module.add.depConflictsColumnStatus
+        };
+        const widths = {
+            name: Math.max(headers.name.length, ...rows.map((r) => r.name.length)),
+            current: Math.max(headers.current.length, ...rows.map((r) => r.current.length)),
+            next: Math.max(headers.next.length, ...rows.map((r) => r.next.length)),
+            status: Math.max(headers.status.length, ...rows.map((r) => r.status.length))
+        };
+        const pad = (value, width) => value + ' '.repeat(Math.max(0, width - value.length));
+        const gap = '   ';
+        const headerLine = [
+            pad(headers.name, widths.name),
+            pad(headers.current, widths.current),
+            pad(headers.next, widths.next),
+            pad(headers.status, widths.status)
+        ].join(gap);
+        this.info('  ' + chalk_1.default.bold(headerLine));
+        this.info('  ' + chalk_1.default.dim('\u2500'.repeat(headerLine.length)));
+        for (const row of rows) {
+            const line = [
+                pad(row.name, widths.name),
+                pad(row.current, widths.current),
+                pad(row.next, widths.next),
+                pad(row.status, widths.status)
+            ].join(gap);
+            this.info('  ' + (row.isConflict ? chalk_1.default.red(line) : chalk_1.default.green(line)));
+        }
+        this.emptyLine();
+    }
+    renderFileChange(change) {
+        if (!change)
+            return;
+        const header = cli_shared_1.Text.module.add.fileChangeHeader(path_1.default.basename(change.filePath));
+        this.info(chalk_1.default.bold(header));
+        const lines = change.patch.split('\n');
+        for (const line of lines) {
+            if (line.startsWith('Index:') || line.startsWith('===') || line.startsWith('--- ') || line.startsWith('+++ ')) {
+                continue;
+            }
+            if (line.startsWith('@@')) {
+                this.info(chalk_1.default.dim('  ...'));
+                continue;
+            }
+            if (line.startsWith('+')) {
+                this.info(chalk_1.default.green(line));
+            }
+            else if (line.startsWith('-')) {
+                this.info(chalk_1.default.red(line));
+            }
+            else {
+                this.info(line);
+            }
+        }
+        this.emptyLine();
+    }
 }
 exports.ModuleView = ModuleView;
 //# sourceMappingURL=module-view.js.map

package/out/command-line/view/module-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-view.js","sourceRoot":"","sources":["../../../src/command-line/view/module-view.ts"],"names":[],"mappings":";;;AAEA,MAAa,UAAU;IACQ;IAA7B,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;IAAG,CAAC;IAEhC,KAAK,CAAC,aAAa,CAAmB,OAAe,EAAE,OAAqB;QACjF,OAAO,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,YAAqB;QAC/D,OAAO,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;CACF;AAlBD,gCAkBC"}
+{"version":3,"file":"module-view.js","sourceRoot":"","sources":["../../../src/command-line/view/module-view.ts"],"names":[],"mappings":"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"}

package/out/deploy/deployer/deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EACF,SAAS,EAET,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAyB,MAAM,iCAAiC,CAAC;AAG7F,qBAAa,wBAAyB,SAAQ,SAAS;IAEnD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;CAG7D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,4BAA6B,SAAQ,SAAS;gBAC7C,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG/C;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CACJ,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAoBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAa1D;AAED,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CACjB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;YAcF,QAAQ;IAoBT,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM;;;;YA4BL,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IAyBlC,OAAO,CAAC,gBAAgB;CA0DzB"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EACF,SAAS,EAET,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAyB,MAAM,iCAAiC,CAAC;AAG7F,qBAAa,wBAAyB,SAAQ,SAAS;IAEnD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;CAG7D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,4BAA6B,SAAQ,SAAS;gBAC7C,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG/C;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CACJ,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAoBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAa1D;AAED,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CACjB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;YAcF,QAAQ;IAoBT,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM;;;;YA4BL,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IAyBlC,OAAO,CAAC,gBAAgB;CAoEzB"}

package/out/deploy/deployer/deployer.js

@@ -223,6 +223,12 @@ class ArtifactDeployer {
                 case 'CUSTOM_SCOPES_NOT_AVAILABLE': {
                     throw new CustomScopesUnavailableError(requestId, cli_shared_1.Text.customScopes.deploy.errors.notAvailable);
                 }
+                case 'PRIVATE_APP_MISSING_DEVELOPER_SPACE': {
+                    throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.appBillingDetailsMissing.privateApp);
+                }
+                case 'MARKETPLACE_APP_MISSING_DEVELOPER_SPACE': {
+                    throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.deploy.appBillingDetailsMissing.marketplaceApp(errorDetails.fields?.developerSpaceId));
+                }
             }
         }
         throw new AppDeploymentFailedError(false, requestId, cli_shared_1.Text.deploy.taskDeploy.serverStepFailed);

package/out/deploy/deployer/deployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}

package/out/module-add/dependencies-merger.d.ts

@@ -0,0 +1,23 @@
+import { ModuleTemplateMeta } from '@forge/cli-shared';
+import { DepChange, FileChange } from '../service/module-file-service';
+export interface PackageJsonShape {
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+}
+export interface ReadPackageJsonResult {
+    path: string;
+    raw: string;
+    parsed: PackageJsonShape;
+}
+export declare function readPackageJson(cwd: string): ReadPackageJsonResult;
+export declare function planPackageJsonChange(packageJsonPath: string, rawPackageJson: string, parsedPackageJson: PackageJsonShape, templateDependencies: Record<string, string>, templateDevDependencies: Record<string, string>, force: boolean): {
+    packageJsonChange?: FileChange;
+    depChanges: Record<string, DepChange[]>;
+};
+export declare function writePackageChange(change: FileChange | undefined, createParentDir: boolean): boolean;
+export declare function runPackageManager(cwd: string, args: string[]): Promise<boolean>;
+export declare function planFrontendPackageJson(cwd: string, template: ModuleTemplateMeta, variables: Record<string, string>, force?: boolean): {
+    packageJsonChange?: FileChange;
+    depChanges: Record<string, DepChange[]>;
+};
+//# sourceMappingURL=dependencies-merger.d.ts.map

package/out/module-add/dependencies-merger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/dependencies-merger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAYvE,MAAM,WAAW,gBAAgB;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AACD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAclE;AAoCD,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,gBAAgB,EACnC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5C,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/C,KAAK,EAAE,OAAO,GACb;IACD,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;CACzC,CAuBA;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,EAAE,eAAe,EAAE,OAAO,GAAG,OAAO,CAKpG;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ/E;AAQD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,KAAK,UAAQ,GACZ;IAAE,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;CAAE,CAkE7E"}

package/out/module-add/dependencies-merger.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.planFrontendPackageJson = exports.runPackageManager = exports.writePackageChange = exports.planPackageJsonChange = exports.readPackageJson = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cross_spawn_1 = require("cross-spawn");
+const diff_1 = require("diff");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const cli_shared_1 = require("@forge/cli-shared");
+const manifest_merger_1 = require("./manifest-merger");
+const FRONTEND_DIR_TEMPLATE = 'static/{{resourceKey}}';
+const FRONTEND_PKG_SCAFFOLD = {
+    private: true,
+    scripts: {
+        dev: 'vite',
+        build: 'vite build',
+        preview: 'vite preview'
+    }
+};
+function readPackageJson(cwd) {
+    const packageJsonPath = path_1.default.join(cwd, 'package.json');
+    if (!fs_1.default.existsSync(packageJsonPath)) {
+        throw new Error(cli_shared_1.Text.module.add.errorPackageJsonNotFound(packageJsonPath));
+    }
+    try {
+        const raw = fs_1.default.readFileSync(packageJsonPath, 'utf8');
+        const parsed = JSON.parse(raw);
+        return { path: packageJsonPath, raw, parsed };
+    }
+    catch (err) {
+        throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(packageJsonPath, err.message), {
+            cause: err
+        });
+    }
+}
+exports.readPackageJson = readPackageJson;
+function classifyDeps(templateDependencies, existing, force) {
+    const additions = [];
+    const conflicts = [];
+    const matches = [];
+    const merged = { ...existing };
+    for (const [name, version] of Object.entries(templateDependencies)) {
+        const current = existing[name];
+        if (!current) {
+            additions.push({ name, next: version });
+            merged[name] = version;
+        }
+        else if (versionsCompatible(current, version)) {
+            matches.push({ name, current, next: version });
+        }
+        else {
+            conflicts.push({ name, current, next: version });
+            if (force)
+                merged[name] = version;
+        }
+    }
+    return { additions, conflicts, matches, merged };
+}
+function versionsCompatible(current, next) {
+    const currentRange = semver_1.default.validRange(current, { includePrerelease: true });
+    const nextRange = semver_1.default.validRange(next, { includePrerelease: true });
+    if (!currentRange || !nextRange) {
+        return current === next;
+    }
+    return semver_1.default.intersects(currentRange, nextRange, { includePrerelease: true });
+}
+function planPackageJsonChange(packageJsonPath, rawPackageJson, parsedPackageJson, templateDependencies, templateDevDependencies, force) {
+    const dependencies = classifyDeps(templateDependencies, parsedPackageJson.dependencies ?? {}, force);
+    const devDependencies = classifyDeps(templateDevDependencies, parsedPackageJson.devDependencies ?? {}, force);
+    const mergedPackageJson = {
+        ...parsedPackageJson,
+        dependencies: dependencies.merged,
+        devDependencies: devDependencies.merged
+    };
+    const depChanges = {
+        additions: [...dependencies.additions, ...devDependencies.additions],
+        conflicts: [...dependencies.conflicts, ...devDependencies.conflicts],
+        matches: [...dependencies.matches, ...devDependencies.matches]
+    };
+    const before = rawPackageJson.endsWith('\n') ? rawPackageJson : `${rawPackageJson}\n`;
+    const after = `${JSON.stringify(mergedPackageJson, null, 2)}\n`;
+    if (before === after) {
+        return { depChanges };
+    }
+    const patch = (0, diff_1.createTwoFilesPatch)(packageJsonPath, packageJsonPath, before, after, 'before', 'after');
+    return { packageJsonChange: { filePath: packageJsonPath, before, after, patch }, depChanges };
+}
+exports.planPackageJsonChange = planPackageJsonChange;
+function writePackageChange(change, createParentDir) {
+    if (!change)
+        return false;
+    if (createParentDir)
+        fs_1.default.mkdirSync(path_1.default.dirname(change.filePath), { recursive: true });
+    fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
+    return true;
+}
+exports.writePackageChange = writePackageChange;
+function runPackageManager(cwd, args) {
+    const packageManager = detectPackageManager(cwd);
+    return new Promise((resolve) => {
+        const child = (0, cross_spawn_1.spawn)(packageManager, args, { cwd });
+        child.on('close', (code) => resolve(code === 0));
+        child.on('error', () => resolve(false));
+    });
+}
+exports.runPackageManager = runPackageManager;
+function detectPackageManager(cwd) {
+    if (fs_1.default.existsSync(path_1.default.join(cwd, 'yarn.lock')))
+        return 'yarn';
+    return 'npm';
+}
+function planFrontendPackageJson(cwd, template, variables, force = false) {
+    const frontend = template.frontend;
+    const hasEntries = (value) => !!value && Object.keys(value).length > 0;
+    if (!frontend || (!hasEntries(frontend.dependencies) && !hasEntries(frontend.devDependencies))) {
+        return { depChanges: { additions: [], conflicts: [], matches: [] } };
+    }
+    const resourceKey = variables.resourceKey ?? template.moduleKey.replace(':', '-');
+    const frontendDir = (0, manifest_merger_1.substituteVars)(FRONTEND_DIR_TEMPLATE, { resourceKey });
+    const frontendPackageJsonPath = path_1.default.join(cwd, frontendDir, 'package.json');
+    const templateDependencies = frontend.dependencies ?? {};
+    const templateDevDependencies = frontend.devDependencies ?? {};
+    const exists = fs_1.default.existsSync(frontendPackageJsonPath);
+    const before = exists ? fs_1.default.readFileSync(frontendPackageJsonPath, 'utf8') : '';
+    let mergedPackageJson;
+    let depChanges;
+    if (exists) {
+        let existingPackageJson;
+        try {
+            existingPackageJson = JSON.parse(before);
+        }
+        catch (err) {
+            throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(frontendPackageJsonPath, err.message), {
+                cause: err
+            });
+        }
+        const dependencies = classifyDeps(templateDependencies, existingPackageJson.dependencies ?? {}, force);
+        const devDependencies = classifyDeps(templateDevDependencies, existingPackageJson.devDependencies ?? {}, force);
+        mergedPackageJson = {
+            ...existingPackageJson,
+            dependencies: dependencies.merged,
+            devDependencies: devDependencies.merged
+        };
+        depChanges = {
+            additions: [...dependencies.additions, ...devDependencies.additions],
+            conflicts: [...dependencies.conflicts, ...devDependencies.conflicts],
+            matches: [...dependencies.matches, ...devDependencies.matches]
+        };
+    }
+    else {
+        mergedPackageJson = {
+            name: `${resourceKey}-frontend`,
+            ...FRONTEND_PKG_SCAFFOLD,
+            dependencies: templateDependencies,
+            devDependencies: templateDevDependencies
+        };
+        const toAddition = ([name, version]) => ({ name, next: version });
+        depChanges = {
+            additions: [
+                ...Object.entries(templateDependencies).map(toAddition),
+                ...Object.entries(templateDevDependencies).map(toAddition)
+            ],
+            conflicts: [],
+            matches: []
+        };
+    }
+    const after = `${JSON.stringify(mergedPackageJson, null, 2)}\n`;
+    if (before === after) {
+        return { depChanges };
+    }
+    return { packageJsonChange: { filePath: frontendPackageJsonPath, before, after, patch: '' }, depChanges };
+}
+exports.planFrontendPackageJson = planFrontendPackageJson;
+//# sourceMappingURL=dependencies-merger.js.map

package/out/module-add/dependencies-merger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies-merger.js","sourceRoot":"","sources":["../../src/module-add/dependencies-merger.ts"],"names":[],"mappings":"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"}

package/out/module-add/manifest-merger.d.ts

@@ -0,0 +1,11 @@
+import { ModuleTemplateMeta } from '@forge/cli-shared';
+import { FileChange } from '../service/module-file-service';
+export interface ManifestResource {
+    key: string;
+    path?: string;
+    entry?: Record<string, string>;
+}
+export declare function planManifestChange(cwd: string, template: ModuleTemplateMeta, variables: Record<string, string>, warnings: string[]): FileChange | undefined;
+export declare function applyManifestChange(change: FileChange | undefined): boolean;
+export declare function substituteVars(input: string, vars: Record<string, string>): string;
+//# sourceMappingURL=manifest-merger.d.ts.map

package/out/module-add/manifest-merger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAGD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,EAAE,MAAM,EAAE,GACjB,UAAU,GAAG,SAAS,CAoCxB;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAElF"}