Browse Source

Merge pull request #222 from zilliztech/update-packages

Update packages
ryjiang 2 years ago
parent
commit
f74b237a1c
6 changed files with 874 additions and 975 deletions
  1. 16 16
      client/package.json
  2. 352 525
      client/yarn.lock
  3. 28 32
      server/package.json
  4. 1 12
      server/src/app.ts
  5. 0 26
      server/src/swagger.ts
  6. 477 364
      server/yarn.lock

+ 16 - 16
client/package.json

@@ -13,40 +13,40 @@
     "@material-ui/lab": "4.0.0-alpha.58",
     "@material-ui/pickers": "^3.3.10",
     "@mui/x-data-grid": "^4.0.0",
-    "axios": "^0.21.3",
-    "d3": "^7.8.2",
-    "dayjs": "^1.10.5",
+    "axios": "^1.4.0",
+    "d3": "^7.8.5",
+    "dayjs": "^1.11.9",
     "file-saver": "^2.0.5",
     "i18next": "^20.3.1",
-    "papaparse": "^5.3.1",
+    "papaparse": "^5.4.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-highlight-words": "^0.17.0",
     "react-i18next": "^12.0.0",
-    "react-router-dom": "^6.14.1",
-    "react-syntax-highlighter": "^15.4.4",
-    "socket.io-client": "^4.1.3",
-    "vite": "^3.2.2",
+    "react-router-dom": "^6.14.2",
+    "react-syntax-highlighter": "^15.5.0",
+    "socket.io-client": "^4.7.1",
+    "vite": "^4.4.4",
     "vite-plugin-svgr": "^0.3.0",
     "web-vitals": "^1.0.1"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "12.1.2",
     "@testing-library/react-hooks": "^7.0.1",
     "@testing-library/user-event": "^12.1.10",
     "@types/d3": "^7.4.0",
-    "@types/file-saver": "^2.0.4",
+    "@types/file-saver": "^2.0.5",
     "@types/loadable__component": "^5.13.4",
     "@types/node": "^12.0.0",
-    "@types/papaparse": "^5.2.6",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.8",
-    "@types/react-highlight-words": "^0.16.2",
+    "@types/papaparse": "^5.3.7",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
+    "@types/react-highlight-words": "^0.16.4",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-syntax-highlighter": "^13.5.2",
-    "@types/webpack-env": "^1.16.3",
-    "@vitejs/plugin-react": "^2.2.0",
+    "@types/webpack-env": "^1.18.1",
+    "@vitejs/plugin-react": "^4.0.3",
     "@vitejs/plugin-react-refresh": "^1.3.6",
     "@vitest/coverage-c8": "^0.25.0",
     "jsdom": "^20.0.2",

File diff suppressed because it is too large
+ 352 - 525
client/yarn.lock


+ 28 - 32
server/package.json

