migrate vue to vite

mshima · Sep 12, 2023 · 13f0c38 · 13f0c38
1 parent 90b99f2
commit 13f0c38
Show file tree

Hide file tree

Showing 85 changed files with 472 additions and 975 deletions.
diff --git a/generators/client/files-common.mjs b/generators/client/files-common.mjs
@@ -24,7 +24,7 @@ export const files = {
       templates: ['.eslintignore', 'README.md.jhi.client'],
     },
     {
-      condition: generator => generator.microfrontend && (generator.clientFrameworkVue || generator.clientFrameworkReact),
+      condition: generator => generator.microfrontend && generator.clientFrameworkReact,
       templates: ['webpack/webpack.microfrontend.js.jhi'],
     },
     {

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/client/generator.mjs b/generators/client/generator.mjs
@@ -251,9 +251,9 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
           source.addWebpackConfig({
             config: `${conditional}require('./webpack.microfrontend')(config, options, targetOptions)`,
           });
-        } else if (application.clientFrameworkVue || application.clientFrameworkReact) {
+        } else if (application.clientFrameworkReact) {
           source.addWebpackConfig({ config: "require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })" });
-        } else {
+        } else if (!application.clientFrameworkVue) {
           throw new Error(`Client framework ${application.clientFramework} doesn't support microfrontends`);
         }
       },

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,
+      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/...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,12 @@ 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()
+  <%_ } 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,11 @@ public class SecurityConfiguration {
     public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
         http
             .securityMatcher(new NegatedServerWebExchangeMatcher(new OrServerWebExchangeMatcher(
+  <%_ if (clientFrameworkVue) { _%>
+                pathMatchers("/assets/**", "/swagger-ui/**")
+  <%_ } else { _%>
                 pathMatchers("/app/**", "/i18n/**", "/content/**", "/swagger-ui/**")
+  <%_ } _%>
             )))
 <%_ if (!applicationTypeMicroservice) { _%>
             .cors(withDefaults())