Skip to content

Commit

Permalink
Merge pull request #28 from biaov/feature/2024-04-07-18-20-43/upgrade
Browse files Browse the repository at this point in the history
v1.4.0
  • Loading branch information
biaov authored Apr 7, 2024
2 parents 24fd804 + ea40c17 commit d444d30
Show file tree
Hide file tree
Showing 31 changed files with 1,027 additions and 1,745 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
dist
.log
.git
3 changes: 3 additions & 0 deletions admin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/node_modules
/dist
/.git
2 changes: 1 addition & 1 deletion admin/.ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"upgrade": true,
"reject": ["typescript", "@antv/g2"]
"reject": ["typescript", "@antv/g2", "eslint"]
}
243 changes: 144 additions & 99 deletions admin/package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"url": "https://biaov.cn/"
},
"description": "生态系统的控制台",
"type": "module",
"scripts": {
"start": "npm run dev",
"dev": "vite",
Expand All @@ -17,8 +16,9 @@
"lint": "eslint --ext .ts,.tsx ./src --fix",
"ncu": "ncu --configFileName .ncurc.json && npm i"
},
"type": "module",
"engines": {
"node": ">=20"
"node": ">=20.12"
},
"keywords": [
"控制台",
Expand All @@ -42,10 +42,10 @@
}
],
"dependencies": {
"@ant-design/icons": "^5.3.5",
"@ant-design/icons": "^5.3.6",
"@antv/g2": "^4.2.10",
"@reduxjs/toolkit": "^2.2.2",
"antd": "^5.15.4",
"@reduxjs/toolkit": "^2.2.3",
"antd": "^5.16.1",
"axios": "^1.6.8",
"dayjs": "^1.11.10",
"react": "^18.2.0",
Expand All @@ -55,11 +55,11 @@
"react-router-dom": "^6.22.3"
},
"devDependencies": {
"@types/node": "^20.11.30",
"@types/react": "^18.2.73",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0",
"@types/node": "^20.12.5",
"@types/react": "^18.2.74",
"@types/react-dom": "^18.2.24",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
Expand All @@ -71,7 +71,7 @@
"less": "^4.2.0",
"prettier": "^3.2.5",
"typescript": "5.0.4",
"vite": "^5.2.6",
"vite": "^5.2.8",
"vite-plugin-eslint": "^1.8.1"
}
}
Binary file removed admin/public/logo.png
Binary file not shown.
13 changes: 10 additions & 3 deletions admin/public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added admin/src/assets/.gitkeep
Empty file.
17 changes: 15 additions & 2 deletions admin/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import react from '@vitejs/plugin-react'
import { resolve } from 'path'
import eslint from 'vite-plugin-eslint'

const env = loadEnv('development', resolve(__dirname, './'))
const { dirname } = import.meta
const env = loadEnv('development', resolve(dirname, './'))

export default defineConfig({
base: '/admin',
Expand All @@ -29,7 +30,7 @@ export default defineConfig({
},
resolve: {
alias: {
'@': resolve(__dirname, './src')
'@': resolve(dirname, './src')
}
},
css: {
Expand All @@ -39,5 +40,17 @@ export default defineConfig({
additionalData: `@import '@/styles/variable.less';`
}
}
},
build: {
sourcemap: false,
rollupOptions: {
output: {
manualChunks: {
antd: ['antd'],
'ant-g2': ['@antv/g2']
}
}
},
chunkSizeWarningLimit: 1024
}
})
File renamed without changes.
4 changes: 4 additions & 0 deletions mobile/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/node_modules
/dist
/.git
.env.local
2 changes: 1 addition & 1 deletion mobile/.ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"upgrade": true,
"reject": ["pinia", "vite", "@vitejs/plugin-vue"]
"reject": ["pinia", "vite", "@vitejs/plugin-vue", "eslint"]
}
Loading

0 comments on commit d444d30

Please sign in to comment.