fix: format (#997)

midwayjs · Apr 17, 2021 · 456cc14 · 456cc14
1 parent 8bfda7d
commit 456cc14
Show file tree

Hide file tree

Showing 33 changed files with 43 additions and 50 deletions.
diff --git a/packages-serverless/egg-layer/package.json b/packages-serverless/egg-layer/package.json
@@ -11,7 +11,7 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
-"@midwayjs/decorator": "^2.10.3",
+    "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/runtime-engine": "^2.10.0",
     "@midwayjs/runtime-mock": "^2.10.2",
     "@midwayjs/serverless-fc-starter": "^2.10.6",

diff --git a/packages-serverless/express-layer/package.json b/packages-serverless/express-layer/package.json
@@ -10,7 +10,7 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
-"@midwayjs/runtime-engine": "^2.10.0",
+    "@midwayjs/runtime-engine": "^2.10.0",
     "@midwayjs/runtime-mock": "^2.10.2",
     "@midwayjs/serverless-fc-starter": "^2.10.6",
     "@midwayjs/serverless-fc-trigger": "^2.10.6",

diff --git a/packages-serverless/koa-layer/package.json b/packages-serverless/koa-layer/package.json
@@ -10,7 +10,7 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
-"@midwayjs/runtime-engine": "^2.10.0",
+    "@midwayjs/runtime-engine": "^2.10.0",
     "@midwayjs/runtime-mock": "^2.10.2",
     "@midwayjs/serverless-fc-starter": "^2.10.6",
     "@midwayjs/serverless-fc-trigger": "^2.10.6",

diff --git a/packages-serverless/serverless-app/package.json b/packages-serverless/serverless-app/package.json
@@ -13,7 +13,7 @@
     "express": "^4.17.1"
   },
   "devDependencies": {
-"@midwayjs/decorator": "^2.10.3",
+    "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/faas": "^2.10.6",
     "@midwayjs/faas-middleware-upload": "^0.0.5",
     "@midwayjs/mock": "^2.10.6",

diff --git a/packages-serverless/serverless-aws-starter/package.json b/packages-serverless/serverless-aws-starter/package.json
@@ -8,7 +8,7 @@
     "@midwayjs/serverless-http-parser": "^2.10.0"
   },
   "devDependencies": {
-"raw-body": "^2.4.1"
+    "raw-body": "^2.4.1"
   },
   "engines": {
     "node": ">= 10"

diff --git a/packages-serverless/serverless-fc-starter/package.json b/packages-serverless/serverless-fc-starter/package.json
@@ -8,7 +8,7 @@
     "@midwayjs/serverless-http-parser": "^2.10.0"
   },
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/runtime-mock": "^2.10.2",
     "raw-body": "^2.4.1"

diff --git a/packages-serverless/serverless-fc-trigger/package.json b/packages-serverless/serverless-fc-trigger/package.json
@@ -12,7 +12,7 @@
     "extend2": "^1.0.0"
   },
   "devDependencies": {
-"supertest": "^4.0.2"
+    "supertest": "^4.0.2"
   },
   "engines": {
     "node": ">= 10"

diff --git a/packages-serverless/serverless-http-parser/package.json b/packages-serverless/serverless-http-parser/package.json
@@ -18,7 +18,7 @@
     "vary": "^1.1.2"
   },
   "devDependencies": {
-"mm": "3"
+    "mm": "3"
   },
   "engines": {
     "node": ">= 10"

diff --git a/packages-serverless/serverless-scf-starter/package.json b/packages-serverless/serverless-scf-starter/package.json
@@ -8,7 +8,7 @@
     "@midwayjs/serverless-http-parser": "^2.10.0"
   },
   "devDependencies": {
-"@midwayjs/faas-typings": "^2.10.0"
+    "@midwayjs/faas-typings": "^2.10.0"
   },
   "engines": {
     "node": ">= 10"

diff --git a/packages-serverless/static-layer/package.json b/packages-serverless/static-layer/package.json
@@ -13,7 +13,7 @@
     "request": "^2.88.2"
   },
   "devDependencies": {
-"@midwayjs/runtime-engine": "^2.10.0",
+    "@midwayjs/runtime-engine": "^2.10.0",
     "@midwayjs/runtime-mock": "^2.10.2",
     "@midwayjs/serverless-fc-starter": "^2.10.6",
     "@midwayjs/serverless-fc-trigger": "^2.10.6",

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/logger": "^2.10.6",
     "@types/socket.io-client": "^1.4.36",

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -27,7 +27,7 @@
     "node": ">= 10"
   },
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3"
   },
   "dependencies": {

diff --git a/packages/consul/package.json b/packages/consul/package.json
@@ -9,7 +9,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/koa": "^2.10.6",
     "@midwayjs/mock": "^2.10.6",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"chai": "^4.2.0",
+    "chai": "^4.2.0",
     "mm": "3",
     "sinon": "^7.2.2"
   },

diff --git a/packages/decorator/package.json b/packages/decorator/package.json
@@ -20,7 +20,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-"mm": "3"
+    "mm": "3"
   },
   "keywords": [
     "midway",

diff --git a/packages/faas/package.json b/packages/faas/package.json
@@ -12,7 +12,7 @@
     "koa-compose": "^4.1.0"
   },
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "@midwayjs/serverless-fc-starter": "^2.10.6",
     "@midwayjs/serverless-scf-starter": "^2.10.0",
     "mm": "3"

