diff --git a/package.json b/package.json index 72840612b..f2ed921e5 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "preinstall": "npx only-allow pnpm", "lerna": "lerna", "bootstrap": "lerna bootstrap", - "prepare": "if test \"$NODE_ENV\" != \"production\" ; then husky install && lerna run --stream prepack ; fi", + "prepare": "if test \"$NODE_ENV\" != \"production\" ; then husky install && lerna run --concurrency 1 --stream prepack ; fi", "dev": "lerna run --parallel dev" }, "devDependencies": { @@ -17,11 +17,15 @@ "typescript": "^4.3.5" }, "workspaces": { - "packages": ["packages/*"], - "nohoist": ["**/module-alias"] + "packages": [ + "packages/*" + ], + "nohoist": [ + "**/module-alias" + ] }, "engines": { "node": ">=14.15.0", "pnpm": ">=6" } -} +} \ No newline at end of file diff --git a/packages/core/src/errors/RequestError/index.ts b/packages/core/src/errors/RequestError/index.ts index df5a8ff05..2179a77c8 100644 --- a/packages/core/src/errors/RequestError/index.ts +++ b/packages/core/src/errors/RequestError/index.ts @@ -1,9 +1,7 @@ import pick from 'lodash.pick'; import i18next from 'i18next'; import { LogtoErrorCode } from '@logto/phrases'; -import { RequestErrorBody, RequestErrorMetadata } from './types'; - -export * from './types'; +import { RequestErrorBody, RequestErrorMetadata } from '@logto/schemas'; export default class RequestError extends Error { code: LogtoErrorCode; diff --git a/packages/core/src/middleware/koa-error-handler.ts b/packages/core/src/middleware/koa-error-handler.ts index cd22f2797..cd4c1cb9b 100644 --- a/packages/core/src/middleware/koa-error-handler.ts +++ b/packages/core/src/middleware/koa-error-handler.ts @@ -1,4 +1,5 @@ -import RequestError, { RequestErrorBody } from '@/errors/RequestError'; +import RequestError from '@/errors/RequestError'; +import { RequestErrorBody } from '@logto/schemas'; import decamelize from 'decamelize'; import { Middleware } from 'koa'; import { errors } from 'oidc-provider'; diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 5bbd8eab1..14382796e 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -38,5 +38,8 @@ "eslintConfig": { "extends": "@logto" }, - "prettier": "@logto/eslint-config/.prettierrc" + "prettier": "@logto/eslint-config/.prettierrc", + "dependencies": { + "@logto/phrases": "^0.1.0" + } } diff --git a/packages/core/src/errors/RequestError/types.ts b/packages/schemas/src/api/error.ts similarity index 100% rename from packages/core/src/errors/RequestError/types.ts rename to packages/schemas/src/api/error.ts diff --git a/packages/schemas/src/api/index.ts b/packages/schemas/src/api/index.ts new file mode 100644 index 000000000..93ae819ea --- /dev/null +++ b/packages/schemas/src/api/index.ts @@ -0,0 +1 @@ +export * from './error'; diff --git a/packages/schemas/src/index.ts b/packages/schemas/src/index.ts index 5f8b52015..1d7a54cb3 100644 --- a/packages/schemas/src/index.ts +++ b/packages/schemas/src/index.ts @@ -1,2 +1,3 @@ export * from './foundations'; export * from './db-entries'; +export * from './api'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ceccf7ac..a22e005e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -123,6 +123,7 @@ importers: specifiers: '@logto/eslint-config': ^0.1.0-rc.14 '@logto/essentials': ^1.1.0-rc.2 + '@logto/phrases': ^0.1.0 '@logto/ts-config': ^0.1.0-rc.14 '@types/lodash.uniq': ^4.5.6 '@types/node': '14' @@ -135,6 +136,8 @@ importers: prettier: ^2.3.2 ts-node: ^10.0.0 typescript: ^4.3.5 + dependencies: + '@logto/phrases': link:../phrases devDependencies: '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 '@logto/essentials': 1.1.0-rc.2