@contentful/experience-design-system-cli 2.37.1-dev-build-a6ef2d40.0 → 2.37.1-dev-build-8a9493aa.0

package/dist/app.js

@@ -2519,7 +2519,7 @@ function ControlHints({ hints }) {
 // packages/experience-design-system-cli/src/tui/home/home.tsx
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var VERSION = readPackageVersion();
-var HEADING = "Design System Import";
+var HEADING = "Contentful Experiences";
 var MIN_TERMINAL_WIDTH = 164;
 var START_ITEMS = [
   { label: "Import", screen: "import" },
@@ -2849,7 +2849,6 @@ function StepHeader({ step }) {
     {
       justifyContent: "space-between",
       paddingX: 2,
-      paddingTop: 1,
       marginBottom: 1,
       borderStyle: "single",
       borderColor: PALETTE.border,
@@ -3121,19 +3120,17 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     const path5 = toProjectPath(value);
     if (path5) onContinue(path5);
   };
-  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx11(StepHeader, { step: "setup" }),
-    /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, paddingX: 2, paddingBottom: 1, children: [
-      /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, children: [
-        /* @__PURE__ */ jsx11(Text10, { color: PALETTE.text, children: "Where is your component library?" }),
-        /* @__PURE__ */ jsxs10(Box10, { children: [
-          /* @__PURE__ */ jsx11(Text10, { color: PALETTE.accent, children: "? " }),
-          /* @__PURE__ */ jsx11(Text10, { children: "Project path: " }),
-          /* @__PURE__ */ jsx11(ClearableTextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsx11(Box10, { children: /* @__PURE__ */ jsx11(ControlHints, { hints: WELCOME_CONTROLS }) })
-    ] })
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx11(Text10, { bold: true, color: PALETTE.accent, children: "Let's import your design system into Contentful." }),
+    /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx11(Text10, { children: "Where is your component library?" }),
+      /* @__PURE__ */ jsxs10(Box10, { children: [
+        /* @__PURE__ */ jsx11(Text10, { color: PALETTE.accent, children: "? " }),
+        /* @__PURE__ */ jsx11(Text10, { children: "Project path: " }),
+        /* @__PURE__ */ jsx11(ClearableTextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx11(Box10, { children: /* @__PURE__ */ jsx11(ControlHints, { hints: WELCOME_CONTROLS }) })
   ] });
 }
 
@@ -17242,9 +17239,6 @@ function FieldForm({
   onChange,
   onSave,
   saveLabel = "save",
-  enterAdvances = false,
-  onSkip,
-  skipLabel: skipLabel2 = "skip",
   onQuit,
   quitLabel = "back without saving",
   actions = [],
@@ -17276,10 +17270,6 @@ function FieldForm({
       onSave();
       return;
     }
-    if (input === "k" && onSkip) {
-      onSkip();
-      return;
-    }
     if (isClearKey(input, key) && currentField) {
       onChange(currentField.key, "");
       return;
@@ -17301,21 +17291,6 @@ function FieldForm({
       }
     }
   });
-  const isLastField = active === fields2.length - 1;
-  const submitField = () => {
-    if (!enterAdvances) {
-      setEditing(false);
-      return;
-    }
-    if (isLastField) {
-      setEditing(false);
-      onSave();
-      return;
-    }
-    const next = fields2[active + 1];
-    setValueBeforeEdit(values[next.key]);
-    setActive(active + 1);
-  };
   const pointer = (isActive) => /* @__PURE__ */ jsx14(Text13, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " });
   return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
     header,
@@ -17337,7 +17312,7 @@ function FieldForm({
               {
                 value,
                 onChange: (next) => onChange(field.key, next),
-                onSubmit: submitField,
+                onSubmit: () => setEditing(false),
                 mask: field.masked ? "\u2022" : void 0
               }
             ) : display ? /* @__PURE__ */ jsx14(Text13, { bold: true, children: display }) : (
@@ -17373,7 +17348,7 @@ function FieldForm({
           hints: editing ? [
             { keys: "type", label: "edit" },
             { keys: "\u2190/\u2192", label: "move cursor" },
-            { keys: "\u23CE", label: enterAdvances ? isLastField ? saveLabel : "next" : "done" },
+            { keys: "\u23CE", label: "done" },
             { keys: "Ctrl+D", label: "clear" },
             { keys: "Esc", label: "cancel edit" }
           ] : [
@@ -17381,7 +17356,6 @@ function FieldForm({
             { keys: "\u23CE", label: currentAction ? currentAction.hint : "edit" },
             ...currentField ? [{ keys: "Ctrl+D", label: "clear" }] : [],
             { keys: "s", label: saveLabel },
-            ...onSkip ? [{ keys: "k", label: skipLabel2 }] : [],
             { keys: "Esc/q", label: quitLabel }
           ]
         }
@@ -17496,11 +17470,24 @@ function CredentialsScreen({
         setValues((current) => ({ ...current, [key]: value }));
         setNotice(null);
       },
-      enterAdvances: true,
+      actions: [
+        {
+          label: "Continue",
+          description: "Check the credentials and go on",
+          runningText: "Validating credentials...",
+          running: validating,
+          hint: "continue",
+          onRun: () => void submit()
+        },
+        {
+          label: "Skip",
+          description: "Save files only, nothing is pushed",
+          hint: "skip",
+          onRun: () => onDone({ skipped: true })
+        }
+      ],
       onSave: () => void submit(),
       saveLabel: "continue",
-      onSkip: () => onDone({ skipped: true }),
-      skipLabel: "skip, save files only",
       onQuit: onBack,
       quitLabel: "back",
       notice,
@@ -17511,10 +17498,6 @@ function CredentialsScreen({
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: credentialsPurpose(tokensOnly) }),
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Tip: save these under Settings \u2192 Configuration so they pre-fill here." })
         ] }),
-        validating && /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsx15(Text14, { children: " " }),
-          /* @__PURE__ */ jsx15(Text14, { color: PALETTE.accent, children: "Validating credentials..." })
-        ] }),
         !validating && !notice && !isUnchanged(normalize(values), initialValues) && /* @__PURE__ */ jsxs14(Fragment2, { children: [
           /* @__PURE__ */ jsx15(Text14, { children: " " }),
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Changed values are saved after they validate." })
@@ -29320,7 +29303,6 @@ function ProjectScreen({ onDone }) {
         setNotice(null);
         visit.trail.record(`edited ${key}`);
       },
-      enterAdvances: true,
       onSave: save,
       onQuit: quit,
       notice,

package/dist/index.js

@@ -18487,7 +18487,7 @@ var init_home = __esm({
     init_use_terminal_width();
     init_ControlHints();
     VERSION = readPackageVersion();
-    HEADING = "Design System Import";
+    HEADING = "Contentful Experiences";
     MIN_TERMINAL_WIDTH = 164;
     START_ITEMS = [
       { label: "Import", screen: "import" },
@@ -18771,7 +18771,6 @@ function StepHeader({ step }) {
     {
       justifyContent: "space-between",
       paddingX: 2,
-      paddingTop: 1,
       marginBottom: 1,
       borderStyle: "single",
       borderColor: PALETTE.border,
@@ -19144,19 +19143,17 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     const path5 = toProjectPath(value);
     if (path5) onContinue(path5);
   };
-  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx11(StepHeader, { step: "setup" }),
-    /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, paddingX: 2, paddingBottom: 1, children: [
-      /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, children: [
-        /* @__PURE__ */ jsx11(Text10, { color: PALETTE.text, children: "Where is your component library?" }),
-        /* @__PURE__ */ jsxs10(Box10, { children: [
-          /* @__PURE__ */ jsx11(Text10, { color: PALETTE.accent, children: "? " }),
-          /* @__PURE__ */ jsx11(Text10, { children: "Project path: " }),
-          /* @__PURE__ */ jsx11(ClearableTextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsx11(Box10, { children: /* @__PURE__ */ jsx11(ControlHints, { hints: WELCOME_CONTROLS }) })
-    ] })
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx11(Text10, { bold: true, color: PALETTE.accent, children: "Let's import your design system into Contentful." }),
+    /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx11(Text10, { children: "Where is your component library?" }),
+      /* @__PURE__ */ jsxs10(Box10, { children: [
+        /* @__PURE__ */ jsx11(Text10, { color: PALETTE.accent, children: "? " }),
+        /* @__PURE__ */ jsx11(Text10, { children: "Project path: " }),
+        /* @__PURE__ */ jsx11(ClearableTextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx11(Box10, { children: /* @__PURE__ */ jsx11(ControlHints, { hints: WELCOME_CONTROLS }) })
   ] });
 }
 var init_screen2 = __esm({
@@ -19167,7 +19164,6 @@ var init_screen2 = __esm({
     init_controls4();
     init_logic5();
     init_ControlHints();
-    init_StepHeader();
   }
 });
 
@@ -19569,9 +19565,6 @@ function FieldForm({
   onChange,
   onSave,
   saveLabel = "save",
-  enterAdvances = false,
-  onSkip,
-  skipLabel: skipLabel2 = "skip",
   onQuit,
   quitLabel = "back without saving",
   actions = [],
@@ -19603,10 +19596,6 @@ function FieldForm({
       onSave();
       return;
     }
-    if (input === "k" && onSkip) {
-      onSkip();
-      return;
-    }
     if (isClearKey(input, key) && currentField) {
       onChange(currentField.key, "");
       return;
@@ -19628,21 +19617,6 @@ function FieldForm({
       }
     }
   });
-  const isLastField = active === fields2.length - 1;
-  const submitField = () => {
-    if (!enterAdvances) {
-      setEditing(false);
-      return;
-    }
-    if (isLastField) {
-      setEditing(false);
-      onSave();
-      return;
-    }
-    const next = fields2[active + 1];
-    setValueBeforeEdit(values[next.key]);
-    setActive(active + 1);
-  };
   const pointer = (isActive) => /* @__PURE__ */ jsx14(Text13, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " });
   return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
     header,
@@ -19664,7 +19638,7 @@ function FieldForm({
               {
                 value,
                 onChange: (next) => onChange(field.key, next),
-                onSubmit: submitField,
+                onSubmit: () => setEditing(false),
                 mask: field.masked ? "\u2022" : void 0
               }
             ) : display ? /* @__PURE__ */ jsx14(Text13, { bold: true, children: display }) : (
@@ -19700,7 +19674,7 @@ function FieldForm({
           hints: editing ? [
             { keys: "type", label: "edit" },
             { keys: "\u2190/\u2192", label: "move cursor" },
-            { keys: "\u23CE", label: enterAdvances ? isLastField ? saveLabel : "next" : "done" },
+            { keys: "\u23CE", label: "done" },
             { keys: "Ctrl+D", label: "clear" },
             { keys: "Esc", label: "cancel edit" }
           ] : [
@@ -19708,7 +19682,6 @@ function FieldForm({
             { keys: "\u23CE", label: currentAction ? currentAction.hint : "edit" },
             ...currentField ? [{ keys: "Ctrl+D", label: "clear" }] : [],
             { keys: "s", label: saveLabel },
-            ...onSkip ? [{ keys: "k", label: skipLabel2 }] : [],
             { keys: "Esc/q", label: quitLabel }
           ]
         }
@@ -19847,11 +19820,24 @@ function CredentialsScreen({
         setValues((current) => ({ ...current, [key]: value }));
         setNotice(null);
       },
-      enterAdvances: true,
+      actions: [
+        {
+          label: "Continue",
+          description: "Check the credentials and go on",
+          runningText: "Validating credentials...",
+          running: validating,
+          hint: "continue",
+          onRun: () => void submit()
+        },
+        {
+          label: "Skip",
+          description: "Save files only, nothing is pushed",
+          hint: "skip",
+          onRun: () => onDone({ skipped: true })
+        }
+      ],
       onSave: () => void submit(),
       saveLabel: "continue",
-      onSkip: () => onDone({ skipped: true }),
-      skipLabel: "skip, save files only",
       onQuit: onBack,
       quitLabel: "back",
       notice,
@@ -19862,10 +19848,6 @@ function CredentialsScreen({
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: credentialsPurpose(tokensOnly) }),
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Tip: save these under Settings \u2192 Configuration so they pre-fill here." })
         ] }),
-        validating && /* @__PURE__ */ jsxs14(Fragment2, { children: [
-          /* @__PURE__ */ jsx15(Text14, { children: " " }),
-          /* @__PURE__ */ jsx15(Text14, { color: PALETTE.accent, children: "Validating credentials..." })
-        ] }),
         !validating && !notice && !isUnchanged(normalize(values), initialValues) && /* @__PURE__ */ jsxs14(Fragment2, { children: [
           /* @__PURE__ */ jsx15(Text14, { children: " " }),
           /* @__PURE__ */ jsx15(Text14, { color: PALETTE.muted, children: "Changed values are saved after they validate." })
@@ -32923,7 +32905,6 @@ function ProjectScreen({ onDone }) {
         setNotice(null);
         visit.trail.record(`edited ${key}`);
       },
-      enterAdvances: true,
       onSave: save,
       onQuit: quit,
       notice,

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-a6ef2d40.0",
+  "version": "2.37.1-dev-build-8a9493aa.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/tui/shared/components/FieldForm.d.ts

@@ -33,10 +33,8 @@ interface FieldFormProps<K extends string> {
     values: Record<K, string>;
     onChange: (key: K, value: string) => void;
     onSave: () => void;
+    /** What `s` does, in the control hints. */
     saveLabel?: string;
-    enterAdvances?: boolean;
-    onSkip?: () => void;
-    skipLabel?: string;
     /** Leaves without saving. */
     onQuit: () => void;
     /** What Esc does, in the control hints. */
@@ -67,5 +65,5 @@ export declare function FormReadOnlyRow({ label, labelWidth, children, }: {
  * While one is open, keys type into it (so a "q" in a path is just a "q"), and Esc closes it and restores the old value.
  * Actions sit after the fields and take the same cursor: Enter runs one, and `c` does nothing on it.
  */
-export declare function FieldForm<K extends string>({ header, title, subtitle, fields, values, onChange, onSave, saveLabel, enterAdvances, onSkip, skipLabel, onQuit, quitLabel, actions, notice, busy, children, }: FieldFormProps<K>): React.ReactElement;
+export declare function FieldForm<K extends string>({ header, title, subtitle, fields, values, onChange, onSave, saveLabel, onQuit, quitLabel, actions, notice, busy, children, }: FieldFormProps<K>): React.ReactElement;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-a6ef2d40.0",
+  "version": "2.37.1-dev-build-8a9493aa.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-a6ef2d40.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-a6ef2d40.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-8a9493aa.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-8a9493aa.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",