client structure

mshima · Oct 31, 2024 · 0d9909e · 0d9909e
1 parent 2aa9c51
commit 0d9909e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/generators/javascript/generators/eslint/command.ts b/generators/javascript/generators/eslint/command.ts
@@ -18,22 +18,25 @@
  */
 import type { JHipsterCommandDefinition } from '../../../../lib/command/index.js';
 
-const command: JHipsterCommandDefinition = {
+const command = {
   configs: {
     typescriptEslint: {
       cli: {
         type: Boolean,
         hide: true,
       },
+      scope: 'storage',
     },
     eslintPrettier: {
       cli: {
         type: Boolean,
         hide: true,
       },
+      default: true,
+      scope: 'storage',
     },
   },
   import: [],
-};
+} as const satisfies JHipsterCommandDefinition;
 
 export default command;
diff --git a/generators/javascript/types.d.ts b/generators/javascript/types.d.ts
@@ -1,6 +1,7 @@
+/* eslint-disable @typescript-eslint/consistent-type-imports */
 import type { Merge, PackageJson, Simplify } from 'type-fest';
 import type { ExportApplicationPropertiesFromCommand } from '../../lib/command/types.js';
-import type JavascriptBootstrapCommand from './generators/bootstrap/command.ts';
+import type JavascriptBootstrapCommand from './generators/bootstrap/command.js';
 
 type JavascriptBootstrapProperties = ExportApplicationPropertiesFromCommand<typeof JavascriptBootstrapCommand>;
 type DependencyValue = string | undefined | null;
@@ -20,15 +21,16 @@ export type JavaScriptSourceType = {
   ): void;
 };
 
-export type JavaScriptApplication = JavascriptBootstrapProperties & {
-  packageJsonNodeEngine?: boolean | string;
-  eslintConfigFile?: string;
-  cjsExtension?: string;
-  mjsExtension?: string;
-  /** Root package.json scripts */
-  packageJsonScripts: Record<string, string>;
-  /** Root package.json scripts */
-  clientPackageJsonScripts: Record<string, string>;
+export type JavaScriptApplication = JavascriptBootstrapProperties &
+  ExportApplicationPropertiesFromCommand<typeof import('./generators/eslint/command.js').default> & {
+    packageJsonNodeEngine?: boolean | string;
+    eslintConfigFile?: string;
+    cjsExtension?: string;
+    mjsExtension?: string;
+    /** Root package.json scripts */
+    packageJsonScripts: Record<string, string>;
+    /** Root package.json scripts */
+    clientPackageJsonScripts: Record<string, string>;
 
-  addPrettierExtensions?: (extensions: string[]) => void;
-};
+    addPrettierExtensions?: (extensions: string[]) => void;
+  };