fix(cli): bump config version & fix scripts (#4963)

zettca · web-flow · commit 9a4aa86bee2c · 2025-11-04T15:55:19.000Z
- fix check script
- bump minimum config version
- remove unused hbs templates
- fix hbs formatting
- rename viteOptionsAppShell to appShellAutoMenu
- default App Shell autoViewsAndRoutes

Co-authored-by: Bruno Henriques &lt;zettca@users.noreply.github.com&gt;
diff --git a/packages/cli/src/app-shell.js b/packages/cli/src/app-shell.js
@@ -8,7 +8,7 @@ const plop = await nodePlop(`${__dirname}/plopfile.js`);
 
 const createAppShellIndexHtml = plop.getGenerator("createAppShellIndexHtml");
 const createAppShellConfig = plop.getGenerator("createAppShellConfig");
-const createAppShellViteConfig = plop.getGenerator("createAppShellViteConfig");
+const createAppShellAutoMenu = plop.getGenerator("createAppShellAutoMenu");
 
 const createAppShellIndexHtmlFile = async (path, name) => {
   await createAppShellIndexHtml.runActions({
@@ -21,7 +21,7 @@ const createAppShellConfigFile = async (
   path,
   name,
   appShellFeatures = [],
-  viteOptionsAppShell = {},
+  appShellAutoMenu = true,
 ) => {
   const pagesPath = `${path}/src/pages`;
   const pages = fs.readdirSync(pagesPath);
@@ -58,24 +58,7 @@ const createAppShellConfigFile = async (
     appName: name.replace(/([a-z])([A-Z])/g, "$1 $2"),
     pages: templatePages,
     feats: appShellFeats,
-    viteOptionsAppShell,
-  });
-};
-
-const createAppShellViteConfigFile = async (path, viteOptionsAppShell) => {
-  const pagesPath = `${path}/src/pages`;
-  const pages = fs.readdirSync(pagesPath);
-
-  const templatePages = pages.map((page) => ({
-    path,
-    pagesPath: "src/pages",
-    name: page,
-  }));
-
-  await createAppShellViteConfig.runActions({
-    path,
-    pages: templatePages,
-    viteOptionsAppShell,
+    appShellAutoMenu,
   });
 };
 
@@ -94,8 +77,8 @@ export const createAppShellBaseline = async (appPath) => {
 export const setupAppShell = async (
   appPath,
   name,
-  appShellFeatures,
-  viteOptionsAppShell,
+  appShellFeatures = [],
+  appShellAutoMenu = true,
   packageName,
 ) => {
   console.log(`\nConfiguring App Shell environment\n`);
@@ -108,11 +91,12 @@ export const setupAppShell = async (
     appPath,
     name,
     appShellFeatures,
-    viteOptionsAppShell,
+    appShellAutoMenu,
   );
 
-  // generate app shell vite config file
-  await createAppShellViteConfigFile(appPath, viteOptionsAppShell);
+  if (appShellAutoMenu) {
+    await createAppShellAutoMenu.runActions({ path: appPath });
+  }
 
   // replace package name in i18n.ts file
   const i18nFile = `${appPath}/src/lib/i18n.ts`;
diff --git a/packages/cli/src/baselines/app-shell/vite/_package.json b/packages/cli/src/baselines/app-shell/vite/_package.json
@@ -6,7 +6,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "check": "npm run check:format && check:types && npm run check:lint",
+    "check": "npm run check:format && npm run check:types && npm run check:lint",
     "check:types": "tsc --noEmit",
     "check:lint": "oxlint",
     "check:format": "prettier --check .",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@hitachivantara/app-shell-vite-plugin": "^1.0.0",
-    "@hitachivantara/uikit-config": "^0.4.0",
-    "@hitachivantara/uikit-uno-preset": "^0.2.5",
+    "@hitachivantara/uikit-config": "^0.5.1",
+    "@hitachivantara/uikit-uno-preset": "^0.2.71",
     "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
diff --git a/packages/cli/src/baselines/app-shell/vite/vite.config.ts b/packages/cli/src/baselines/app-shell/vite/vite.config.ts
@@ -1,13 +1,11 @@
 /// <reference types="vite/client" />
 /// <reference types="vitest" />
 
-import { defineConfig } from "vite";
-
 import react from "@vitejs/plugin-react";
-import tsconfigPaths from "vite-tsconfig-paths";
 import unoCSS from "unocss/vite";
+import { defineConfig } from "vite";
 import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
-
+import tsconfigPaths from "vite-tsconfig-paths";
 import { HvAppShellVitePlugin } from "@hitachivantara/app-shell-vite-plugin";
 
 export default defineConfig(({ mode }) => ({
@@ -20,17 +18,7 @@ export default defineConfig(({ mode }) => ({
     }),
     HvAppShellVitePlugin({
       mode,
-      {{#if viteOptionsAppShell}}
       autoViewsAndRoutes: true,
-      autoMenu: true
-      {{/if}}
-      {{#unless viteOptionsAppShell}}
-      modules: [
-      {{#each pages}}
-        "{{pagesPath}}/{{name}}"{{#unless @last}},{{/unless}}
-      {{/each}}
-      ]
-      {{/unless}}
     }),
   ],
 
diff --git a/packages/cli/src/baselines/vite/_package.json b/packages/cli/src/baselines/vite/_package.json
@@ -6,7 +6,7 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "check": "npm run check:format && check:types && npm run check:lint",
+    "check": "npm run check:format && npm run check:types && npm run check:lint",
     "check:types": "tsc --noEmit",
     "check:lint": "oxlint",
     "check:format": "prettier --check .",
@@ -33,8 +33,8 @@
     "tiny-cookie": "^2.4.1"
   },
   "devDependencies": {
-    "@hitachivantara/uikit-config": "^0.4.0",
-    "@hitachivantara/uikit-uno-preset": "^0.2.5",
+    "@hitachivantara/uikit-config": "^0.5.1",
+    "@hitachivantara/uikit-uno-preset": "^0.2.71",
     "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
diff --git a/packages/cli/src/create.js b/packages/cli/src/create.js
@@ -44,9 +44,8 @@ const questions = [
   },
   {
     type: "confirm",
-    name: "viteOptionsAppShell",
-    message:
-      "Use file based routing and automatic menu generation in App Shell?",
+    name: "appShellAutoMenu",
+    message: "Use automatic menu generation in App Shell?",
     default: true,
     when(answers) {
       return answers.useAppShell;
@@ -82,7 +81,7 @@ const create = async ({
   name = "uikit-app",
   useAppShell = true,
   appShellFeatures = [],
-  viteOptionsAppShell = true,
+  appShellAutoMenu = true,
   templates = [],
 }) => {
   console.log(chalk.cyan("\nUI kit app generator\n"));
@@ -113,7 +112,7 @@ const create = async ({
       appPath,
       name,
       appShellFeatures,
-      viteOptionsAppShell,
+      appShellAutoMenu,
       packageName,
     );
     console.log(
@@ -166,7 +165,7 @@ export const createCommand = new Command()
         name,
         useAppShell: !withoutAppShell,
         appShellFeatures: appShellFeatures?.split(",").map(toPascalCase),
-        viteOptionsAppShell: !disableFileBasedRouting,
+        appShellAutoMenu: !disableFileBasedRouting,
         templates: templates?.split(",").map(toPascalCase),
       });
     }
diff --git a/packages/cli/src/plop-templates/app-shell/app-shell.config.ts.hbs b/packages/cli/src/plop-templates/app-shell/app-shell.config.ts.hbs
@@ -19,7 +19,7 @@ export default (): HvAppShellConfig => ({
   {{/if}}
 
   mainPanel: {
-    maxWidth: "xl"{{#unless viteOptionsAppShell}},
+    maxWidth: "xl"{{#unless appShellAutoMenu}},
     views: [
     {{#each pages}}
         { bundle: "@self/{{pagesPath}}/{{name}}.js", route: "/{{kebabCase name}}" }{{#unless @last}},{{/unless}}
@@ -28,7 +28,7 @@ export default (): HvAppShellConfig => ({
     {{/unless}}
   },
 
-  {{#unless viteOptionsAppShell}}
+  {{#unless appShellAutoMenu}}
   menu: [
   {{#each pages}}
     { label: "key_{{name}}", target: "/{{kebabCase name}}" }{{#unless @last}},{{/unless}}
diff --git a/packages/cli/src/plop-templates/navigation.ts.hbs b/packages/cli/src/plop-templates/navigation.ts.hbs
diff --git a/packages/cli/src/plop-templates/routes.tsx.hbs b/packages/cli/src/plop-templates/routes.tsx.hbs
diff --git a/packages/cli/src/plopfile.js b/packages/cli/src/plopfile.js
@@ -4,7 +4,7 @@ const createRoute = {
       type: "append",
       path: "{{path}}/src/routes.tsx",
       pattern: "// APP ROUTES",
-      template: `{ path: "{{kebabCase name}}", lazy: () => import("./pages/{{name}}") },`,
+      template: `  { path: "{{kebabCase name}}", lazy: () => import("./pages/{{name}}") },`,
     },
   ],
 };
@@ -40,12 +40,13 @@ const createAppShellConfig = {
   ],
 };
 
-const createAppShellViteConfig = {
+const createAppShellAutoMenu = {
   actions: [
     {
-      type: "add",
+      type: "append",
       path: "{{path}}/vite.config.ts",
-      templateFile: "plop-templates/app-shell/vite.config.ts.hbs",
+      pattern: "autoViewsAndRoutes: true,",
+      template: `      autoMenu: true,`,
     },
   ],
 };
@@ -56,5 +57,5 @@ export default (plop) => {
   plop.setGenerator("createReadMe", createReadMe);
   plop.setGenerator("createAppShellIndexHtml", createAppShellIndexHtml);
   plop.setGenerator("createAppShellConfig", createAppShellConfig);
-  plop.setGenerator("createAppShellViteConfig", createAppShellViteConfig);
+  plop.setGenerator("createAppShellAutoMenu", createAppShellAutoMenu);
 };
