migrate vue to vite

mshima · Sep 13, 2023 · 441318c · 441318c
1 parent bc13e4b
commit 441318c
Show file tree

Hide file tree

Showing 83 changed files with 625 additions and 332 deletions.
diff --git a/generators/client/generator-needles.spec.mts b/generators/client/generator-needles.spec.mts
@@ -3,7 +3,7 @@ import ClientGenerator from './index.mjs';
 import { CLIENT_WEBPACK_DIR } from '../generator-constants.mjs';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 
-const { ANGULAR, VUE, REACT } = clientFrameworkTypes;
+const { ANGULAR, REACT } = clientFrameworkTypes;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const mockBlueprintSubGen: any = class extends ClientGenerator {
@@ -61,14 +61,4 @@ describe('needle API Webpack: JHipster client generator with blueprint', () => {
       runResult.assertFileContent(`${CLIENT_WEBPACK_DIR}webpack.common.js`, '{ devServer: {} }');
     });
   });
-
-  describe('Vue clientFramework', () => {
-    before(() => {
-      return generateAppWithClientFramework(VUE);
-    });
-
-    it('should add webpack config to webpack.common.js', async () => {
-      runResult.assertFileContent(`${CLIENT_WEBPACK_DIR}webpack.common.js`, '{ devServer: {} }');
-    });
-  });
 });
