Merge branch 'kylin_dev'

Author: 齐下无贰

.vscode/extensions.json

@@ -1,5 +1,6 @@
 {
     "recommendations": [
         "prisma.prisma",
+        "esbenp.prettier-vscode",
     ],
 }

electron-app/src/preload.ts

@@ -31,7 +31,5 @@ contextBridge.exposeInMainWorld('api', {
     setTheme:         (theme: ThemeMode) => ipcRenderer.invoke('app:set-theme', theme),
     openFile:         (options: OpenFileOptions) => ipcRenderer.invoke("sys:open-file", options),
     readFile:         (path: string) => ipcRenderer.invoke("sys:read-file", path),
-
     currentPlatform:  () => ipcRenderer.invoke('sys:get-os')
 })
-

react-app/craco.config.js

@@ -1,27 +1,56 @@
 // We have .ts file in node_modules/, but react won't load any .ts
 // file other than those in src/, so we extend react's configuration,
 // making it load *.ts file.
+const path = require("path");
+
 module.exports = {
-    webpack: {
-      configure: (webpackConfig) => ({
-        ...webpackConfig,
-        module: {
-          ...webpackConfig.module,
-          rules: webpackConfig.module.rules.map((rule) => {
-            if (!rule.oneOf) return rule;
-            return {
-              ...rule,
-              oneOf: rule.oneOf.map((ruleObject) => {
-                if (
-                  !new RegExp(ruleObject.test).test('.ts') ||
-                  !ruleObject.include
-                )
-                  return ruleObject;
-                return { ...ruleObject, include: undefined };
-              }),
-            };
-          }),
+  webpack: {
+    configure: (webpackConfig) => ({
+      ...webpackConfig,
+      module: {
+        ...webpackConfig.module,
+        rules: webpackConfig.module.rules.map((rule) => {
+          if (!rule.oneOf) return rule;
+          return {
+            ...rule,
+            oneOf: rule.oneOf.map((ruleObject) => {
+              if (
+                !new RegExp(ruleObject.test).test(".ts") ||
+                !ruleObject.include
+              )
+                return ruleObject;
+              return { ...ruleObject, include: undefined };
+            }),
+          };
+        }),
+      },
+      resolve: {
+        ...webpackConfig.resolve,
+        // 解决 Module not found
+        // If you want to include a polyfill, you need to:
+        //         - add a fallback 'resolve.fallback: { "path": require.resolve("path-browserify") }'
+        //         - install 'path-browserify'
+        // If you don't want to include a polyfill, you can use an empty module like this:
+        //         resolve.fallback: { "path": false }
+        fallback: {
+          ...webpackConfig.resolve.fallback,
+          path: require.resolve("path-browserify"),
+          fs: require.resolve("fs"),
+          // tls: false,
+          // net: false,
+          // zlib: false,
+          // http: false,
+          // https: false,
+          // stream: false,
+          // crypto: false,
         },
-      }),
-    },
-  };
+        extensions: [".js", ".jsx", ".json", ".ts", ".tsx"],
+        // https://blog.csdn.net/peter_hzq/article/details/120656880
+        alias: {
+          "@": path.resolve(__dirname, "src"),
+        },
+        // modules: [webpackPaths.srcPath, "node_modules"],
+      },
+    }),
+  },
+};

react-app/package.json

@@ -3,30 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "homepage": "./",
-  "dependencies": {
-    "@heroicons/react": "^2.0.18",
-    "@privata/types": "file:../common-types",
-    "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.0.4",
-    "@radix-ui/react-popover": "^1.0.6",
-    "@radix-ui/react-scroll-area": "^1.0.4",
-    "@radix-ui/react-select": "^1.2.2",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-tooltip": "^1.0.6",
-    "@tanstack/react-table": "^8.10.3",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^13.0.0",
-    "@testing-library/user-event": "^13.2.1",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "axios": "^1.4.0",
-    "framer-motion": "^10.12.18",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^6.14.1",
-    "react-scripts": "5.0.1",
-    "web-vitals": "^2.1.0"
-  },
   "scripts": {
     "start": "craco start",
     "build": "craco build",
@@ -35,7 +11,8 @@
     "prisma-generate": "prisma generate",
     "prisma-migrate": "prisma migrate dev --name init",
     "prisma-db-push": "prisma db push",
-    "jest-test": "jest"
+    "jest-test": "jest",
+    "npm-check-update": "npm-check --skip-unused -u"
   },
   "eslintConfig": {
     "extends": [
@@ -55,16 +32,44 @@
       "last 1 safari version"
     ]
   },
+  "prisma": {
+    "schema": "src/api/db/prisma/schema.prisma"
+  },
+  "dependencies": {
+    "@heroicons/react": "^2.0.18",
+    "@prisma/client": "^5.5.2",
+    "@privata/types": "file:../common-types",
+    "@radix-ui/react-checkbox": "^1.0.4",
+    "@radix-ui/react-dialog": "^1.0.4",
+    "@radix-ui/react-popover": "^1.0.6",
+    "@radix-ui/react-scroll-area": "^1.0.4",
+    "@radix-ui/react-select": "^1.2.2",
+    "@radix-ui/react-tabs": "^1.0.4",
+    "@radix-ui/react-tooltip": "^1.0.6",
+    "@tanstack/react-table": "^8.10.3",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^13.0.0",
+    "@testing-library/user-event": "^13.2.1",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "axios": "^1.4.0",
+    "framer-motion": "^10.12.18",
+    "path-browserify": "^1.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.14.1",
+    "react-scripts": "5.0.1",
+    "typescript": "^4.4.2",
+    "web-vitals": "^2.1.0"
+  },
   "devDependencies": {
     "@craco/craco": "^7.1.0",
-    "@prisma/client": "^5.3.1",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^29.5.5",
     "@types/node": "^16.7.13",
     "jest": "^29.7.0",
-    "prisma": "^5.3.1",
+    "prisma": "^5.5.2",
     "tailwindcss": "^3.3.3",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.4.2"
+    "ts-node": "^10.9.1"
   }
 }