Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch vite to esm build #24759

Merged
merged 4 commits into from
Jan 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion generators/bootstrap/support/eslint-transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ import { Minimatch } from 'minimatch';

import BaseGenerator from '../../base-core/index.js';
import { getPackageRoot } from '../../../lib/index.js';
import { JS_PRETTIER_EXTENSIONS } from '../../generator-constants.js';

// eslint-disable-next-line import/prefer-default-export
export const createESLintTransform = function (
this: BaseGenerator | void,
transformOptions: { ignoreErrors?: boolean; extensions?: string } = {},
) {
const { extensions = 'js,ts', ignoreErrors } = transformOptions;
const { extensions = JS_PRETTIER_EXTENSIONS, ignoreErrors } = transformOptions;
const minimatch = new Minimatch(`**/*.{${extensions}}`, { dot: true });
const eslint = new ESLint.ESLint({
fix: true,
Expand Down
3 changes: 2 additions & 1 deletion generators/generator-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ export const SERVER_MAIN_SRC_DIR = `${MAIN_DIR}java/`;
export const SERVER_MAIN_RES_DIR = `${MAIN_DIR}resources/`;
export const SERVER_TEST_SRC_DIR = `${TEST_DIR}java/`;
export const SERVER_TEST_RES_DIR = `${TEST_DIR}resources/`;
export const PRETTIER_EXTENSIONS = 'md,json,yml,html,cjs,mjs,js,ts,tsx,css,scss,vue,java';
export const JS_PRETTIER_EXTENSIONS = 'cjs,mjs,js,cts,mts,ts';
export const PRETTIER_EXTENSIONS = `md,json,yml,html,${JS_PRETTIER_EXTENSIONS},tsx,css,scss,vue,java`;
28 changes: 14 additions & 14 deletions generators/vue/__snapshots__/generator.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,10 @@ exports[`generator - vue gateway-jwt-skipUserManagement(true)-withAdminUi(false)
"clientRoot/tsconfig.vitest.json": {
"stateCleared": "modified",
},
"clientRoot/vite.config.ts": {
"clientRoot/vite.config.mts": {
"stateCleared": "modified",
},
"clientRoot/vitest.config.ts": {
"clientRoot/vitest.config.mts": {
"stateCleared": "modified",
},
}
Expand Down Expand Up @@ -970,10 +970,10 @@ exports[`generator - vue gateway-oauth2-withAdminUi(true)-skipJhipsterDependenci
"clientRoot/tsconfig.vitest.json": {
"stateCleared": "modified",
},
"clientRoot/vite.config.ts": {
"clientRoot/vite.config.mts": {
"stateCleared": "modified",
},
"clientRoot/vitest.config.ts": {
"clientRoot/vitest.config.mts": {
"stateCleared": "modified",
},
}
Expand Down Expand Up @@ -1431,10 +1431,10 @@ exports[`generator - vue microservice-jwt-skipUserManagement(false)-withAdminUi(
"clientRoot/tsconfig.vitest.json": {
"stateCleared": "modified",
},
"clientRoot/vite.config.ts": {
"clientRoot/vite.config.mts": {
"stateCleared": "modified",
},
"clientRoot/vitest.config.ts": {
"clientRoot/vitest.config.mts": {
"stateCleared": "modified",
},
"clientRoot/webpack/config.js": {
Expand Down Expand Up @@ -1910,10 +1910,10 @@ exports[`generator - vue microservice-oauth2-withAdminUi(true)-skipJhipsterDepen
"tsconfig.vitest.json": {
"stateCleared": "modified",
},
"vite.config.ts": {
"vite.config.mts": {
"stateCleared": "modified",
},
"vitest.config.ts": {
"vitest.config.mts": {
"stateCleared": "modified",
},
"webpack/config.js": {
Expand Down Expand Up @@ -2542,10 +2542,10 @@ exports[`generator - vue monolith-jwt-skipUserManagement(false)-withAdminUi(true
"tsconfig.vitest.json": {
"stateCleared": "modified",
},
"vite.config.ts": {
"vite.config.mts": {
"stateCleared": "modified",
},
"vitest.config.ts": {
"vitest.config.mts": {
"stateCleared": "modified",
},
}
Expand Down Expand Up @@ -2976,10 +2976,10 @@ exports[`generator - vue monolith-oauth2-withAdminUi(false)-skipJhipsterDependen
"tsconfig.vitest.json": {
"stateCleared": "modified",
},
"vite.config.ts": {
"vite.config.mts": {
"stateCleared": "modified",
},
"vitest.config.ts": {
"vitest.config.mts": {
"stateCleared": "modified",
},
}
Expand Down Expand Up @@ -3419,10 +3419,10 @@ exports[`generator - vue monolith-session-skipUserManagement(true)-withAdminUi(f
"tsconfig.vitest.json": {
"stateCleared": "modified",
},
"vite.config.ts": {
"vite.config.mts": {
"stateCleared": "modified",
},
"vitest.config.ts": {
"vitest.config.mts": {
"stateCleared": "modified",
},
}
Expand Down
4 changes: 4 additions & 0 deletions generators/vue/cleanup.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,8 @@ export default function cleanupOldFilesTask({ application } = {}) {
this.removeFile('webpack/webpack.dev.js');
this.removeFile('webpack/webpack.prod.js');
}
if (this.isJhipsterVersionLessThan('8.1.1')) {
this.removeFile('vite.config.ts');
this.removeFile('vitest.config.ts');
}
}
4 changes: 2 additions & 2 deletions generators/vue/files-vue.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export const vueFiles = {
'tsconfig.vitest.json',
'.postcssrc.js',
'.eslintrc.cjs',
'vite.config.ts',
'vitest.config.ts',
'vite.config.mts',
'vitest.config.mts',
],
}),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
limitations under the License.
-%>
import { fileURLToPath, URL } from 'node:url';
import { dirname, join } from 'node:path';
import { existsSync } from 'node:fs';

import { mergeConfig, defineConfig } from 'vite';
import {
<%_ if (microfrontend) { _%>
mergeConfig,
<%_ } _%>
defineConfig,
} from 'vite';
import vue from '@vitejs/plugin-vue';
import copy from 'rollup-plugin-copy';
<%_ if (microfrontend) { _%>
Expand All @@ -34,6 +38,9 @@ const getFileFromRepo = (file: string) =>
? fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url))
: fileURLToPath(new URL(`./node_modules/${file}`, import.meta.url));

const { getAbsoluteFSPath } = await import('swagger-ui-dist');
const swaggerUiPath = getAbsoluteFSPath();

// eslint-disable-next-line prefer-const
let config = defineConfig({
plugins: [
Expand All @@ -42,8 +49,8 @@ let config = defineConfig({
targets: [
{
src: [
`${require('swagger-ui-dist').getAbsoluteFSPath()}/*.{js,css,html,png}`,
`!${require('swagger-ui-dist').getAbsoluteFSPath()}/**/index.html`,
`${swaggerUiPath}/*.{js,css,html,png}`,
`!${swaggerUiPath}/**/index.html`,
getFileFromRepo('axios/dist/axios.min.js'),
fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url)),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
limitations under the License.
-%>
import { fileURLToPath } from 'node:url'
import { mergeConfig, defineConfig, configDefaults } from 'vitest/config';
import viteConfig from './vite.config'
import { mergeConfig, defineConfig } from 'vitest/config';
import viteConfig from './vite.config.mjs'

export default mergeConfig(
viteConfig,
Expand Down