diff --git a/packages/console/src/components/AuditLogTable/index.tsx b/packages/console/src/components/AuditLogTable/index.tsx index ffe94e2a4..1c97cebd2 100644 --- a/packages/console/src/components/AuditLogTable/index.tsx +++ b/packages/console/src/components/AuditLogTable/index.tsx @@ -1,5 +1,5 @@ import { LogResult } from '@logto/schemas'; -import type { LogDto } from '@logto/schemas/lib/types/log-legacy.js'; +import type { LogDto } from '@logto/schemas/lib/types/log-legacy'; import { conditional, conditionalString } from '@silverhand/essentials'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; diff --git a/packages/console/src/pages/AuditLogDetails/index.tsx b/packages/console/src/pages/AuditLogDetails/index.tsx index de82e18d2..87a6f9e5c 100644 --- a/packages/console/src/pages/AuditLogDetails/index.tsx +++ b/packages/console/src/pages/AuditLogDetails/index.tsx @@ -1,5 +1,5 @@ import type { User } from '@logto/schemas'; -import type { LogDto } from '@logto/schemas/lib/types/log-legacy.js'; +import type { LogDto } from '@logto/schemas/lib/types/log-legacy'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { useLocation, useParams } from 'react-router-dom'; diff --git a/packages/core/src/include.d/import-meta.d.ts b/packages/core/src/include.d/import-meta.d.ts new file mode 100644 index 000000000..e016debb5 --- /dev/null +++ b/packages/core/src/include.d/import-meta.d.ts @@ -0,0 +1,10 @@ +interface ImportMeta { + jest: typeof jest & { + // Almost same as `jest.mock()`, but factory is required + unstable_mockModule: ( + moduleName: string, + factory: () => T, + options?: jest.MockOptions + ) => typeof jest; + }; +} diff --git a/packages/core/src/libraries/sign-in-experience/index.ts b/packages/core/src/libraries/sign-in-experience/index.ts index b1ad9de86..e73b35c57 100644 --- a/packages/core/src/libraries/sign-in-experience/index.ts +++ b/packages/core/src/libraries/sign-in-experience/index.ts @@ -1,7 +1,9 @@ import { builtInLanguages } from '@logto/phrases-ui'; import type { Branding, LanguageInfo, SignInExperience } from '@logto/schemas'; -import { SignInMode, ConnectorType, BrandingStyle } from '@logto/schemas'; import { + SignInMode, + ConnectorType, + BrandingStyle, adminConsoleApplicationId, adminConsoleSignInExperience, demoAppApplicationId, diff --git a/packages/core/src/middleware/koa-auth.ts b/packages/core/src/middleware/koa-auth.ts index a3d806875..692c7b699 100644 --- a/packages/core/src/middleware/koa-auth.ts +++ b/packages/core/src/middleware/koa-auth.ts @@ -1,7 +1,6 @@ import type { IncomingHttpHeaders } from 'http'; -import { UserRole } from '@logto/schemas'; -import { managementResource } from '@logto/schemas'; +import { UserRole, managementResource } from '@logto/schemas'; import type { Optional } from '@silverhand/essentials'; import { conditional } from '@silverhand/essentials'; import { jwtVerify } from 'jose'; diff --git a/packages/core/src/oidc/adapter.ts b/packages/core/src/oidc/adapter.ts index ecbb598ce..e7198468c 100644 --- a/packages/core/src/oidc/adapter.ts +++ b/packages/core/src/oidc/adapter.ts @@ -1,6 +1,5 @@ import type { CreateApplication, OidcClientMetadata } from '@logto/schemas'; -import { ApplicationType } from '@logto/schemas'; -import { adminConsoleApplicationId, demoAppApplicationId } from '@logto/schemas'; +import { ApplicationType, adminConsoleApplicationId, demoAppApplicationId } from '@logto/schemas'; import { tryThat } from '@logto/shared'; import { deduplicate } from '@silverhand/essentials'; import { addSeconds } from 'date-fns'; diff --git a/packages/core/src/routes/application.test.ts b/packages/core/src/routes/application.test.ts index 0330deb10..c4303137c 100644 --- a/packages/core/src/routes/application.test.ts +++ b/packages/core/src/routes/application.test.ts @@ -29,10 +29,11 @@ const { findApplicationById } = mockEsm('#src/queries/application.js', () => ({ ), })); -mockEsm('@logto/core-kit', () => ({ +// Cannot use `mockEsm()` here, pending investigation. +jest.unstable_mockModule('@logto/core-kit', () => ({ // eslint-disable-next-line unicorn/consistent-function-scoping - buildIdGenerator: jest.fn(() => () => 'randomId'), - generateStandardId: jest.fn(() => 'randomId'), + buildIdGenerator: () => () => 'randomId', + generateStandardId: () => 'randomId', })); const { createRequester } = await import('#src/utils/test-utils.js'); diff --git a/packages/core/src/routes/phrase.test.ts b/packages/core/src/routes/phrase.test.ts index 0bbdcb77e..a8acf47aa 100644 --- a/packages/core/src/routes/phrase.test.ts +++ b/packages/core/src/routes/phrase.test.ts @@ -3,10 +3,9 @@ import type { SignInExperience } from '@logto/schemas'; import { adminConsoleApplicationId, adminConsoleSignInExperience } from '@logto/schemas'; import { mockEsm, mockEsmWithActual, pickDefault } from '@logto/shared/esm'; -import { createMockProvider } from '#src/test-utils/oidc-provider.js'; - import { zhCnTag } from '#src/__mocks__/custom-phrase.js'; import { mockSignInExperience } from '#src/__mocks__/index.js'; +import { createMockProvider } from '#src/test-utils/oidc-provider.js'; const { jest } = import.meta; diff --git a/packages/core/src/routes/resource.test.ts b/packages/core/src/routes/resource.test.ts index 03da2cd92..e3856505f 100644 --- a/packages/core/src/routes/resource.test.ts +++ b/packages/core/src/routes/resource.test.ts @@ -21,7 +21,8 @@ mockEsm('#src/queries/resource.js', () => ({ deleteResourceById: jest.fn(), })); -mockEsm('@logto/shared', () => ({ +// Cannot use `mockEsm()` here, pending investigation. +jest.unstable_mockModule('@logto/core-kit', () => ({ // eslint-disable-next-line unicorn/consistent-function-scoping buildIdGenerator: () => () => 'randomId', })); diff --git a/packages/core/src/routes/session/index.test.ts b/packages/core/src/routes/session/index.test.ts index 7a81fdd89..8d243fdc1 100644 --- a/packages/core/src/routes/session/index.test.ts +++ b/packages/core/src/routes/session/index.test.ts @@ -2,12 +2,11 @@ import type { User } from '@logto/schemas'; import { adminConsoleApplicationId } from '@logto/schemas'; import { Provider } from 'oidc-provider'; +import { mockUser } from '#src/__mocks__/index.js'; import { createRequester } from '#src/utils/test-utils.js'; import sessionRoutes from './index.js'; -import { mockUser } from '#src/__mocks__/index.js'; - const findUserById = jest.fn(async (): Promise => mockUser); const updateUserById = jest.fn(async (..._args: unknown[]) => ({ id: 'id' })); diff --git a/packages/core/src/routes/session/index.ts b/packages/core/src/routes/session/index.ts index 95f6c3f71..a85cc5e3f 100644 --- a/packages/core/src/routes/session/index.ts +++ b/packages/core/src/routes/session/index.ts @@ -1,8 +1,7 @@ import path from 'path'; import type { LogtoErrorCode } from '@logto/phrases'; -import { UserRole } from '@logto/schemas'; -import { adminConsoleApplicationId } from '@logto/schemas'; +import { UserRole, adminConsoleApplicationId } from '@logto/schemas'; import { conditional } from '@silverhand/essentials'; import type { Provider } from 'oidc-provider'; import { object, string } from 'zod'; diff --git a/packages/core/src/routes/session/middleware/koa-guard-session-action.ts b/packages/core/src/routes/session/middleware/koa-guard-session-action.ts index 9b71a1d88..17e8331a4 100644 --- a/packages/core/src/routes/session/middleware/koa-guard-session-action.ts +++ b/packages/core/src/routes/session/middleware/koa-guard-session-action.ts @@ -1,5 +1,4 @@ -import { SignInMode } from '@logto/schemas'; -import { adminConsoleApplicationId } from '@logto/schemas'; +import { SignInMode, adminConsoleApplicationId } from '@logto/schemas'; import type { MiddlewareType } from 'koa'; import type { Provider } from 'oidc-provider'; import { errors } from 'oidc-provider'; diff --git a/packages/core/src/routes/session/password.test.ts b/packages/core/src/routes/session/password.test.ts index 71ff8e595..ba7f7a755 100644 --- a/packages/core/src/routes/session/password.test.ts +++ b/packages/core/src/routes/session/password.test.ts @@ -1,14 +1,12 @@ import type { User } from '@logto/schemas'; -import { UserRole, SignInIdentifier } from '@logto/schemas'; -import { adminConsoleApplicationId } from '@logto/schemas'; +import { UserRole, SignInIdentifier, adminConsoleApplicationId } from '@logto/schemas'; import { Provider } from 'oidc-provider'; +import { mockSignInExperience, mockUser } from '#src/__mocks__/index.js'; import { createRequester } from '#src/utils/test-utils.js'; import passwordRoutes, { registerRoute, signInRoute } from './password.js'; -import { mockSignInExperience, mockUser } from '#src/__mocks__/index.js'; - const insertUser = jest.fn(async (..._args: unknown[]) => mockUser); const hasUser = jest.fn(async (username: string) => username === 'username1'); const findUserById = jest.fn(async (): Promise => mockUser); diff --git a/packages/core/src/routes/session/password.ts b/packages/core/src/routes/session/password.ts index e464618ee..94189f1a1 100644 --- a/packages/core/src/routes/session/password.ts +++ b/packages/core/src/routes/session/password.ts @@ -1,6 +1,5 @@ import { passwordRegEx, usernameRegEx } from '@logto/core-kit'; -import { SignInIdentifier, UserRole } from '@logto/schemas'; -import { adminConsoleApplicationId } from '@logto/schemas'; +import { SignInIdentifier, UserRole, adminConsoleApplicationId } from '@logto/schemas'; import type { Provider } from 'oidc-provider'; import { object, string } from 'zod'; diff --git a/packages/core/src/routes/well-known.test.ts b/packages/core/src/routes/well-known.test.ts index fe8340615..44e54375a 100644 --- a/packages/core/src/routes/well-known.test.ts +++ b/packages/core/src/routes/well-known.test.ts @@ -1,10 +1,10 @@ -import { SignInMode } from '@logto/schemas'; -import { adminConsoleApplicationId, adminConsoleSignInExperience } from '@logto/schemas'; +import { + SignInMode, + adminConsoleApplicationId, + adminConsoleSignInExperience, +} from '@logto/schemas'; import { mockEsm, mockEsmWithActual, pickDefault } from '@logto/shared/esm'; -import { createMockProvider } from '#src/test-utils/oidc-provider.js'; -import { createRequester } from '#src/utils/test-utils.js'; - import { mockAliyunDmConnector, mockAliyunSmsConnector, @@ -15,6 +15,8 @@ import { mockWechatConnector, mockWechatNativeConnector, } from '#src/__mocks__/index.js'; +import { createMockProvider } from '#src/test-utils/oidc-provider.js'; +import { createRequester } from '#src/utils/test-utils.js'; const { jest } = import.meta; await mockEsmWithActual('i18next', () => ({ diff --git a/packages/integration-tests/src/tests/api/application.test.ts b/packages/integration-tests/src/tests/api/application.test.ts index 89b8f4223..3d2b5d979 100644 --- a/packages/integration-tests/src/tests/api/application.test.ts +++ b/packages/integration-tests/src/tests/api/application.test.ts @@ -1,5 +1,4 @@ -import { ApplicationType } from '@logto/schemas'; -import { demoAppApplicationId } from '@logto/schemas'; +import { ApplicationType, demoAppApplicationId } from '@logto/schemas'; import { HTTPError } from 'got'; import { diff --git a/packages/integration-tests/src/tests/api/session.test.ts b/packages/integration-tests/src/tests/api/session.test.ts index b9d722661..b7cf82824 100644 --- a/packages/integration-tests/src/tests/api/session.test.ts +++ b/packages/integration-tests/src/tests/api/session.test.ts @@ -1,5 +1,4 @@ -import { SignInIdentifier } from '@logto/schemas'; -import { adminConsoleApplicationId } from '@logto/schemas'; +import { SignInIdentifier, adminConsoleApplicationId } from '@logto/schemas'; import { assert } from '@silverhand/essentials'; import { diff --git a/packages/schemas/alterations/1.0.0_beta.10-1-logto-config.ts b/packages/schemas/alterations/1.0.0_beta.10-1-logto-config.ts index 2954857c0..eb7dbb6c5 100644 --- a/packages/schemas/alterations/1.0.0_beta.10-1-logto-config.ts +++ b/packages/schemas/alterations/1.0.0_beta.10-1-logto-config.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.10-1663923211-machine-to-machine-app.ts b/packages/schemas/alterations/1.0.0_beta.10-1663923211-machine-to-machine-app.ts index 27f85ded3..7a0146b0f 100644 --- a/packages/schemas/alterations/1.0.0_beta.10-1663923211-machine-to-machine-app.ts +++ b/packages/schemas/alterations/1.0.0_beta.10-1663923211-machine-to-machine-app.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.10-1664265197-custom-phrases.ts b/packages/schemas/alterations/1.0.0_beta.10-1664265197-custom-phrases.ts index cabc149c7..65c7c8005 100644 --- a/packages/schemas/alterations/1.0.0_beta.10-1664265197-custom-phrases.ts +++ b/packages/schemas/alterations/1.0.0_beta.10-1664265197-custom-phrases.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.11-1664347703-rename-language-key-to-tag.ts b/packages/schemas/alterations/1.0.0_beta.11-1664347703-rename-language-key-to-tag.ts index 181a5e58c..2463cb407 100644 --- a/packages/schemas/alterations/1.0.0_beta.11-1664347703-rename-language-key-to-tag.ts +++ b/packages/schemas/alterations/1.0.0_beta.11-1664347703-rename-language-key-to-tag.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.11-1664356000-add-created-at-column-to-users.ts b/packages/schemas/alterations/1.0.0_beta.11-1664356000-add-created-at-column-to-users.ts index 502d4a454..02cf4dafb 100644 --- a/packages/schemas/alterations/1.0.0_beta.11-1664356000-add-created-at-column-to-users.ts +++ b/packages/schemas/alterations/1.0.0_beta.11-1664356000-add-created-at-column-to-users.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.11-1664462389-correct-user-created-at-column-by-user-logs.ts b/packages/schemas/alterations/1.0.0_beta.11-1664462389-correct-user-created-at-column-by-user-logs.ts index 239e7a611..a6b3479e3 100644 --- a/packages/schemas/alterations/1.0.0_beta.11-1664462389-correct-user-created-at-column-by-user-logs.ts +++ b/packages/schemas/alterations/1.0.0_beta.11-1664462389-correct-user-created-at-column-by-user-logs.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.14-1665300135-sign-in-sign-up.ts b/packages/schemas/alterations/1.0.0_beta.14-1665300135-sign-in-sign-up.ts index 3df9087b2..3460ca40e 100644 --- a/packages/schemas/alterations/1.0.0_beta.14-1665300135-sign-in-sign-up.ts +++ b/packages/schemas/alterations/1.0.0_beta.14-1665300135-sign-in-sign-up.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; enum SignInMethodState { Primary = 'primary', diff --git a/packages/schemas/alterations/1.0.0_beta.14-1667283640-remove-forgot-password.ts b/packages/schemas/alterations/1.0.0_beta.14-1667283640-remove-forgot-password.ts index e7ec2a582..63466b2bb 100644 --- a/packages/schemas/alterations/1.0.0_beta.14-1667283640-remove-forgot-password.ts +++ b/packages/schemas/alterations/1.0.0_beta.14-1667283640-remove-forgot-password.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.14-1667292082-remove-sign-in-method.ts b/packages/schemas/alterations/1.0.0_beta.14-1667292082-remove-sign-in-method.ts index 857e27368..25d747401 100644 --- a/packages/schemas/alterations/1.0.0_beta.14-1667292082-remove-sign-in-method.ts +++ b/packages/schemas/alterations/1.0.0_beta.14-1667292082-remove-sign-in-method.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.14-1667374974-user-suspend.ts b/packages/schemas/alterations/1.0.0_beta.14-1667374974-user-suspend.ts index 352a91937..71d51e83b 100644 --- a/packages/schemas/alterations/1.0.0_beta.14-1667374974-user-suspend.ts +++ b/packages/schemas/alterations/1.0.0_beta.14-1667374974-user-suspend.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/1.0.0_beta.14-1667900481-add-passcode-type-continue.ts b/packages/schemas/alterations/1.0.0_beta.14-1667900481-add-passcode-type-continue.ts index 39a8cf579..553633db7 100644 --- a/packages/schemas/alterations/1.0.0_beta.14-1667900481-add-passcode-type-continue.ts +++ b/packages/schemas/alterations/1.0.0_beta.14-1667900481-add-passcode-type-continue.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/next-1668666590-support-multiple-connector-instances.ts b/packages/schemas/alterations/next-1668666590-support-multiple-connector-instances.ts index a42ab126e..81a9c6a4b 100644 --- a/packages/schemas/alterations/next-1668666590-support-multiple-connector-instances.ts +++ b/packages/schemas/alterations/next-1668666590-support-multiple-connector-instances.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/next-1668666600-remove-connector-enabled.ts b/packages/schemas/alterations/next-1668666600-remove-connector-enabled.ts index ee68bfd06..0621df559 100644 --- a/packages/schemas/alterations/next-1668666600-remove-connector-enabled.ts +++ b/packages/schemas/alterations/next-1668666600-remove-connector-enabled.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/next-1669091623-roles-and-scopes.ts b/packages/schemas/alterations/next-1669091623-roles-and-scopes.ts index b976f48ca..9b3e51949 100644 --- a/packages/schemas/alterations/next-1669091623-roles-and-scopes.ts +++ b/packages/schemas/alterations/next-1669091623-roles-and-scopes.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/next-1669702299-sign-up.ts b/packages/schemas/alterations/next-1669702299-sign-up.ts index 4cd640c8f..0e0bfc521 100644 --- a/packages/schemas/alterations/next-1669702299-sign-up.ts +++ b/packages/schemas/alterations/next-1669702299-sign-up.ts @@ -2,7 +2,7 @@ import { isSameArray } from '@silverhand/essentials'; import type { DatabaseTransactionConnection } from 'slonik'; import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; enum DeprecatedSignUpIdentifier { Email = 'email', diff --git a/packages/schemas/alterations/next-1671039448-add-user-name-index.ts b/packages/schemas/alterations/next-1671039448-add-user-name-index.ts index e3d940136..3b79ae2c3 100644 --- a/packages/schemas/alterations/next-1671039448-add-user-name-index.ts +++ b/packages/schemas/alterations/next-1671039448-add-user-name-index.ts @@ -1,6 +1,6 @@ import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/alterations/next-1671080370-terms-of-use.ts b/packages/schemas/alterations/next-1671080370-terms-of-use.ts index d70f4f6aa..bf22791bf 100644 --- a/packages/schemas/alterations/next-1671080370-terms-of-use.ts +++ b/packages/schemas/alterations/next-1671080370-terms-of-use.ts @@ -1,7 +1,7 @@ import type { DatabaseTransactionConnection } from 'slonik'; import { sql } from 'slonik'; -import type { AlterationScript } from '../lib/src/types/alteration.js'; +import type { AlterationScript } from '../src/types/alteration.js'; type DeprecatedTermsOfUse = { enabled: boolean; diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 97f8184fd..5f158ba0b 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -10,11 +10,11 @@ "alterations-js", "tables" ], - "main": "./lib/src/index.js", + "main": "./lib/index.js", "exports": { - ".": "./lib/src/index.js", - "./lib/*": "./lib/src/*", - "./models": "./lib/src-models/index.js", + ".": "./lib/index.js", + "./lib/*": "./lib/*", + "./models": "./lib/models/index.js", "./package.json": "./package.json" }, "publishConfig": { @@ -82,8 +82,6 @@ "@logto/language-kit": "workspace:*", "@logto/phrases": "workspace:*", "@logto/phrases-ui": "workspace:*", - "@withtyped/server": "^0.3.0", - "nanoid": "^4.0.0", "zod": "^3.20.2" } } diff --git a/packages/schemas/tsconfig.json b/packages/schemas/tsconfig.json index c5fc7fd55..05e3acb09 100644 --- a/packages/schemas/tsconfig.json +++ b/packages/schemas/tsconfig.json @@ -8,7 +8,6 @@ }, "include": [ "src", - "src-models", "alterations" ] } diff --git a/packages/toolkit/core-kit/package.json b/packages/toolkit/core-kit/package.json index 55d2cd655..86a5d5b79 100644 --- a/packages/toolkit/core-kit/package.json +++ b/packages/toolkit/core-kit/package.json @@ -39,7 +39,7 @@ "node": "^16.13.0 || ^18.12.0" }, "dependencies": { - "@logto/language-kit": "^1.0.0-beta.29", + "@logto/language-kit": "workspace:*", "color": "^4.2.3", "nanoid": "^4.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82b35f9eb..b9ddc5d6e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,6 +23,7 @@ importers: packages/cli: specifiers: + '@logto/core-kit': workspace:* '@logto/schemas': workspace:* '@logto/shared': workspace:* '@silverhand/eslint-config': 1.3.0 @@ -62,6 +63,7 @@ importers: yargs: ^17.6.0 zod: ^3.20.2 dependencies: + '@logto/core-kit': link:../toolkit/core-kit '@logto/schemas': link:../schemas '@logto/shared': link:../shared '@silverhand/essentials': 1.3.0 @@ -682,7 +684,7 @@ importers: packages/toolkit/core-kit: specifiers: '@jest/types': ^29.0.3 - '@logto/language-kit': ^1.0.0-beta.29 + '@logto/language-kit': workspace:* '@rollup/plugin-typescript': ^10.0.1 '@silverhand/eslint-config': 1.3.0 '@silverhand/eslint-config-react': 1.3.0