diff --git a/package.json b/package.json index ed9015d..a16e5a0 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,20 @@ { - "private": true, - "name": "cc-server-parent", - "version": "1.0.0", - "main": "index.js", - "author": "MiaoWoo ", - "license": "MIT", - "scripts": { - "build": "npx lerna run build", - "lp": "npx lerna publish", - "publish-please": "publish-please", - "prepublishOnly": "publish-please guard" - }, - "workspaces": [ - "packages/*" - ], - "devDependencies": { - "lerna": "^3.14.1" - } + "private": true, + "name": "cc-server-parent", + "version": "1.0.0", + "main": "index.js", + "author": "MiaoWoo ", + "license": "MIT", + "scripts": { + "build": "npx lerna run build", + "lp": "npx lerna publish --registry=https://repo.yumc.pw/repository/npm-hosted/", + "publish-please": "publish-please", + "prepublishOnly": "publish-please guard" + }, + "workspaces": [ + "packages/*" + ], + "devDependencies": { + "lerna": "^3.14.1" + } } \ No newline at end of file diff --git a/packages/cc-server-binding/.gitignore b/packages/binding/.gitignore similarity index 100% rename from packages/cc-server-binding/.gitignore rename to packages/binding/.gitignore diff --git a/packages/cc-server-binding/README.md b/packages/binding/README.md similarity index 100% rename from packages/cc-server-binding/README.md rename to packages/binding/README.md diff --git a/packages/cc-server-binding/package.json b/packages/binding/package.json similarity index 96% rename from packages/cc-server-binding/package.json rename to packages/binding/package.json index ed7d8f5..e35fc44 100644 --- a/packages/cc-server-binding/package.json +++ b/packages/binding/package.json @@ -1,5 +1,5 @@ { - "name": "cc-server-binding", + "name": "@cc-server/binding", "version": "0.3.1", "description": "> TODO: description", "author": "MiaoWoo ", @@ -30,4 +30,4 @@ "bugs": { "url": "https://github.com/502647092/cc-server-parent/issues" } -} +} \ No newline at end of file diff --git a/packages/cc-server-binding/src/activation.ts b/packages/binding/src/activation.ts similarity index 100% rename from packages/cc-server-binding/src/activation.ts rename to packages/binding/src/activation.ts diff --git a/packages/cc-server-binding/src/constants.ts b/packages/binding/src/constants.ts similarity index 100% rename from packages/cc-server-binding/src/constants.ts rename to packages/binding/src/constants.ts diff --git a/packages/cc-server-binding/src/decorators.ts b/packages/binding/src/decorators.ts similarity index 100% rename from packages/cc-server-binding/src/decorators.ts rename to packages/binding/src/decorators.ts diff --git a/packages/cc-server-binding/src/index.ts b/packages/binding/src/index.ts similarity index 100% rename from packages/cc-server-binding/src/index.ts rename to packages/binding/src/index.ts diff --git a/packages/cc-server-binding/src/interfaces.ts b/packages/binding/src/interfaces.ts similarity index 100% rename from packages/cc-server-binding/src/interfaces.ts rename to packages/binding/src/interfaces.ts diff --git a/packages/cc-server-binding/src/utils.ts b/packages/binding/src/utils.ts similarity index 100% rename from packages/cc-server-binding/src/utils.ts rename to packages/binding/src/utils.ts diff --git a/packages/cc-server-binding/tsconfig.json b/packages/binding/tsconfig.json similarity index 100% rename from packages/cc-server-binding/tsconfig.json rename to packages/binding/tsconfig.json diff --git a/packages/cc-server-core/.gitignore b/packages/core/.gitignore similarity index 100% rename from packages/cc-server-core/.gitignore rename to packages/core/.gitignore diff --git a/packages/cc-server-core/.npmignore b/packages/core/.npmignore similarity index 100% rename from packages/cc-server-core/.npmignore rename to packages/core/.npmignore diff --git a/packages/cc-server-core/README.md b/packages/core/README.md similarity index 100% rename from packages/cc-server-core/README.md rename to packages/core/README.md diff --git a/packages/cc-server-core/package.json b/packages/core/package.json similarity index 86% rename from packages/cc-server-core/package.json rename to packages/core/package.json index 66434e8..2f2bb01 100644 --- a/packages/cc-server-core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "cc-server-core", + "name": "@cc-server/core", "version": "0.3.1", "description": "> TODO: description", "author": "MiaoWoo ", @@ -20,10 +20,10 @@ "url": "git+https://github.com/502647092/cc-server-parent.git" }, "dependencies": { + "@cc-server/binding": "^0.3.1", + "@cc-server/db-mongo": "^0.3.1", + "@cc-server/ioc": "^0.3.1", "body-parser": "^1.19.0", - "cc-server-binding": "^0.3.1", - "cc-server-db-mongo": "^0.3.1", - "cc-server-ioc": "^0.3.1", "inversify": "^5.0.1", "inversify-express-utils": "^6.3.2", "prettyjson": "^1.2.1", @@ -32,6 +32,7 @@ "devDependencies": { "@types/body-parser": "^1.17.0", "@types/express": "^4.17.0", + "@types/prettyjson": "^0.0.29", "mocha": "^6.1.4", "rimraf": "^2.6.3", "ts-node": "^8.2.0", diff --git a/packages/cc-server-core/src/function/handle.ts b/packages/core/src/function/handle.ts similarity index 93% rename from packages/cc-server-core/src/function/handle.ts rename to packages/core/src/function/handle.ts index e61aaa6..6c3b20b 100644 --- a/packages/cc-server-core/src/function/handle.ts +++ b/packages/core/src/function/handle.ts @@ -2,8 +2,8 @@ import { controller, response, requestBody, httpGet, httpPost, queryParam, requestParam } from 'inversify-express-utils'; import { inject, postConstruct } from 'inversify'; -import { Vaild, NotBlank, NotNull } from 'cc-server-binding' -import { DBClient } from 'cc-server-db' +import { Vaild, NotBlank, NotNull } from '@cc-server/binding' +import { DBClient } from '@cc-server/db' import 'cc-server-db-mongo' //process.env.FAAS_MONGO_URL = 'mongodb://192.168.0.2:27017'; diff --git a/packages/cc-server-core/src/index.ts b/packages/core/src/index.ts similarity index 93% rename from packages/cc-server-core/src/index.ts rename to packages/core/src/index.ts index 9449899..08c1d9b 100644 --- a/packages/cc-server-core/src/index.ts +++ b/packages/core/src/index.ts @@ -2,8 +2,8 @@ import 'reflect-metadata'; import * as express from "express"; import { InversifyExpressServer, interfaces, getRouteInfo } from 'inversify-express-utils'; import * as bodyParser from 'body-parser'; -import { buildProviderModule } from 'cc-server-ioc'; -import { rebuildServer } from 'cc-server-binding' +import { buildProviderModule } from '@cc-server/ioc'; +import { rebuildServer } from '@cc-server/binding' import * as prettyjson from "prettyjson"; import { Container } from 'inversify'; diff --git a/packages/cc-server-core/src/server.ts b/packages/core/src/server.ts similarity index 100% rename from packages/cc-server-core/src/server.ts rename to packages/core/src/server.ts diff --git a/packages/cc-server-core/tsconfig.json b/packages/core/tsconfig.json similarity index 100% rename from packages/cc-server-core/tsconfig.json rename to packages/core/tsconfig.json diff --git a/packages/cc-server-db-mongo/.gitignore b/packages/db-mongo/.gitignore similarity index 100% rename from packages/cc-server-db-mongo/.gitignore rename to packages/db-mongo/.gitignore diff --git a/packages/cc-server-db-mongo/.npmignore b/packages/db-mongo/.npmignore similarity index 100% rename from packages/cc-server-db-mongo/.npmignore rename to packages/db-mongo/.npmignore diff --git a/packages/cc-server-db-mongo/README.md b/packages/db-mongo/README.md similarity index 100% rename from packages/cc-server-db-mongo/README.md rename to packages/db-mongo/README.md diff --git a/packages/cc-server-db-mongo/package.json b/packages/db-mongo/package.json similarity index 89% rename from packages/cc-server-db-mongo/package.json rename to packages/db-mongo/package.json index 41bfb42..deea237 100644 --- a/packages/cc-server-db-mongo/package.json +++ b/packages/db-mongo/package.json @@ -1,5 +1,5 @@ { - "name": "cc-server-db-mongo", + "name": "@cc-server/db-mongo", "version": "0.3.1", "description": "> TODO: description", "author": "MiaoWoo ", @@ -18,8 +18,8 @@ "url": "git+https://github.com/502647092/cc-server-parent.git" }, "dependencies": { - "cc-server-db": "^0.3.0", - "cc-server-ioc": "^0.3.1", + "@cc-server/db": "^0.3.0", + "@cc-server/ioc": "^0.3.1", "inversify": "^5.0.1", "mongodb": "^3.2.7", "reflect-metadata": "^0.1.13" @@ -31,4 +31,4 @@ "typescript": "^3.5.1" }, "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" -} +} \ No newline at end of file diff --git a/packages/cc-server-db-mongo/src/client/connection.ts b/packages/db-mongo/src/client/connection.ts similarity index 100% rename from packages/cc-server-db-mongo/src/client/connection.ts rename to packages/db-mongo/src/client/connection.ts diff --git a/packages/cc-server-db-mongo/src/client/index.ts b/packages/db-mongo/src/client/index.ts similarity index 96% rename from packages/cc-server-db-mongo/src/client/index.ts rename to packages/db-mongo/src/client/index.ts index fc906d1..ad666f0 100644 --- a/packages/cc-server-db-mongo/src/client/index.ts +++ b/packages/db-mongo/src/client/index.ts @@ -1,7 +1,7 @@ import { Db, ObjectID, Collection } from 'mongodb'; import { MongoDBConnection } from './connection'; -import { provide } from 'cc-server-ioc' -import { DBClient } from 'cc-server-db' +import { provide } from '@cc-server/ioc' +import { DBClient } from '@cc-server/db' @provide(DBClient) export class MongoDBClient implements DBClient { diff --git a/packages/cc-server-db-mongo/src/index.ts b/packages/db-mongo/src/index.ts similarity index 100% rename from packages/cc-server-db-mongo/src/index.ts rename to packages/db-mongo/src/index.ts diff --git a/packages/cc-server-db-mongo/tsconfig.json b/packages/db-mongo/tsconfig.json similarity index 100% rename from packages/cc-server-db-mongo/tsconfig.json rename to packages/db-mongo/tsconfig.json diff --git a/packages/cc-server-db/.gitignore b/packages/db/.gitignore similarity index 100% rename from packages/cc-server-db/.gitignore rename to packages/db/.gitignore diff --git a/packages/cc-server-db/.npmignore b/packages/db/.npmignore similarity index 100% rename from packages/cc-server-db/.npmignore rename to packages/db/.npmignore diff --git a/packages/cc-server-db/README.md b/packages/db/README.md similarity index 100% rename from packages/cc-server-db/README.md rename to packages/db/README.md diff --git a/packages/cc-server-db/package.json b/packages/db/package.json similarity index 96% rename from packages/cc-server-db/package.json rename to packages/db/package.json index 95c725f..506ce35 100644 --- a/packages/cc-server-db/package.json +++ b/packages/db/package.json @@ -1,5 +1,5 @@ { - "name": "cc-server-db", + "name": "@cc-server/db", "version": "0.3.0", "description": "> TODO: description", "author": "MiaoWoo ", @@ -25,4 +25,4 @@ "rimraf": "^2.6.3", "typescript": "^3.5.1" } -} +} \ No newline at end of file diff --git a/packages/cc-server-db/src/index.ts b/packages/db/src/index.ts similarity index 100% rename from packages/cc-server-db/src/index.ts rename to packages/db/src/index.ts diff --git a/packages/cc-server-db/tsconfig.json b/packages/db/tsconfig.json similarity index 100% rename from packages/cc-server-db/tsconfig.json rename to packages/db/tsconfig.json diff --git a/packages/cc-server-ioc/.gitignore b/packages/ioc/.gitignore similarity index 100% rename from packages/cc-server-ioc/.gitignore rename to packages/ioc/.gitignore diff --git a/packages/cc-server-ioc/.npmignore b/packages/ioc/.npmignore similarity index 100% rename from packages/cc-server-ioc/.npmignore rename to packages/ioc/.npmignore diff --git a/packages/cc-server-ioc/README.md b/packages/ioc/README.md similarity index 100% rename from packages/cc-server-ioc/README.md rename to packages/ioc/README.md diff --git a/packages/cc-server-ioc/package.json b/packages/ioc/package.json similarity index 96% rename from packages/cc-server-ioc/package.json rename to packages/ioc/package.json index d0ab9c3..12925b9 100644 --- a/packages/cc-server-ioc/package.json +++ b/packages/ioc/package.json @@ -1,5 +1,5 @@ { - "name": "cc-server-ioc", + "name": "@cc-server/ioc", "version": "0.3.1", "description": "> TODO: description", "author": "MiaoWoo ", @@ -29,4 +29,4 @@ "typescript": "^3.5.1" }, "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" -} +} \ No newline at end of file diff --git a/packages/cc-server-ioc/src/index.ts b/packages/ioc/src/index.ts similarity index 100% rename from packages/cc-server-ioc/src/index.ts rename to packages/ioc/src/index.ts diff --git a/packages/cc-server-ioc/tsconfig.json b/packages/ioc/tsconfig.json similarity index 100% rename from packages/cc-server-ioc/tsconfig.json rename to packages/ioc/tsconfig.json