@forge/cli-shared

8.24.08.24.0-experimental-04cc2b9
out/ui/text.js
~out/ui/text.jsModified
+8−7
Index: package/out/ui/text.js
===================================================================
--- package/out/ui/text.js
+++ package/out/ui/text.js
@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Text = exports.capitalise = exports.itemList = void 0;
+exports.Text = exports.capitalise = void 0;
+exports.itemList = itemList;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
 const case_1 = require("case");
@@ -26,9 +27,8 @@
     .join(' ');
 function itemList(items, indent) {
     return items.map((item) => `${indent ?? ' '}- ${item}`).join(`\n${indent ?? ''}`);
 }
-exports.itemList = itemList;
 const fatalError = (message) => chalk_1.default.bold(chalk_1.default.red(message));
 const keytarAccessErrorBase = (message) => `Keytar error detected: ${message}`;
 const capitalise = (word) => word.charAt(0).toUpperCase() + word.slice(1);
 exports.capitalise = capitalise;
@@ -297,10 +297,9 @@
                 noTemplates: 'There are no templates to choose from.',
                 unexpectedArchiveFormat: 'Unexpected template format.'
             },
             packages: {
-                installFail: `Something went wrong while installing app dependencies. Try running ${forge('create')} again.'
-        )} to try again.`
+                installFail: `Something went wrong while installing app dependencies. Try running ${forge('create')} again.`
             }
         }
     },
     devSpace: {
@@ -1565,10 +1564,9 @@
             fileChangeHeader: (fileName) => `${fileName} changes:`,
             depAdditionsHeader: 'Adding:',
             frontendDepHeader: 'Frontend dependencies:',
             depConflictsHeader: '⚠️  Dependency conflicts detected',
-            depConflictsScopedHeader: (scope) => `⚠️  ${scope === 'frontend' ? 'Frontend' : 'Backend'} dependency conflicts detected`,
-            depConflictsBlockedHeader: (scope) => `⚠️  ${scope === 'frontend' ? 'Frontend' : 'Backend'} dependency conflicts detected`,
+            depConflictsScopedHeader: (scope) => `⚠️  Dependency conflicts detected in ${scope}`,
             depConflictsColumnPackage: 'Package',
             depConflictsColumnCurrent: 'Your version',
             depConflictsColumnTemplate: 'Template version',
             depConflictsColumnStatus: 'Status',
@@ -1583,9 +1581,8 @@
             depConflictsOptionNoInstall: '--no-install      Add to package.json only, skip npm install',
             depConflictsOptionForceNoInstall: '--force --no-install  Upgrade conflicting packages but skip npm install',
             depConflictsFooter: 'Resolve conflicts manually or re-run with --force to upgrade.',
             errorDepConflicts: (count) => `${count} dependency conflict(s) detected. Re-run with --force to upgrade, or --no-install to skip the install step.`,
-            errorPackageJsonNotFound: (pkgPath) => `package.json not found at ${pkgPath}. Cannot determine existing dependencies.`,
             errorPackageJsonParseFailed: (pkgPath, message) => `Failed to parse package.json at ${pkgPath}: ${message}`,
             errorMissingDepVersion: (name) => `Template dependency "${name}" is missing an explicit version. Templates must declare a version for every dependency.`,
             warnNoManifest: (manifestPath) => `No manifest.yml found at ${manifestPath}. Manifest changes were not planned.`,
             warnNoFragment: 'Template did not provide a manifest fragment; manifest changes were not planned.',
@@ -1635,6 +1632,10 @@
             duplicateFunctionKey: (value) => `Function key "${value}" already exists. Please enter a different value.`,
             duplicateResourceKey: (value) => `Resource key "${value}" already exists. Please enter a different value.`,
             duplicateKey: (value) => `"${value}" must be unique. Please enter a different value.`
         }
+    },
+    appIdOverride: {
+        desription: 'App ID to use (skips reading from manifest)',
+        environmentRequired: 'You must specify an environment using --environment when using --app-id-override.'
     }
 };