diff --git a/web/.prettierrc.mjs b/web/.prettierrc.mjs new file mode 100644 index 0000000..7890fda --- /dev/null +++ b/web/.prettierrc.mjs @@ -0,0 +1 @@ +module.exports = require("@so1ve/prettier-config"); \ No newline at end of file diff --git a/web/package.json b/web/package.json index 0c25494..4f9eced 100644 --- a/web/package.json +++ b/web/package.json @@ -26,7 +26,8 @@ "scripts": { "dev": "vite", "build": "vite build", - "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", + "lint": "prettier . --check", + "lint:fix": "prettier . --write", "preview": "vite preview" }, "eslintConfig": { @@ -48,8 +49,9 @@ ] }, "devDependencies": { + "@so1ve/prettier-config": "^2.0.0", "@vitejs/plugin-react": "^4.2.1", - "prettier": "2.8.8", + "prettier": "^3.0.0", "typescript": "4.4.2", "vite": "^5.2.0" }, diff --git a/web/vite.config.js b/web/vite.config.js index 0550c47..3d1391e 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig, transformWithEsbuild } from 'vite'; import react from '@vitejs/plugin-react'; +import { defineConfig, transformWithEsbuild } from 'vite'; // https://vitejs.dev/config/ export default defineConfig({ @@ -7,14 +7,16 @@ export default defineConfig({ { name: 'treat-js-files-as-jsx', async transform(code, id) { - if (!id.match(/src\/.*\.js$/)) return null + if (!/src\/.*\.js$/.test(id)) { + return null; + } // Use the exposed transform from vite, instead of directly // transforming with esbuild return transformWithEsbuild(code, id, { loader: 'jsx', jsx: 'automatic', - }) + }); }, }, react(), @@ -33,10 +35,16 @@ export default defineConfig({ manualChunks: { 'react-core': ['react', 'react-dom', 'react-router-dom'], 'semi-ui': ['@douyinfe/semi-icons', '@douyinfe/semi-ui'], - 'semantic': ['semantic-ui-offline', 'semantic-ui-react'], - 'visactor': ['@visactor/react-vchart', '@visactor/vchart'], - 'tools': ['axios', 'history', 'marked'], - 'react-components': ['react-dropzone', 'react-fireworks', 'react-telegram-login', 'react-toastify', 'react-turnstile'], + semantic: ['semantic-ui-offline', 'semantic-ui-react'], + visactor: ['@visactor/react-vchart', '@visactor/vchart'], + tools: ['axios', 'history', 'marked'], + 'react-components': [ + 'react-dropzone', + 'react-fireworks', + 'react-telegram-login', + 'react-toastify', + 'react-turnstile', + ], }, }, }, @@ -44,9 +52,9 @@ export default defineConfig({ server: { proxy: { '/api': { - target: "http://localhost:3000", + target: 'http://localhost:3000', changeOrigin: true, - } - } - } + }, + }, + }, });