@@ -12,26 +12,24 @@
     "url": "https://github.com/zilliztech/attu"
   },
   "dependencies": {
-    "@zilliz/milvus2-sdk-node": "^2.2.17",
-    "axios": "^1.3.2",
+    "@zilliz/milvus2-sdk-node": "^2.2.19",
+    "axios": "^1.4.0",
     "chalk": "^4.1.2",
     "class-sanitizer": "^1.0.1",
     "class-transformer": "^0.4.0",
-    "class-validator": "^0.13.1",
+    "class-validator": "^0.14.0",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "csv-writer": "^1.6.0",
-    "express": "^4.17.1",
+    "express": "^4.18.2",
     "glob": "^7.2.0",
-    "helmet": "^4.6.0",
-    "http-errors": "^1.8.1",
+    "helmet": "^7.0.0",
+    "http-errors": "^2.0.0",
     "lru-cache": "^6.0.0",
     "morgan": "^1.10.0",
-    "node-cron": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "socket.io": "^4.3.1",
-    "swagger-jsdoc": "^6.1.0",
-    "swagger-ui-express": "^4.1.6"
+    "node-cron": "^3.0.2",
+    "rimraf": "^5.0.1",
+    "socket.io": "^4.7.1"
   },
   "jest": {
     "testEnvironment": "node",
@@ -51,29 +49,27 @@
   },
   "devDependencies": {
     "@types/chalk": "^2.2.0",
-    "@types/cors": "^2.8.12",
-    "@types/express": "^4.17.13",
-    "@types/glob": "^7.2.0",
-    "@types/http-errors": "^1.8.1",
-    "@types/jest": "^27.0.2",
+    "@types/cors": "^2.8.13",
+    "@types/express": "^4.17.17",
+    "@types/glob": "^8.1.0",
+    "@types/http-errors": "^2.0.1",
+    "@types/jest": "^29.5.3",
     "@types/lru-cache": "^5.1.1",
-    "@types/morgan": "^1.9.3",
-    "@types/node": "^16.11.6",
-    "@types/node-cron": "^3.0.0",
-    "@types/supertest": "^2.0.11",
-    "@types/swagger-jsdoc": "^6.0.1",
-    "@types/swagger-ui-express": "^4.1.3",
-    "@types/ws": "^8.2.0",
-    "electron": "^21.0.1",
-    "electron-builder": "^23.6.0",
-    "jest": "^27.3.1",
-    "nodemon": "^2.0.14",
-    "prettier": "^2.4.1",
-    "supertest": "^6.1.6",
-    "ts-jest": "^27.0.7",
-    "ts-node": "^10.4.0",
+    "@types/morgan": "^1.9.4",
+    "@types/node": "^20.4.2",
+    "@types/node-cron": "^3.0.8",
+    "@types/supertest": "^2.0.12",
+    "@types/ws": "^8.5.5",
+    "electron": "^25.3.0",
+    "electron-builder": "^24.4.0",
+    "jest": "^29.6.1",
+    "nodemon": "^3.0.1",
+    "prettier": "^3.0.0",
+    "supertest": "^6.3.3",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
-    "typescript": "^4.4.4"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "prebuild": "tslint -c tslint.json -p tsconfig.json --fix",

+ 1 - 12
server/src/app.ts

@@ -3,7 +3,6 @@ import cors from 'cors';
 import helmet from 'helmet';
 import * as http from 'http';
 import { Server, Socket } from 'socket.io';
-import swaggerUi from 'swagger-ui-express';
 import LruCache from 'lru-cache';
 import * as path from 'path';
 import chalk from 'chalk';
@@ -21,7 +20,6 @@ import {
   ErrorMiddleware,
   ReqHeaderMiddleware,
 } from './middlewares';
-import { surveSwaggerSpecification } from './swagger';
 import { EXPIRED_TIME, INSIGHT_CACHE } from './utils/Const';
 import { getIp } from './utils/Network';
 // initialize express app
@@ -52,9 +50,6 @@ router.get('/healthy', (req, res, next) => {
 const server = http.createServer(app);
 // default port 3000
 const PORT = 3000;
-// swagger
-const swaggerSpecs = surveSwaggerSpecification();
-
 // setup middlewares
 // use cache
 app.set(INSIGHT_CACHE, insightCache);
@@ -78,8 +73,6 @@ app.use(ReqHeaderMiddleware);
 app.use('/api/v1', router);
 // Return client build files
 app.use(express.static('build'));
-// use swagger
-app.use('/api/v1/swagger', swaggerUi.serve, swaggerUi.setup(swaggerSpecs));
 
 // handle every other route with index.html, which will contain
 // a script tag to your application's JavaScript file(s).
@@ -125,10 +118,6 @@ server.listen(PORT, () => {
 
   const ips = getIp();
   ips.forEach(ip => {
-    console.info(
-      chalk.cyanBright(
-        `Attu server started: http://${ip}:${PORT}/api/v1/swagger/`
-      )
-    );
+    console.info(chalk.cyanBright(`Attu server started: http://${ip}:${PORT}`));
   });
 });

+ 0 - 26
server/src/swagger.ts

@@ -1,26 +0,0 @@
-import swaggerJsdoc from "swagger-jsdoc";
-
-export const surveSwaggerSpecification = () => {
-  // Swagger definition
-  // You can set every attribute except paths and swagger
-  // https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md
-
-  // Options for the swagger docs
-  const options = {
-    definition: {
-      openapi: "3.0.0",
-      info: {
-        title: "Attu server",
-        version: "1.0.0",
-      },
-      servers: [{ url: "/api/v1" }],
-    },
-    apis: ["./src/**/*.yml"],
-  };
-  const swaggerSpec = swaggerJsdoc(options);
-
-  // And here we go, we serve it.
-  // res.setHeader("Content-Type", "application/json");
-  // res.send(swaggerSpec);
-  return swaggerSpec;
-};

File diff suppressed because it is too large
+ 477 - 364
server/yarn.lock


Some files were not shown because too many files changed in this diff