refactor: remove uuid package (midwayjs#1563)

WeLogix · Jan 12, 2022 · 7ae5b40 · 7ae5b40
1 parent 0bcde23
commit 7ae5b40
Show file tree

Hide file tree

Showing 79 changed files with 340 additions and 252 deletions.
diff --git a/README.en-US.md b/README.en-US.md
@@ -117,13 +117,15 @@ Please make sure to read the [Issue Reporting Checklist](CONTRIBUTING.md#reporti
 
 ## Contributors
 
+<a href="https://github.com/midwayjs/midway/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=midwayjs/midway" />
+</a>
+
+
 Please let us know how can we help. Do check out [issues](http://github.com/midwayjs/midway/issues) for bug reports or suggestions first.
 
 To become a contributor, please follow our contributing guide.
 
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="https://github.com/midwayjs/midway/graphs/contributors"><img src="https://opencollective.com/midway/contributors.svg?width=890&button=false" /></a>
-
 ## License
 
 The code in this project is released under the [MIT License](LICENSE).

diff --git a/README.md b/README.md
@@ -16,9 +16,14 @@
 
 [English](./README.en-US.md) | 简体中文
 
-🥳 欢迎观看 Midway Serverless 2.0 发布会回放： https://www.bilibili.com/video/BV17A411T7Md
 
-[《Midway Serverless 发布 2.0，一体化让前端研发再次提效》](https://zhuanlan.zhihu.com/p/355768659)
+## 资源
+
+- [3.x beta 功能预览](https://www.bilibili.com/video/BV1aL4y1p7oA?from=search&seid=8235946720906913847&spm_id_from=333.337.0.0)
+- [2021 秋季直面会](https://www.bilibili.com/video/BV1Ng411T76f?from=search&seid=8235946720906913847&spm_id_from=333.337.0.0)
+- [2021 夏季直面会](https://www.bilibili.com/video/BV1nF411a7sr?from=search&seid=8235946720906913847&spm_id_from=333.337.0.0)
+- [v2 示例教程](https://www.bilibili.com/video/BV1254y1E73m?from=search&seid=8235946720906913847&spm_id_from=333.337.0.0)
+- [2.0 发布会回放](https://www.bilibili.com/video/BV17A411T7Md)[《2.0 发布会文章》](https://zhuanlan.zhihu.com/p/355768659)
 
 ## 特性
 
@@ -98,17 +103,10 @@ $ npm init midway -- --type=web my_midway_app
 cd my_midway_app && npm run dev
 ```
 
-如何部署等更多进阶请访问 [中文文档](https://www.yuque.com/midwayjs/midway_v2)。
-
-<!--同时你也可以在阿里云官网知行实验室，学习 Midway [相关的课程](https://start.aliyun.com/handson-lab)。-->
-
 ## 文档和社区
 
-![](https://img.alicdn.com/imgextra/i2/O1CN01LCCXpo1ZXw3Ee0TDk_!!6000000003205-0-tps-3336-1390.jpg)
-
 - [官网](https://midwayjs.org)
-- 要查看 v2 中文文档, 请访问 [中文文档](https://www.yuque.com/midwayjs/midway_v2) 📚
-- 要查看 v1 中文文档, 请访问 [中文文档](https://www.yuque.com/midwayjs/midway_v1) 📚
+- [备用官网](https://beta.midwayjs.org)
 
 ## 官方示例
 
@@ -147,6 +145,10 @@ cd my_midway_app && npm run dev
 
 ## 贡献
 
+<a href="https://github.com/midwayjs/midway/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=midwayjs/midway" />
+</a>
+
 请告知我们可以为你做些什么，不过在此之前，请检查一下是否有 [已经存在的Bug或者意见](http://github.com/midwayjs/midway/issues)。
 
 如果你是一个代码贡献者，请参考代码贡献规范。

diff --git a/packages-serverless/egg-layer/package.json b/packages-serverless/egg-layer/package.json
@@ -3,8 +3,8 @@
   "version": "3.0.0-beta.16",
   "main": "index.js",
   "scripts": {
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "dependencies": {
     "request": "2.88.2"

diff --git a/packages-serverless/express-layer/package.json b/packages-serverless/express-layer/package.json
@@ -3,8 +3,8 @@
   "version": "3.0.0-beta.16",
   "main": "index.js",
   "scripts": {
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "dependencies": {
     "request": "2.88.2"

diff --git a/packages-serverless/koa-layer/package.json b/packages-serverless/koa-layer/package.json
@@ -3,8 +3,8 @@
   "version": "3.0.0-beta.16",
   "main": "index.js",
   "scripts": {
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "dependencies": {
     "request": "2.88.2"

diff --git a/packages-serverless/runtime-engine/package.json b/packages-serverless/runtime-engine/package.json
@@ -5,8 +5,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "engines": {
     "node": ">=12"

diff --git a/packages-serverless/runtime-mock/package.json b/packages-serverless/runtime-mock/package.json
@@ -15,8 +15,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-app/package.json b/packages-serverless/serverless-app/package.json
@@ -34,8 +34,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-aws-starter/package.json b/packages-serverless/serverless-aws-starter/package.json
@@ -19,8 +19,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-fc-starter/package.json b/packages-serverless/serverless-fc-starter/package.json
@@ -22,8 +22,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-fc-trigger/package.json b/packages-serverless/serverless-fc-trigger/package.json
@@ -23,8 +23,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-http-parser/package.json b/packages-serverless/serverless-http-parser/package.json
@@ -30,8 +30,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-scf-starter/package.json b/packages-serverless/serverless-scf-starter/package.json
@@ -19,8 +19,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-scf-trigger/package.json b/packages-serverless/serverless-scf-trigger/package.json
@@ -21,8 +21,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-vercel-starter/package.json b/packages-serverless/serverless-vercel-starter/package.json
@@ -23,8 +23,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-vercel-trigger/package.json b/packages-serverless/serverless-vercel-trigger/package.json
@@ -15,8 +15,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/serverless-worker-starter/package.json b/packages-serverless/serverless-worker-starter/package.json
@@ -25,8 +25,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov_local": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov_local": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "repository": {
     "type": "git",

diff --git a/packages-serverless/static-layer/package.json b/packages-serverless/static-layer/package.json
@@ -3,8 +3,8 @@
   "version": "3.0.0-beta.16",
   "main": "dist/index.js",
   "scripts": {
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "build": "ncc build index.js -o dist"
   },
   "devDependencies": {

diff --git a/packages/axios/package.json b/packages/axios/package.json
@@ -24,8 +24,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -6,8 +6,8 @@
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
   },
   "author": "",
   "files": [

diff --git a/packages/consul/package.json b/packages/consul/package.json
@@ -27,8 +27,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [

diff --git a/packages/core/src/common/fileDetector.ts b/packages/core/src/common/fileDetector.ts
@@ -1,5 +1,5 @@
 import { IFileDetector, IMidwayContainer } from '../interface';
-import { TYPES, ResolveFilter } from '@midwayjs/decorator';
+import { Types, ResolveFilter } from '@midwayjs/decorator';
 import { run } from '@midwayjs/glob';
 
 export abstract class AbstractFileDetector<T> implements IFileDetector {
@@ -57,7 +57,7 @@ export class DirectoryFileDetector extends AbstractFileDetector<{
                 resolveFilter.filter(exports, file, this);
                 continue;
               }
-            } else if (TYPES.isRegExp(resolveFilter.pattern)) {
+            } else if (Types.isRegExp(resolveFilter.pattern)) {
               if ((resolveFilter.pattern as RegExp).test(file)) {
                 const exports = resolveFilter.ignoreRequire
                   ? undefined

diff --git a/packages/core/src/common/webRouterCollector.ts b/packages/core/src/common/webRouterCollector.ts
@@ -8,7 +8,7 @@ import {
   getPropertyMetadata,
   getProviderName,
   getProviderUUId,
-  TYPES,
+  Types,
   listModule,
   RouterOption,
   ServerlessTriggerType,
@@ -415,7 +415,7 @@ export class WebRouterCollector {
     return urlMatchList
       .map(item => {
         const urlString = item.url.toString();
-        const weightArr = TYPES.isRegExp(item.url)
+        const weightArr = Types.isRegExp(item.url)
           ? urlString.split('\\/')
           : urlString.split('/');
         let weight = 0;