diff --git a/packages/grpc/package.json b/packages/grpc/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/mock": "^2.10.6",
     "fs-extra": "^8.0.1"

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -10,7 +10,7 @@
     "winston-transport": "^4.4.0"
   },
   "devDependencies": {
-"egg-logger": "^2.4.2",
+    "egg-logger": "^2.4.2",
     "fs-extra": "^8.0.1"
   },
   "engines": {

diff --git a/packages/midway-schedule/package.json b/packages/midway-schedule/package.json
@@ -16,7 +16,7 @@
   "keywords": [],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/decorator": "^2.10.3",
+    "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/mock": "^2.10.6"
   },
   "dependencies": {

diff --git a/packages/midway/package.json b/packages/midway/package.json
@@ -28,7 +28,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "egg": "^2.28.0",
     "egg-logger": "^2.4.2"

diff --git a/packages/mock/package.json b/packages/mock/package.json
@@ -8,7 +8,6 @@
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
     "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
-    "ci": "node --require=ts-node/register ../../node_modules/.bin/jest",
     "link": "npm link"
   },
   "keywords": [
@@ -29,7 +28,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/logger": "^2.10.6",
     "@types/amqplib": "^0.5.13",

diff --git a/packages/prometheus/package.json b/packages/prometheus/package.json
@@ -22,7 +22,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/koa": "^2.10.6",
     "@midwayjs/mock": "^2.10.6"

diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json
@@ -8,7 +8,6 @@
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
     "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
-    "ci": "npm run test",
     "lint:fix": "../../node_modules/.bin/mwts fix"
   },
   "keywords": [
@@ -24,7 +23,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {

diff --git a/packages/socketio/package.json b/packages/socketio/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "@types/socket.io-client": "^1.4.36",
     "fs-extra": "^8.0.1",
     "socket.io-client": "^4.0.0"

diff --git a/packages/task/README.md b/packages/task/README.md
@@ -1,7 +1,7 @@
-# Midway-task
+# @midwayjs/task
 
 ## 简介
-Midway-task是为了能解决任务系列的模块，例如分布式定时任务、延迟任务调度。例如订单2小时后失效、每日定时的数据处理等工作。
+midwayjs/task是为了能解决任务系列的模块，例如分布式定时任务、延迟任务调度。例如订单2小时后失效、每日定时的数据处理等工作。
 
 ## 安装方法
 

diff --git a/packages/task/jest.config.js b/packages/task/jest.config.js
@@ -1,9 +1,7 @@
-const path = require('path');
-
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   testPathIgnorePatterns: ['<rootDir>/test/fixtures'],
   coveragePathIgnorePatterns: ['<rootDir>/test/'],
-  setupFilesAfterEnv: [path.join(__dirname, 'test/.setup.js')]
+  setupFilesAfterEnv: ['./jest.setup.js'],
 };
diff --git a/packages/task/jest.setup.js b/packages/task/jest.setup.js
@@ -0,0 +1,2 @@
+process.env.MIDWAY_TS_MODE = 'true';
+jest.setTimeout(30000);
diff --git a/packages/task/package.json b/packages/task/package.json
@@ -5,33 +5,29 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "midway-bin build -c",
-    "test": "midway-bin test --ts",
-    "cov": "midway-bin cov --ts",
-    "ci": "npm run cov"
+    "build": "tsc",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit"
   },
-  "keywords": [],
+  "keywords": [
+    "midway",
+    "IoC",
+    "task",
+    "plugin"
+  ],
   "author": "",
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/cli": "^1.2.38",
     "@midwayjs/core": "^2.3.0",
     "@midwayjs/decorator": "^2.3.0",
     "@midwayjs/koa": "^2.10.6",
     "@midwayjs/mock": "^2.10.6",
     "@types/bull": "^3.15.0",
-    "@types/cron": "^1.7.2",
-    "@types/jest": "^26.0.10",
-    "@types/node": "14",
-    "cross-env": "^6.0.0",
-    "jest": "^26.4.0",
-    "mwts": "^1.0.5",
-    "ts-jest": "^26.2.0",
-    "typescript": "^4.0.0"
+    "@types/cron": "^1.7.2"
   },
   "dependencies": {
     "bull": "^3.22.0",

diff --git a/packages/task/test/.setup.js b/packages/task/test/.setup.js
diff --git a/packages/typegoose/package.json b/packages/typegoose/package.json
@@ -18,7 +18,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/core": "^2.10.6",
+    "@midwayjs/core": "^2.10.6",
     "@midwayjs/decorator": "^2.10.3",
     "@midwayjs/koa": "^2.10.6",
     "@midwayjs/mock": "^2.10.6",

diff --git a/packages/web-express/package.json b/packages/web-express/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "@types/express": "^4.17.8",
     "fs-extra": "^8.0.1"
   },

diff --git a/packages/web-koa/package.json b/packages/web-koa/package.json
@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "@types/koa": "^2.11.4",
     "@types/koa-router": "^7.4.1",
     "fs-extra": "^8.0.1",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -27,7 +27,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-"@midwayjs/mock": "^2.10.6",
+    "@midwayjs/mock": "^2.10.6",
     "dayjs": "^1.10.4",
     "egg-socket.io": "^4.1.6",
     "egg-view-nunjucks": "^2.2.0",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		process.env.MIDWAY_TS_MODE = 'true';
		jest.setTimeout(30000);