generator-jhipster 8.0.0-beta.3 → 8.0.0-rc.1

package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs

@@ -38,11 +38,11 @@ import { useAppDispatch, useAppSelector } from 'app/config/store';
 export const UserManagement = () => {
   const dispatch = useAppDispatch();
 
-  const location = useLocation();
+  const pageLocation = useLocation();
   const navigate = useNavigate();
 
   const [pagination, setPagination] = useState(
-    overridePaginationStateWithQueryParams(getPaginationState(location, ITEMS_PER_PAGE, 'id'), location.search)
+    overridePaginationStateWithQueryParams(getPaginationState(pageLocation, ITEMS_PER_PAGE, 'id'), pageLocation.search)
   );
 
   const getUsersFromProps = () => {
@@ -54,8 +54,8 @@ export const UserManagement = () => {
       })
     );
     const endURL = `?page=${pagination.activePage}&sort=${pagination.sort},${pagination.order}`;
-    if (location.search !== endURL) {
-      navigate(`${location.pathname}${endURL}`);
+    if (pageLocation.search !== endURL) {
+      navigate(`${pageLocation.pathname}${endURL}`);
     }
   };
 
@@ -64,7 +64,7 @@ export const UserManagement = () => {
   }, [pagination.activePage, pagination.order, pagination.sort]);
 
   useEffect(() => {
-    const params = new URLSearchParams(location.search);
+    const params = new URLSearchParams(pageLocation.search);
     const page = params.get('page');
     const sortParam = params.get(SORT);
     if (page && sortParam) {
@@ -76,7 +76,7 @@ export const UserManagement = () => {
         order: sortSplit[1]
       });
     }
-  }, [location.search]);
+  }, [pageLocation.search]);
 
   const sort = p => () =>
     setPagination({

package/dist/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs

@@ -3,10 +3,10 @@ import { REDIRECT_URL } from 'app/shared/util/url-utils';
 import { useLocation } from 'react-router';
 
 export const LoginRedirect = () => {
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   useEffect(() => {
-    localStorage.setItem(REDIRECT_URL, location.state.from.pathname);
+    localStorage.setItem(REDIRECT_URL, pageLocation.state.from.pathname);
     window.location.reload();
   });
 

package/dist/generators/react/templates/src/main/webapp/app/modules/login/login.tsx.ejs

@@ -30,7 +30,7 @@ export const Login = () => {
   const showModalLogin = useAppSelector(state => state.authentication.showModalLogin);
   const [showModal, setShowModal] = useState(showModalLogin);
   const navigate = useNavigate();
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   useEffect(() => {
     setShowModal(true);
@@ -43,7 +43,7 @@ export const Login = () => {
     navigate('/');
   };
 
-  const { from } = location.state || { from: { pathname: '/', search: location.search } };
+  const { from } = pageLocation.state || { from: { pathname: '/', search: pageLocation.search } };
   if (isAuthenticated) {
     return <Navigate to={from} replace />;
   }

package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs

@@ -65,10 +65,10 @@ const <%= remote.capitalizedBaseName %>Routes = React.lazy(() => import('@<%= re
 
 const AppRoutes = () => {
 <%_ if (communicationSpringWebsocket) { _%>
-  const location = useLocation();
+  const pageLocation = useLocation();
   React.useEffect(() => {
-    sendActivity(location.pathname);
-  }, [location]);
+    sendActivity(pageLocation.pathname);
+  }, [pageLocation]);
 <%_ } _%>
   return (
     <div className="view-routes">

package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs

@@ -15,7 +15,7 @@ export const PrivateRoute = ({ children, hasAnyAuthorities = [], ...rest }: IOwn
   const sessionHasBeenFetched = useAppSelector(state => state.authentication.sessionHasBeenFetched);
   const account = useAppSelector(state => state.authentication.account);
   const isAuthorized = hasAnyAuthority(account.authorities, hasAnyAuthorities);
-  const location = useLocation();
+  const pageLocation = useLocation();
 
   if (!children) {
     throw new Error(`A component needs to be specified for private route for path ${(rest as any).path}`);
@@ -43,10 +43,10 @@ export const PrivateRoute = ({ children, hasAnyAuthorities = [], ...rest }: IOwn
     <Navigate
       to={{
         pathname: '<%_ if (authenticationTypeOauth2) { _%>/oauth2/authorization/oidc<%_ } else {_%>/login<%_ } _%>',
-        search: location.search,
+        search: pageLocation.search,
       }}
       replace
-      state={{ from: location }}
+      state={{ from: pageLocation }}
     />
   );
 };

package/dist/generators/react/templates/tsconfig.json.ejs

@@ -27,19 +27,19 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "noImplicitAny": false,
-    "outDir": "<%= clientDistDir %>app",
+    "outDir": "<%= this.relativeDir(clientRootDir, clientDistDir) %>app",
     "lib": ["dom", "es2015", "es2016", "es2017", "es2019", "es2020"],
     "types": ["webpack-env"],
     "allowJs": true,
     "checkJs": false,
     "baseUrl": "./",
     "paths": {
-        "app/*": ["<%= clientSrcDir %>app/*"]
+        "app/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
     },
     "importHelpers": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["<%= clientSrcDir %>app"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app"],
   "exclude": ["node_modules", "**/*.spec.ts", "**/*.spec.tsx"]
 }

package/dist/generators/react/templates/tsconfig.test.json.ejs

@@ -18,16 +18,16 @@
 -%>
 {
   "extends": "./tsconfig",
-  "include": ["<%= clientSrcDir %>app", "<%= clientSrcDir %>microfrontend"],
+  "include": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app", "<%= this.relativeDir(clientRootDir, clientSrcDir) %>microfrontend"],
   "exclude": [],
   "compilerOptions": {
     "paths": {
 <%_ if (microfrontend && applicationTypeGateway) { _%>
   <%_ for (const remote of microfrontends) { _%>
-      "@<%= remote.lowercaseBaseName %>/*": ["<%= clientSrcDir %>microfrontends/*"],
+      "@<%= remote.lowercaseBaseName %>/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>microfrontends/*"],
   <%_ } _%>
 <%_ } _%>
-      "app/*": ["<%= clientSrcDir %>app/*"]
+      "app/*": ["<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/*"]
    },
     "types": ["jest", "webpack-env"]
   }

package/dist/generators/react/templates/webpack/webpack.common.js.ejs

@@ -55,7 +55,7 @@ const getTsLoaderRule = env => {
 module.exports = async options => {
   const development = options.env === 'development';
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(path.resolve(__dirname, '../<%= this.relativeDir(clientRootDir, clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -67,7 +67,7 @@ return merge(
   cache: {
     // 1. Set cache type to filesystem
     type: 'filesystem',
-    cacheDirectory: path.resolve(__dirname, '../<%= temporaryDir %>webpack'),
+    cacheDirectory: path.resolve(__dirname, '../<%= this.relativeDir(clientRootDir, temporaryDir) %>webpack'),
     buildDependencies: {
       // 2. Add your config as buildDependency to get cache invalidation on config change
       config: [
@@ -95,7 +95,7 @@ return merge(
       {
         test: /\.tsx?$/,
         use: getTsLoaderRule(options.env),
-        include: [utils.root('./<%= clientSrcDir %>app')],
+        include: [utils.root('./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app')],
         exclude: [utils.root('node_modules')]
       }
       /*
@@ -148,17 +148,17 @@ return merge(
           from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
           to: 'swagger-ui/',
         },
-        { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
 <%_ } _%>
-        { from: './<%= clientSrcDir %>content/', to: 'content/' },
-        { from: './<%= clientSrcDir %>favicon.ico', to: 'favicon.ico' },
-        { from: './<%= clientSrcDir %>manifest.webapp', to: 'manifest.webapp' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/', to: 'content/' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico', to: 'favicon.ico' },
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp', to: 'manifest.webapp' },
         // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
-        { from: './<%= clientSrcDir %>robots.txt', to: 'robots.txt' }
+        { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt', to: 'robots.txt' }
       ],
     }),
     new HtmlWebpackPlugin({
-      template: './<%= clientSrcDir %>index.html',
+      template: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html',
       chunksSortMode: 'auto',
       inject: 'body',
       base: '/',

package/dist/generators/react/templates/webpack/webpack.dev.js.ejs

@@ -36,10 +36,10 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
   devtool: 'cheap-module-source-map', // https://reactjs.org/docs/cross-origin-errors.html
   mode: ENV,
   entry: [
-    './<%= clientSrcDir %>app/<%= microfrontend ? 'main' : 'index' %>'
+    './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'main' : 'index' %>'
   ],
   output: {
-    path: utils.root('<%= clientDistDir %>'),
+    path: utils.root('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
     filename: '[name].[contenthash:8].js',
     chunkFilename: '[name].[chunkhash:8].chunk.js'
   },
@@ -77,7 +77,7 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
   devServer: {
     hot: <%= !microfrontend %>,
     static: {
-      directory: './<%= clientDistDir %>',
+      directory: './<%= this.relativeDir(clientRootDir, clientDistDir) %>',
     },
     port: <%= devServerPort %>,
     proxy: [{

package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs

@@ -31,8 +31,8 @@ const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
-          './entities-menu': './<%= clientSrcDir %>app/entities/menu',
-          './entities-routes': './<%= clientSrcDir %>app/entities/routes',
+          './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/menu',
+          './entities-routes': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/routes',
         },
 <%_ } _%>
         shared: {

package/dist/generators/react/templates/webpack/webpack.prod.js.ejs

@@ -36,10 +36,10 @@ module.exports = async () => webpackMerge(await commonConfig({ env: ENV }), {
   // devtool: 'source-map', // Enable source maps. Please note that this will slow down the build
   mode: ENV,
   entry: {
-    main: './<%= clientSrcDir %>app/<%= microfrontend ? 'main' : 'index' %>'
+    main: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'main' : 'index' %>'
   },
   output: {
-    path: utils.root('<%= clientDistDir %>'),
+    path: utils.root('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
     filename: '[name].[contenthash:8].js',
     chunkFilename: '[name].[chunkhash:8].chunk.js'
   },

package/dist/generators/server/cleanup.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import cleanupOauth2 from './cleanup-oauth2.mjs';
-import { DOCKER_DIR } from '../generator-constants.mjs';
+import { JAVA_DOCKER_DIR } from '../generator-constants.mjs';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
@@ -86,8 +86,8 @@ export default function cleanupOldServerFilesTask(taskParam) {
     }
     if (this.isJhipsterVersionLessThan('5.2.2')) {
         if (application.authenticationTypeOauth2 && application.applicationTypeMicroservice) {
-            this.removeFolder(`${DOCKER_DIR}realm-config`);
-            this.removeFile(`${DOCKER_DIR}keycloak.yml`);
+            this.removeFolder(`${JAVA_DOCKER_DIR}realm-config`);
+            this.removeFile(`${JAVA_DOCKER_DIR}keycloak.yml`);
         }
     }
     if (this.isJhipsterVersionLessThan('5.8.0')) {
@@ -154,7 +154,7 @@ export default function cleanupOldServerFilesTask(taskParam) {
         this.removeFile(`${application.javaPackageSrcDir}TestContainersSpringContextCustomizerFactory.java`);
     }
     if (this.isJhipsterVersionLessThan('7.8.2')) {
-        this.removeFile(`${DOCKER_DIR}realm-config/jhipster-users-0.json`);
+        this.removeFile(`${JAVA_DOCKER_DIR}realm-config/jhipster-users-0.json`);
         this.removeFile(`${application.javaPackageSrcDir}NoOpMailConfiguration.java`);
     }
     if (this.isJhipsterVersionLessThan('7.10.0')) {

package/dist/generators/server/command.mjs

@@ -1,11 +1,104 @@
-import { GENERATOR_JAVA } from '../generator-list.mjs';
+/**
+ * Copyright 2013-2023 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import chalk from 'chalk';
+import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.mjs';
+import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/index.js';
 const command = {
     options: {
-        jhipsterDependenciesVersion: {
-            description: 'jhipster-dependencies version to use, this option is not persisted',
+        authenticationType: {
+            name: 'auth',
+            description: 'Provide authentication type for the application when skipping server side generation',
             type: String,
-            env: 'JHIPSTER_DEPENDENCIES_VERSION',
-            scope: 'generator',
+            scope: 'storage',
+        },
+        db: {
+            description: 'Provide DB name for the application when skipping server side generation',
+            type: String,
+        },
+        incrementalChangelog: {
+            description: 'Creates incremental database changelogs',
+            type: Boolean,
+            scope: 'storage',
+        },
+        skipUserManagement: {
+            description: 'Skip the user management module during app generation',
+            type: Boolean,
+            scope: 'storage',
+        },
+        recreateInitialChangelog: {
+            description: 'Recreate the initial database changelog based on the current config',
+            type: Boolean,
+        },
+        buildTool: {
+            name: 'build',
+            description: 'Provide build tool for the application when skipping server side generation',
+            type: String,
+            scope: 'storage',
+        },
+        cacheProvider: {
+            description: 'Cache provider',
+            type: String,
+            scope: 'storage',
+        },
+        enableSwaggerCodegen: {
+            description: 'API first development using OpenAPI-generator',
+            type: Boolean,
+            scope: 'storage',
+        },
+        enableHibernateCache: {
+            description: 'Enable hibernate cache',
+            type: Boolean,
+            scope: 'storage',
+        },
+        messageBroker: {
+            description: 'message broker',
+            type: String,
+            scope: 'storage',
+        },
+        reactive: {
+            description: 'Generate a reactive backend',
+            type: Boolean,
+            scope: 'storage',
+        },
+        searchEngine: {
+            description: 'Provide search engine for the application when skipping server side generation',
+            type: String,
+            scope: 'storage',
+        },
+        skipCheckLengthOfIdentifier: {
+            description: 'Skip check the length of the identifier, only for recent Oracle databases that support 30+ characters metadata',
+            type: Boolean,
+            scope: 'storage',
+        },
+        skipDbChangelog: {
+            description: 'Skip the generation of database migrations',
+            type: Boolean,
+        },
+        skipFakeData: {
+            description: 'Skip generation of fake data for development',
+            type: Boolean,
+            scope: 'storage',
+        },
+        websocket: {
+            description: 'Provide websocket option for the application when skipping server side generation',
+            type: String,
+            scope: 'storage',
         },
         projectVersion: {
             description: 'project version to use, this option is not persisted',
@@ -13,6 +106,12 @@ const command = {
             env: 'JHI_PROJECT_VERSION',
             scope: 'generator',
         },
+        jhipsterDependenciesVersion: {
+            description: 'jhipster-dependencies version to use, this option is not persisted',
+            type: String,
+            env: 'JHIPSTER_DEPENDENCIES_VERSION',
+            scope: 'generator',
+        },
         fakeKeytool: {
             description: 'Add a fake certificate store file for test purposes',
             type: Boolean,
@@ -20,12 +119,33 @@ const command = {
             scope: 'generator',
             hide: true,
         },
-        messageBroker: {
-            description: 'message broker',
-            type: String,
-            scope: 'storage',
+    },
+    configs: {
+        applicationType: {
+            description: 'Application type to generate',
+            cli: {
+                type: String,
+            },
+            prompt: {
+                type: 'list',
+                message: `Which ${chalk.yellow('*type*')} of application would you like to create?`,
+            },
+            choices: [
+                {
+                    value: APPLICATION_TYPE_MONOLITH,
+                    name: 'Monolithic application (recommended for simple projects)',
+                },
+                {
+                    value: APPLICATION_TYPE_GATEWAY,
+                    name: 'Gateway application',
+                },
+                {
+                    value: APPLICATION_TYPE_MICROSERVICE,
+                    name: 'Microservice application',
+                },
+            ],
         },
     },
-    import: [GENERATOR_JAVA],
+    import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
 };
 export default command;