refactor: admin应该能用了

bangbang93 · Oct 24, 2023 · 6ffdbab · 6ffdbab
1 parent cabca43
commit 6ffdbab
Show file tree

Hide file tree

Showing 7 changed files with 1,526 additions and 1,189 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
-    "@bangbang93/eslint-config-recommended": "^0.0.2",
+    "@bangbang93/eslint-config-recommended": "^1.1.1",
     "@nestjs/cli": "^9.1.5",
     "@tsconfig/node16": "^1.0.3",
     "@types/bcrypt": "^3.0.0",
@@ -124,8 +124,8 @@
     "@types/prismjs": "^1.26.0",
     "@types/serve-favicon": "^2.5.0",
     "@types/webpack-node-externals": "^2.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
     "@vue/cli-plugin-babel": "^5.0.1",
     "@vue/cli-service": "^5.0.1",
     "babel-loader": "^8.1.0",
@@ -144,7 +144,7 @@
     "release-it": "^16.0.0",
     "shelljs": "^0.8.5",
     "ts-loader": "^4.5.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "url": "^0.11.0",
     "url-loader": "^4.0.0",
     "vue-loader": "^17.0.1",

diff --git a/packages/admin/env.d.ts b/packages/admin/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -14,5 +14,12 @@
     "typescript": "^5.2.2",
     "vite": "^4.5.0",
     "vue-tsc": "^1.8.20"
+  },
+  "dependencies": {
+    "element-plus": "^2.4.1",
+    "font-awesome": "^4.7.0",
+    "vue": "^3.3.6",
+    "vue-fetch": "^2.0.0",
+    "vue-router": "^4.2.5"
   }
 }
diff --git a/packages/admin/src/App.vue b/packages/admin/src/App.vue
@@ -3,3 +3,10 @@
     <router-view />
   </div>
 </template>
+<script lang="ts">
+import {defineComponent} from 'vue'
+
+export default defineComponent({
+  name: 'FreyjaAdmin',
+})
+</script>
diff --git a/packages/admin/tsconfig.json b/packages/admin/tsconfig.json
@@ -9,7 +9,6 @@
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
@@ -18,7 +17,8 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "allowJs": true
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
   "references": [{ "path": "./tsconfig.node.json" }]

diff --git a/src/index.ts b/src/index.ts
@@ -44,13 +44,13 @@ export async function bootstrap(): Promise<void> {
   } else {
     app.use(morgan('combined'))
   }
-  const RedisStore = connectRedis(session)
+  const redisStore = connectRedis(session)
 
   app.use(cookieParser())
-  const sessionConfig = configService.get('session')
+  const sessionConfig = configService.get('session') as Record<string, string>
   app.use(session({
     name: 'freyja.sid',
-    store: new RedisStore({
+    store: new redisStore({
       client: redis,
       prefix: 'freyja:session:',
     }),
@@ -69,10 +69,9 @@ export async function bootstrap(): Promise<void> {
 
   const port = parseInt(configService.get('PORT', '3000'), 10)
 
-  /* eslint-disable @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires */
   if (configService.get('NODE_ENV') === 'production') {
     const appPath = join(__dirname, '../client/dist/server/server.js')
-    const clientApp = (await import(appPath)).default
+    const clientApp = (await import(appPath) as typeof import('../client/src/entries/entry-server')).default
     app.use(cacheControl({
       '/': 3600,
       '/article/**': 3600,
@@ -86,12 +85,12 @@ export async function bootstrap(): Promise<void> {
   }
   eApp.get('*', express.static(path.join(__dirname, '..', 'client/dist')))
 
-  if (configService.get('freyja.fundebug.enable')) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
-    const fundebug = require('fundebug-nodejs')
-    fundebug.apikey = configService.get('freyja.fundebug.apikey')
-    app.use(fundebug.ExpressErrorHandler)
-  }
+  // if (configService.get('freyja.fundebug.enable')) {
+  //   // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
+  //   const fundebug = require('fundebug-nodejs')
+  //   fundebug.apikey = configService.get('freyja.fundebug.apikey')
+  //   app.use(fundebug.ExpressErrorHandler)
+  // }
 
   await app.listen(port)
 }