From 352eb74d96cd65aca50014e5795e156ae535d9e0 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Fri, 14 Oct 2022 11:35:19 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8Dtushan=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/github-app/package.json | 2 +- pnpm-lock.yaml | 168 +++++++++++++++++------------------ server/admin/package.json | 4 +- server/admin/src/index.ts | 2 +- 4 files changed, 85 insertions(+), 91 deletions(-) diff --git a/apps/github-app/package.json b/apps/github-app/package.json index 63fd803a..9f71c148 100644 --- a/apps/github-app/package.json +++ b/apps/github-app/package.json @@ -12,7 +12,7 @@ "probot-app" ], "scripts": { - "dev": "nodemon --watch 'src/**' --ext 'ts' --ignore 'src/**/*.spec.ts' --exec 'ts-node --transpile-only src/index.ts'", + "dev": "nodemon --watch 'src/**' --ext 'ts' --ignore 'src/**/*.spec.ts' --exec \"ts-node --transpile-only src/index.ts\"", "build": "tsc", "test": "jest" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14fcac42..3fd31e2e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -770,7 +770,7 @@ importers: react-use: ^17.4.0 recharts: ^2.1.12 ts-node: ^10.8.0 - tushan: github:msgbyte/tushan + tushan: ^0.0.1 typescript: ^4.3.3 dependencies: '@adminjs/koa': 2.1.0_bzafb32chd4r7xgggv3o2nxzwa @@ -783,7 +783,7 @@ importers: koa2-formidable: 1.0.3 react-use: 17.4.0 recharts: 2.1.14 - tushan: github.com/msgbyte/tushan/7d99640b09afcc0fcde08f94f69371044a7c7527_ts-node@10.9.1 + tushan: 0.0.1_ts-node@10.9.1 devDependencies: '@types/koa': 2.13.5 '@types/koa-session': 5.10.6 @@ -1382,7 +1382,7 @@ packages: '@babel/compat-data': 7.18.13 '@babel/core': 7.18.13 '@babel/helper-validator-option': 7.18.6 - browserslist: 4.21.3 + browserslist: 4.21.4 semver: 6.3.0 /@babel/helper-create-class-features-plugin/7.18.13_@babel+core@7.18.13: @@ -11472,7 +11472,7 @@ packages: babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.21 picomatch: 2.3.1 - styled-components: 5.3.6_react@18.2.0 + styled-components: 5.3.6_mdz3marskokvq6744hhidi3r5a /babel-plugin-syntax-jsx/6.18.0: resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==} @@ -26470,7 +26470,6 @@ packages: prop-types: 15.8.1 react: 16.14.0 scheduler: 0.19.1 - dev: false /react-dom/17.0.2_react@17.0.2: resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} @@ -27190,7 +27189,6 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 prop-types: 15.8.1 - dev: false /react/17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} @@ -28273,7 +28271,6 @@ packages: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - dev: false /scheduler/0.20.2: resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==} @@ -29477,7 +29474,6 @@ packages: react-is: 16.13.1 shallowequal: 1.1.0 supports-color: 5.5.0 - dev: false /styled-components/5.3.6_react@18.2.0: resolution: {integrity: sha512-hGTZquGAaTqhGWldX7hhfzjnIYBZ0IXQXkCYdvF1Sq3DsUaLx6+NTHC5Jj1ooM2F68sBiVz3lvhfwQs/S3l6qg==} @@ -29499,6 +29495,7 @@ packages: react: 18.2.0 shallowequal: 1.1.0 supports-color: 5.5.0 + dev: true /styled-system/5.1.5: resolution: {integrity: sha512-7VoD0o2R3RKzOzPK0jYrVnS8iJdfkKsQJNiLRDjikOpQVqQHns/DXWaPZOH4tIKkhAT7I6wIsy9FWTWh2X3q+A==} @@ -30650,6 +30647,82 @@ packages: domino: 2.1.6 dev: false + /tushan/0.0.1_ts-node@10.9.1: + resolution: {integrity: sha512-lTnO2UyyYbPc2rWnQSkOO51CahFcT7fPmXhTR1UgTNdlUT+eDj3zSXcZPIgzM2qaBWGY+//uvple4ZrVsEFnAw==} + dependencies: + '@arco-design/web-react': 2.40.2_7ey2zzynotv32rpkwno45fsx4e + '@arco-plugins/vite-react': 1.3.2 + '@koa/router': 12.0.0 + '@types/find-cache-dir': 3.2.1 + '@types/fs-extra': 9.0.13 + '@types/koa': 2.13.5 + '@types/koa-bodyparser': 4.3.8 + '@types/koa-passport': 4.0.3 + '@types/koa-send': 4.1.3 + '@types/koa-session': 5.10.6 + '@types/koa__router': 8.0.11 + '@types/lodash': 4.14.184 + '@types/node': 18.7.11 + '@types/passport': 1.0.11 + '@types/passport-local': 1.0.34 + '@types/react': 18.0.20 + '@types/react-dom': 18.0.6 + '@vitejs/plugin-react': 2.1.0_vite@3.1.7 + ahooks: 3.7.1_react@18.2.0 + autoprefixer: 10.4.12_postcss@8.4.17 + axios: 0.27.2 + find-cache-dir: 3.3.2 + fs-extra: 10.1.0 + koa: 2.13.4 + koa-bodyparser: 4.3.0 + koa-connect: 2.1.0 + koa-passport: 4.1.4 + koa-send: 5.0.1 + koa-session: 6.2.0 + lodash: 4.17.21 + passport: 0.4.1 + passport-local: 1.0.0 + postcss: 8.4.17 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + react-fastify-form: 1.0.11_react@18.2.0 + react-router: 6.4.0_react@18.2.0 + react-router-dom: 6.4.0_biqbaboplfbrettd7655fr4n2y + reflect-metadata: 0.1.13 + rollup-plugin-source-ref: 1.0.7 + source-ref-runtime: 1.0.7 + tailwindcss: 3.1.8_ts-node@10.9.1 + twin.arco: 1.3.3 + typeorm: 0.3.10_ts-node@10.9.1 + vite: 3.1.7 + zustand: 4.1.2_react@18.2.0 + transitivePeerDependencies: + - '@google-cloud/spanner' + - '@sap/hana-client' + - better-sqlite3 + - debug + - hdb-pool + - immer + - ioredis + - less + - mongodb + - mssql + - mysql2 + - oracledb + - pg + - pg-native + - pg-query-stream + - redis + - sass + - sql.js + - sqlite3 + - stylus + - supports-color + - terser + - ts-node + - typeorm-aurora-data-api-driver + dev: false + /tweetnacl/0.14.5: resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} dev: true @@ -32787,82 +32860,3 @@ packages: /zwitch/1.0.5: resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==} - - github.com/msgbyte/tushan/7d99640b09afcc0fcde08f94f69371044a7c7527_ts-node@10.9.1: - resolution: {tarball: https://codeload.github.com/msgbyte/tushan/tar.gz/7d99640b09afcc0fcde08f94f69371044a7c7527} - id: github.com/msgbyte/tushan/7d99640b09afcc0fcde08f94f69371044a7c7527 - name: tushan - version: 0.0.1 - dependencies: - '@arco-design/web-react': 2.40.2_7ey2zzynotv32rpkwno45fsx4e - '@arco-plugins/vite-react': 1.3.2 - '@koa/router': 12.0.0 - '@types/find-cache-dir': 3.2.1 - '@types/fs-extra': 9.0.13 - '@types/koa': 2.13.5 - '@types/koa-bodyparser': 4.3.8 - '@types/koa-passport': 4.0.3 - '@types/koa-send': 4.1.3 - '@types/koa-session': 5.10.6 - '@types/koa__router': 8.0.11 - '@types/lodash': 4.14.184 - '@types/node': 18.7.11 - '@types/passport': 1.0.11 - '@types/passport-local': 1.0.34 - '@types/react': 18.0.20 - '@types/react-dom': 18.0.6 - '@vitejs/plugin-react': 2.1.0_vite@3.1.7 - ahooks: 3.7.1_react@18.2.0 - autoprefixer: 10.4.12_postcss@8.4.17 - axios: 0.27.2 - find-cache-dir: 3.3.2 - fs-extra: 10.1.0 - koa: 2.13.4 - koa-bodyparser: 4.3.0 - koa-connect: 2.1.0 - koa-passport: 4.1.4 - koa-send: 5.0.1 - koa-session: 6.2.0 - lodash: 4.17.21 - passport: 0.4.1 - passport-local: 1.0.0 - postcss: 8.4.17 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 - react-fastify-form: 1.0.11_react@18.2.0 - react-router: 6.4.0_react@18.2.0 - react-router-dom: 6.4.0_biqbaboplfbrettd7655fr4n2y - reflect-metadata: 0.1.13 - rollup-plugin-source-ref: 1.0.7 - source-ref-runtime: 1.0.7 - tailwindcss: 3.1.8_ts-node@10.9.1 - twin.arco: 1.3.3 - typeorm: 0.3.10_ts-node@10.9.1 - vite: 3.1.7 - zustand: 4.1.2_react@18.2.0 - transitivePeerDependencies: - - '@google-cloud/spanner' - - '@sap/hana-client' - - better-sqlite3 - - debug - - hdb-pool - - immer - - ioredis - - less - - mongodb - - mssql - - mysql2 - - oracledb - - pg - - pg-native - - pg-query-stream - - redis - - sass - - sql.js - - sqlite3 - - stylus - - supports-color - - terser - - ts-node - - typeorm-aurora-data-api-driver - dev: false diff --git a/server/admin/package.json b/server/admin/package.json index 1a9d5e7f..004a3471 100644 --- a/server/admin/package.json +++ b/server/admin/package.json @@ -6,7 +6,7 @@ "main": "index.js", "scripts": { "start": "ts-node --transpile-only src/index.ts", - "dev": "nodemon --watch 'src/**' --ext 'ts' --ignore 'src/**/*.spec.ts' --exec 'ts-node --transpile-only src/index.ts'", + "dev": "nodemon --watch 'src/**' --ext 'ts' --ignore 'src/**/*.spec.ts' --exec \"ts-node --transpile-only src/index.ts\"", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [], @@ -23,7 +23,7 @@ "koa2-formidable": "^1.0.3", "react-use": "^17.4.0", "recharts": "^2.1.12", - "tushan": "github:msgbyte/tushan" + "tushan": "^0.0.1" }, "devDependencies": { "@types/koa": "^2.13.4", diff --git a/server/admin/src/index.ts b/server/admin/src/index.ts index 4ebc9cff..edbe096e 100644 --- a/server/admin/src/index.ts +++ b/server/admin/src/index.ts @@ -52,7 +52,7 @@ async function start() { return { username, title: 'Admin' }; } - throw new Error('User not found'); + throw new Error(`User not found: ${username}`); }, }, });