diff --git a/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs b/generators/cypress/templates/src/test/javascript/cypress/tsconfig.json.ejs
@@ -17,7 +17,11 @@
  limitations under the License.
 -%>
 {
+<%_ if (clientFrameworkVue) { _%>
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+<%_ } else { _%>
   "extends": "../../../../tsconfig.json",
+<%_ } _%>
   "compilerOptions": {
     "baseUrl": "./",
     "sourceMap": false,

diff --git a/generators/languages/files.mjs b/generators/languages/files.mjs
@@ -36,6 +36,12 @@ export const clientI18nFiles = {
         'user-management.json',
       ],
     },
+    {
+      condition: ctx => ctx.clientFrameworkVue && ctx.enableTranslation && !ctx.microfrontend,
+      path: `${CLIENT_MAIN_SRC_DIR}/i18n/`,
+      renameTo: context => `${context.clientSrcDir}/i18n/${context.lang}/${context.lang}.js`,
+      templates: ['index.js'],
+    },
     {
       from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
       to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,

diff --git a/generators/languages/languages.spec.mjs b/generators/languages/languages.spec.mjs
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { basicHelpers, defaultHelpers as helpers, result as runResult } from '../../test/support/index.mjs';
 
-import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, CLIENT_WEBPACK_DIR } from '../generator-constants.mjs';
+import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import { supportedLanguages } from './support/index.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -84,13 +84,9 @@ const noLanguageFiles = languageValue => {
 };
 
 const containsLanguageInVueStore = languageValue => {
-  it(`add language ${languageValue} into translation-store.ts, webpack.common.js`, () => {
+  it(`add language ${languageValue} into translation-store.ts`, () => {
     const langKey = languageValue.includes('-') ? `'${languageValue}'` : `${languageValue}`;
     runResult.assertFileContent(`${CLIENT_MAIN_SRC_DIR}app/shared/config/languages.ts`, `${langKey}: { name:`);
-    runResult.assertFileContent(
-      `${CLIENT_WEBPACK_DIR}webpack.common.js`,
-      `{ pattern: './src/main/webapp/i18n/${languageValue}/*.json', fileName: './i18n/${languageValue}.json' }`,
-    );
   });
 };
 

diff --git a/generators/languages/templates/src/main/webapp/i18n/index.js.ejs b/generators/languages/templates/src/main/webapp/i18n/index.js.ejs
@@ -0,0 +1,3 @@
+import { all } from 'deepmerge';
+
+export default all(Object.values(import.meta.glob('./*.json', { import: 'default', eager: true })));
diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs
@@ -512,7 +512,7 @@ task webapp_test(type: NpmTask) {
     inputs.dir("<%= clientSrcDir %>")
         .withPropertyName("webapp-source-dir")
         .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (!clientFrameworkAngular) { _%>
+  <%_ if (clientFrameworkReact) { _%>
     inputs.files("tsconfig.json")
         .withPropertyName("tsconfig")
         .withPathSensitivity(PathSensitivity.RELATIVE)
@@ -524,6 +524,24 @@ task webapp_test(type: NpmTask) {
         .withPathSensitivity(PathSensitivity.RELATIVE)
   <%_ } _%>
   <%_ if (clientFrameworkVue) { _%>
+
+    inputs.files("tsconfig.json", "tsconfig.app.json")
+        .withPropertyName("tsconfig")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ if (microfrontend) { _%>
+
+    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
+    webpackDevFiles.exclude("webpack.prod.js")
+    inputs.files(webpackDevFiles)
+        .withPropertyName("webpack-dir")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } else { _%>
+
+    inputs.files("vite.config.ts")
+        .withPropertyName("vite")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } _%>
+
     inputs.files(".postcssrc")
         .withPropertyName("postcssrc")
         .withPathSensitivity(PathSensitivity.RELATIVE)

diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs
@@ -134,7 +134,7 @@ task webapp(type: NpmTask) {
     inputs.dir("<%= clientSrcDir %>")
         .withPropertyName("webapp-source-dir")
         .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (!clientFrameworkAngular) { _%>
+  <%_ if (clientFrameworkReact) { _%>
     inputs.files("tsconfig.json")
         .withPropertyName("tsconfig")
         .withPathSensitivity(PathSensitivity.RELATIVE)
@@ -146,9 +146,26 @@ task webapp(type: NpmTask) {
         .withPathSensitivity(PathSensitivity.RELATIVE)
   <%_ } _%>
   <%_ if (clientFrameworkVue) { _%>
+    inputs.files("tsconfig.json", "tsconfig.app.json")
+        .withPropertyName("tsconfig")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+
     inputs.files(".postcssrc")
         .withPropertyName("postcssrc")
         .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ if (microfrontend) { _%>
+
+    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
+    webpackDevFiles.exclude("webpack.prod.js")
+    inputs.files(webpackDevFiles)
+        .withPropertyName("webpack-dir")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } else { _%>
+
+    inputs.files("vite.config.ts")
+        .withPropertyName("vite")
+        .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } _%>
   <%_ } _%>
     outputs.dir("<%= clientDistDir %>")
         .withPropertyName("webapp-build-dir")

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -986,16 +986,23 @@
                                         <include>target/classes/static/**/*.*</include>
                                         <include>package-lock.json</include>
                                         <include>package.json</include>
-                                        <include>webpack/*.*</include>
                                         <include>tsconfig.json</include>
   <%_ if (clientFrameworkAngular) { _%>
                                         <include>tsconfig.app.json</include>
+                                        <include>webpack/*.*</include>
   <%_ } _%>
   <%_ if (clientFrameworkReact) { _%>
                                         <include>.postcss.config.js</include>
+                                        <include>webpack/*.*</include>
   <%_ } _%>
   <%_ if (clientFrameworkVue) { _%>
+                                        <include>tsconfig.app.json</include>
                                         <include>.postcssrc.js</include>
+    <%_ if (microfrontend) { _%>
+                                        <include>webpack/*.*</include>
+    <%_ } else { _%>
+                                        <include>vite.config.ts</include>
+    <%_ } _%>
   <%_ } _%>
                                     </includes>
                                     <excludes>

diff --git a/...s/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs b/...s/server/templates/src/main/java/package/config/SecurityConfiguration_imperative.java.ejs
@@ -184,8 +184,16 @@ public class SecurityConfiguration {
 <%_ if (!skipClient) { _%>
                     .requestMatchers(mvc.pattern("/index.html"), mvc.pattern("/*.js"), mvc.pattern("/*.map"), mvc.pattern("/*.css")).permitAll()
                     .requestMatchers(mvc.pattern("/*.ico"), mvc.pattern("/*.png"), mvc.pattern("/*.svg"), mvc.pattern("/*.webapp")).permitAll()
+  <%_ if (clientFrameworkVue) { _%>
+                    .requestMatchers(mvc.pattern("/assets/**")).permitAll()
+    <%_ if (microfrontend) { _%>
                     .requestMatchers(mvc.pattern("/app/**")).permitAll()
                     .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
+    <%_ } _%>
+  <%_ } else { _%>
+                    .requestMatchers(mvc.pattern("/app/**")).permitAll()
+                    .requestMatchers(mvc.pattern("/i18n/**")).permitAll()
+  <%_ } _%>
                     .requestMatchers(mvc.pattern("/content/**")).permitAll()
                     .requestMatchers(mvc.pattern("/swagger-ui/**")).permitAll()
 <%_ } _%>

diff --git a/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs b/...ors/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs
@@ -212,7 +212,19 @@ public class SecurityConfiguration {
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
+  <%_ if (clientFrameworkVue) { _%>
+                pathMatchers(
+                    "/assets/**",
+    <%_ if (microfrontend) { _%>
+                    "/app/**",
+                    "/i18n/**",
+                    "/content/**",
+    <%_ } _%>
+                    "/swagger-ui/**"
+                )
+  <%_ } else { _%>
                 pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**")
+  <%_ } _%>
             )))
 <%_ if (!applicationTypeMicroservice) { _%>
             .cors(withDefaults())