diff --git a/packages/phrases-ui/package.json b/packages/phrases-ui/package.json index 66df4680d..5661367db 100644 --- a/packages/phrases-ui/package.json +++ b/packages/phrases-ui/package.json @@ -5,6 +5,7 @@ "author": "Silverhand Inc. ", "homepage": "https://github.com/logto-io/logto#readme", "license": "MPL-2.0", + "type": "module", "main": "lib/index.js", "publishConfig": { "access": "public" diff --git a/packages/phrases-ui/src/index.ts b/packages/phrases-ui/src/index.ts index 247666d59..b89fd39cb 100644 --- a/packages/phrases-ui/src/index.ts +++ b/packages/phrases-ui/src/index.ts @@ -4,16 +4,16 @@ import { languages } from '@logto/language-kit'; import type { NormalizeKeyPaths } from '@silverhand/essentials'; import { z } from 'zod'; -import de from './locales/de'; -import en from './locales/en'; -import fr from './locales/fr'; -import ko from './locales/ko'; -import ptPT from './locales/pt-pt'; -import trTR from './locales/tr-tr'; -import zhCN from './locales/zh-cn'; -import type { LocalePhrase } from './types'; +import de from './locales/de.js'; +import en from './locales/en.js'; +import fr from './locales/fr.js'; +import ko from './locales/ko.js'; +import ptPT from './locales/pt-pt.js'; +import trTR from './locales/tr-tr.js'; +import zhCN from './locales/zh-cn.js'; +import type { LocalePhrase } from './types.js'; -export type { LocalePhrase } from './types'; +export type { LocalePhrase } from './types.js'; export type I18nKey = NormalizeKeyPaths; diff --git a/packages/phrases-ui/src/locales/de.ts b/packages/phrases-ui/src/locales/de.ts index 7d62e439b..02d9e4fe3 100644 --- a/packages/phrases-ui/src/locales/de.ts +++ b/packages/phrases-ui/src/locales/de.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/locales/fr.ts b/packages/phrases-ui/src/locales/fr.ts index dfdee2670..15084c2a8 100644 --- a/packages/phrases-ui/src/locales/fr.ts +++ b/packages/phrases-ui/src/locales/fr.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/locales/ko.ts b/packages/phrases-ui/src/locales/ko.ts index fbd4cb990..ff2df00f0 100644 --- a/packages/phrases-ui/src/locales/ko.ts +++ b/packages/phrases-ui/src/locales/ko.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/locales/pt-pt.ts b/packages/phrases-ui/src/locales/pt-pt.ts index ad55b8a3d..cab6fcb16 100644 --- a/packages/phrases-ui/src/locales/pt-pt.ts +++ b/packages/phrases-ui/src/locales/pt-pt.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/locales/tr-tr.ts b/packages/phrases-ui/src/locales/tr-tr.ts index ef512dd86..70881f9e6 100644 --- a/packages/phrases-ui/src/locales/tr-tr.ts +++ b/packages/phrases-ui/src/locales/tr-tr.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/locales/zh-cn.ts b/packages/phrases-ui/src/locales/zh-cn.ts index 271d0d5b6..aea8ff141 100644 --- a/packages/phrases-ui/src/locales/zh-cn.ts +++ b/packages/phrases-ui/src/locales/zh-cn.ts @@ -1,4 +1,4 @@ -import type { LocalePhrase } from '../types'; +import type { LocalePhrase } from '../types.js'; const translation = { input: { diff --git a/packages/phrases-ui/src/types.ts b/packages/phrases-ui/src/types.ts index 9d6e5a80b..0ed193edb 100644 --- a/packages/phrases-ui/src/types.ts +++ b/packages/phrases-ui/src/types.ts @@ -1,3 +1,3 @@ -import type en from './locales/en'; +import type en from './locales/en.js'; export type LocalePhrase = typeof en; diff --git a/packages/phrases-ui/tsconfig.json b/packages/phrases-ui/tsconfig.json index 22287725e..b28c5b67e 100644 --- a/packages/phrases-ui/tsconfig.json +++ b/packages/phrases-ui/tsconfig.json @@ -2,7 +2,9 @@ "extends": "@silverhand/ts-config/tsconfig.base", "compilerOptions": { "outDir": "lib", - "declaration": true + "declaration": true, + "moduleResolution": "nodenext", + "module": "es2022" }, "include": ["src"] } diff --git a/packages/phrases/package.json b/packages/phrases/package.json index 8dd9234fe..fc276fc4f 100644 --- a/packages/phrases/package.json +++ b/packages/phrases/package.json @@ -5,6 +5,7 @@ "author": "Silverhand Inc. ", "homepage": "https://github.com/logto-io/logto#readme", "license": "MPL-2.0", + "type": "module", "main": "lib/index.js", "publishConfig": { "access": "public" diff --git a/packages/phrases/src/index.ts b/packages/phrases/src/index.ts index e8a821620..c6c430478 100644 --- a/packages/phrases/src/index.ts +++ b/packages/phrases/src/index.ts @@ -4,16 +4,16 @@ import { languages } from '@logto/language-kit'; import type { NormalizeKeyPaths } from '@silverhand/essentials'; import { z } from 'zod'; -import de from './locales/de'; -import en from './locales/en'; -import fr from './locales/fr'; -import ko from './locales/ko'; -import ptPT from './locales/pt-pt'; -import trTR from './locales/tr-tr'; -import zhCN from './locales/zh-cn'; -import type { LocalPhrase } from './types'; +import de from './locales/de/index.js'; +import en from './locales/en/index.js'; +import fr from './locales/fr/index.js'; +import ko from './locales/ko/index.js'; +import ptPT from './locales/pt-pt/index.js'; +import trTR from './locales/tr-tr/index.js'; +import zhCN from './locales/zh-cn/index.js'; +import type { LocalPhrase } from './types.js'; -export type { LocalPhrase } from './types'; +export type { LocalPhrase } from './types.js'; export type I18nKey = NormalizeKeyPaths; diff --git a/packages/phrases/src/locales/de/index.ts b/packages/phrases/src/locales/de/index.ts index 10ea8ed97..715f77192 100644 --- a/packages/phrases/src/locales/de/index.ts +++ b/packages/phrases/src/locales/de/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const de: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/de/translation/admin-console/index.ts b/packages/phrases/src/locales/de/translation/admin-console/index.ts index 2964cba88..816360791 100644 --- a/packages/phrases/src/locales/de/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/de/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: 'Admin Konsole', diff --git a/packages/phrases/src/locales/de/translation/index.ts b/packages/phrases/src/locales/de/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/de/translation/index.ts +++ b/packages/phrases/src/locales/de/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/en/index.ts b/packages/phrases/src/locales/en/index.ts index c6d488122..f6f6956f7 100644 --- a/packages/phrases/src/locales/en/index.ts +++ b/packages/phrases/src/locales/en/index.ts @@ -1,5 +1,5 @@ -import errors from './errors'; -import translation from './translation'; +import errors from './errors.js'; +import translation from './translation/index.js'; const en = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/en/translation/admin-console/index.ts b/packages/phrases/src/locales/en/translation/admin-console/index.ts index e5384fe80..102cfde03 100644 --- a/packages/phrases/src/locales/en/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/en/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: 'Admin Console', diff --git a/packages/phrases/src/locales/en/translation/index.ts b/packages/phrases/src/locales/en/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/en/translation/index.ts +++ b/packages/phrases/src/locales/en/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/fr/index.ts b/packages/phrases/src/locales/fr/index.ts index 7eaf393f6..5a3541d9f 100644 --- a/packages/phrases/src/locales/fr/index.ts +++ b/packages/phrases/src/locales/fr/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const fr: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/fr/translation/admin-console/index.ts b/packages/phrases/src/locales/fr/translation/admin-console/index.ts index e5384fe80..102cfde03 100644 --- a/packages/phrases/src/locales/fr/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/fr/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: 'Admin Console', diff --git a/packages/phrases/src/locales/fr/translation/index.ts b/packages/phrases/src/locales/fr/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/fr/translation/index.ts +++ b/packages/phrases/src/locales/fr/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/ko/index.ts b/packages/phrases/src/locales/ko/index.ts index a8e49ed0b..9788f8495 100644 --- a/packages/phrases/src/locales/ko/index.ts +++ b/packages/phrases/src/locales/ko/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const ko: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/ko/translation/admin-console/index.ts b/packages/phrases/src/locales/ko/translation/admin-console/index.ts index 82dce9a5c..a1641d313 100644 --- a/packages/phrases/src/locales/ko/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/ko/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: '관리자 Console', diff --git a/packages/phrases/src/locales/ko/translation/index.ts b/packages/phrases/src/locales/ko/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/ko/translation/index.ts +++ b/packages/phrases/src/locales/ko/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/pt-pt/index.ts b/packages/phrases/src/locales/pt-pt/index.ts index b6fa212b7..e3447c128 100644 --- a/packages/phrases/src/locales/pt-pt/index.ts +++ b/packages/phrases/src/locales/pt-pt/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const ptPT: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/pt-pt/translation/admin-console/index.ts b/packages/phrases/src/locales/pt-pt/translation/admin-console/index.ts index f63ff54a0..997ce0cf7 100644 --- a/packages/phrases/src/locales/pt-pt/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/pt-pt/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: 'Consola de Administrador', diff --git a/packages/phrases/src/locales/pt-pt/translation/index.ts b/packages/phrases/src/locales/pt-pt/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/pt-pt/translation/index.ts +++ b/packages/phrases/src/locales/pt-pt/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/tr-tr/index.ts b/packages/phrases/src/locales/tr-tr/index.ts index 55bd2f884..572e02c8b 100644 --- a/packages/phrases/src/locales/tr-tr/index.ts +++ b/packages/phrases/src/locales/tr-tr/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const trTR: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/tr-tr/translation/admin-console/index.ts b/packages/phrases/src/locales/tr-tr/translation/admin-console/index.ts index aece609c0..d0e3612fd 100644 --- a/packages/phrases/src/locales/tr-tr/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/tr-tr/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: 'Yönetici Paneli', diff --git a/packages/phrases/src/locales/tr-tr/translation/index.ts b/packages/phrases/src/locales/tr-tr/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/tr-tr/translation/index.ts +++ b/packages/phrases/src/locales/tr-tr/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/locales/zh-cn/index.ts b/packages/phrases/src/locales/zh-cn/index.ts index 3bc867641..c90c4c0be 100644 --- a/packages/phrases/src/locales/zh-cn/index.ts +++ b/packages/phrases/src/locales/zh-cn/index.ts @@ -1,6 +1,6 @@ -import type { LocalPhrase } from '../../types'; -import errors from './errors'; -import translation from './translation'; +import type { LocalPhrase } from '../../types.js'; +import errors from './errors.js'; +import translation from './translation/index.js'; const zhCN: LocalPhrase = Object.freeze({ translation, diff --git a/packages/phrases/src/locales/zh-cn/translation/admin-console/index.ts b/packages/phrases/src/locales/zh-cn/translation/admin-console/index.ts index 9a95a6ddb..156b0534a 100644 --- a/packages/phrases/src/locales/zh-cn/translation/admin-console/index.ts +++ b/packages/phrases/src/locales/zh-cn/translation/admin-console/index.ts @@ -1,24 +1,24 @@ -import api_resource_details from './api-resource-details'; -import api_resources from './api-resources'; -import application_details from './application-details'; -import applications from './applications'; -import connector_details from './connector-details'; -import connectors from './connectors'; -import contact from './contact'; -import dashboard from './dashboard'; -import errors from './errors'; -import general from './general'; -import get_started from './get-started'; -import log_details from './log-details'; -import logs from './logs'; -import session_expired from './session-expired'; -import settings from './settings'; -import sign_in_exp from './sign-in-exp'; -import tab_sections from './tab-sections'; -import tabs from './tabs'; -import user_details from './user-details'; -import users from './users'; -import welcome from './welcome'; +import api_resource_details from './api-resource-details.js'; +import api_resources from './api-resources.js'; +import application_details from './application-details.js'; +import applications from './applications.js'; +import connector_details from './connector-details.js'; +import connectors from './connectors.js'; +import contact from './contact.js'; +import dashboard from './dashboard.js'; +import errors from './errors.js'; +import general from './general.js'; +import get_started from './get-started.js'; +import log_details from './log-details.js'; +import logs from './logs.js'; +import session_expired from './session-expired.js'; +import settings from './settings.js'; +import sign_in_exp from './sign-in-exp.js'; +import tab_sections from './tab-sections.js'; +import tabs from './tabs.js'; +import user_details from './user-details.js'; +import users from './users.js'; +import welcome from './welcome.js'; const admin_console = { title: '管理控制台', diff --git a/packages/phrases/src/locales/zh-cn/translation/index.ts b/packages/phrases/src/locales/zh-cn/translation/index.ts index 4d123d04e..c8894ec9c 100644 --- a/packages/phrases/src/locales/zh-cn/translation/index.ts +++ b/packages/phrases/src/locales/zh-cn/translation/index.ts @@ -1,5 +1,5 @@ -import admin_console from './admin-console'; -import demo_app from './demo-app'; +import admin_console from './admin-console/index.js'; +import demo_app from './demo-app.js'; const translation = { admin_console, diff --git a/packages/phrases/src/types.ts b/packages/phrases/src/types.ts index 78c521c85..5c0a77aa1 100644 --- a/packages/phrases/src/types.ts +++ b/packages/phrases/src/types.ts @@ -1,3 +1,3 @@ -import type en from './locales/en'; +import type en from './locales/en/index.js'; export type LocalPhrase = typeof en; diff --git a/packages/phrases/tsconfig.json b/packages/phrases/tsconfig.json index ec160f030..255f91f40 100644 --- a/packages/phrases/tsconfig.json +++ b/packages/phrases/tsconfig.json @@ -2,7 +2,9 @@ "extends": "@silverhand/ts-config/tsconfig.base", "compilerOptions": { "outDir": "lib", - "declaration": true + "declaration": true, + "moduleResolution": "nodenext", + "module": "es2022" }, "include": [ "src" 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 2d4a21f19..644145283 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 bc1b8c694..a8bb4d683 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 846f8e0c4..5f496d401 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 5706b4bff..b17b1567e 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 5203c9a21..1e708b9d6 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 ab619e0b8..9669dd100 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 { AlterationScript } from '../lib/types/alteration'; +import type { AlterationScript } from '../lib/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 f04ab1b5c..08e172d8a 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/types/alteration'; +import type { AlterationScript } from '../lib/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 3461db973..cfb0534de 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/types/alteration'; +import type { AlterationScript } from '../lib/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 245ef7042..a939e32d4 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/types/alteration'; +import type { AlterationScript } from '../lib/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 817f831fc..d48f7f6cf 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/types/alteration'; +import type { AlterationScript } from '../lib/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 1aa07480c..fa5923886 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/types/alteration'; +import type { AlterationScript } from '../lib/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 4e682b6e5..b2d9af7d0 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/types/alteration'; +import type { AlterationScript } from '../lib/types/alteration.js'; const alteration: AlterationScript = { up: async (pool) => { diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 404d7a152..3cb38c0c2 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -4,6 +4,7 @@ "main": "lib/index.js", "author": "Silverhand Inc. ", "license": "MPL-2.0", + "type": "module", "files": [ "lib", "alterations", @@ -16,7 +17,7 @@ "scripts": { "precommit": "lint-staged", "version": "./update-next.sh && git add alterations/", - "generate": "rm -rf src/db-entries && ts-node src/gen/index.ts && eslint \"src/db-entries/**\" --fix", + "generate": "rm -rf src/db-entries && ts-node-esm src/gen/index.ts && eslint \"src/db-entries/**\" --fix", "build:alterations": "rm -rf alterations-js && tsc -p tsconfig.build.alterations.json", "build": "pnpm generate && rm -rf lib/ && tsc -p tsconfig.build.json && pnpm build:alterations", "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental", diff --git a/packages/schemas/src/api/index.ts b/packages/schemas/src/api/index.ts index 93ae819ea..022699d14 100644 --- a/packages/schemas/src/api/index.ts +++ b/packages/schemas/src/api/index.ts @@ -1 +1 @@ -export * from './error'; +export * from './error.js'; diff --git a/packages/schemas/src/foundations/index.ts b/packages/schemas/src/foundations/index.ts index 2cd17d221..33b1ce241 100644 --- a/packages/schemas/src/foundations/index.ts +++ b/packages/schemas/src/foundations/index.ts @@ -1,2 +1,2 @@ -export * from './schemas'; -export * from './jsonb-types'; +export * from './schemas.js'; +export * from './jsonb-types.js'; diff --git a/packages/schemas/src/gen/index.ts b/packages/schemas/src/gen/index.ts index 850c244f2..aabe6c768 100644 --- a/packages/schemas/src/gen/index.ts +++ b/packages/schemas/src/gen/index.ts @@ -10,15 +10,15 @@ import camelcase from 'camelcase'; import uniq from 'lodash.uniq'; import pluralize from 'pluralize'; -import { generateSchema } from './schema'; -import type { FileData, Table, Field, Type, GeneratedType, TableWithType } from './types'; +import { generateSchema } from './schema.js'; +import type { FileData, Table, Field, Type, GeneratedType, TableWithType } from './types.js'; import { findFirstParentheses, normalizeWhitespaces, parseType, removeUnrecognizedComments, splitTableFieldDefinitions, -} from './utils'; +} from './utils.js'; const directory = 'tables'; const constrainedKeywords = [ @@ -95,7 +95,7 @@ const generate = async () => { const generatedDirectory = 'src/db-entries'; const generatedTypesFilename = 'custom-types'; - const tsTypesFilename = '../foundations'; + const tsTypesFilename = '../foundations/index'; const header = '// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n\n'; await fs.rm(generatedDirectory, { recursive: true, force: true }); @@ -167,7 +167,7 @@ const generate = async () => { uniq(tsTypes) .map((value) => ` ${value}`) .join(',\n'), - `} from './${tsTypesFilename}';`, + `} from'./${tsTypesFilename}.js';`, ].join('\n') + '\n\n' ); @@ -178,7 +178,7 @@ const generate = async () => { uniq(customTypes) .map((value) => ` ${value}`) .join(',\n'), - `} from './${generatedTypesFilename}';`, + `} from'./${generatedTypesFilename}.js';`, ].join('\n') + '\n\n' ); @@ -196,8 +196,8 @@ const generate = async () => { await fs.writeFile( path.join(generatedDirectory, 'index.ts'), header + - conditionalString(allTypes.length > 0 && `export * from './${generatedTypesFilename}';\n`) + - generated.map(([file]) => `export * from './${getOutputFileName(file)}';`).join('\n') + + conditionalString(allTypes.length > 0 && `export * from'./${generatedTypesFilename}.js';\n`) + + generated.map(([file]) => `export * from'./${getOutputFileName(file)}.js';`).join('\n') + '\n' ); }; diff --git a/packages/schemas/src/gen/schema.ts b/packages/schemas/src/gen/schema.ts index 09ed9256e..3f3558d5f 100644 --- a/packages/schemas/src/gen/schema.ts +++ b/packages/schemas/src/gen/schema.ts @@ -4,7 +4,7 @@ import { conditionalString } from '@silverhand/essentials'; import camelcase from 'camelcase'; import pluralize from 'pluralize'; -import type { TableWithType } from './types'; +import type { TableWithType } from './types.js'; export const generateSchema = ({ name, fields }: TableWithType) => { const modelName = pluralize(camelcase(name, { pascalCase: true }), 1); diff --git a/packages/schemas/src/gen/utils.test.ts b/packages/schemas/src/gen/utils.test.ts index 655833389..679dc630e 100644 --- a/packages/schemas/src/gen/utils.test.ts +++ b/packages/schemas/src/gen/utils.test.ts @@ -1,4 +1,4 @@ -import { parseType, getType, splitTableFieldDefinitions } from './utils'; +import { parseType, getType, splitTableFieldDefinitions } from './utils.js'; describe('splitTableFieldDefinitions', () => { it('splitTableFieldDefinitions should split at each comma that is not in the parentheses', () => { diff --git a/packages/schemas/src/gen/utils.ts b/packages/schemas/src/gen/utils.ts index a7fa600be..213684876 100644 --- a/packages/schemas/src/gen/utils.ts +++ b/packages/schemas/src/gen/utils.ts @@ -1,7 +1,7 @@ import type { Optional } from '@silverhand/essentials'; import { conditional, assert } from '@silverhand/essentials'; -import type { Field } from './types'; +import type { Field } from './types.js'; export const normalizeWhitespaces = (string: string): string => string.replace(/\s+/g, ' ').trim(); diff --git a/packages/schemas/src/index.ts b/packages/schemas/src/index.ts index 19f0dd248..23a82911b 100644 --- a/packages/schemas/src/index.ts +++ b/packages/schemas/src/index.ts @@ -1,5 +1,5 @@ -export * from './foundations'; -export * from './db-entries'; -export * from './types'; -export * from './api'; -export * as seeds from './seeds'; +export * from './foundations/index.js'; +export * from './db-entries/index.js'; +export * from './types/index.js'; +export * from './api/index.js'; +export * as seeds from './seeds/index.js'; diff --git a/packages/schemas/src/seeds/application.ts b/packages/schemas/src/seeds/application.ts index db3301c2c..c3214b82b 100644 --- a/packages/schemas/src/seeds/application.ts +++ b/packages/schemas/src/seeds/application.ts @@ -1,5 +1,5 @@ -import type { CreateApplication } from '../db-entries'; -import { ApplicationType } from '../db-entries'; +import type { CreateApplication } from '../db-entries/index.js'; +import { ApplicationType } from '../db-entries/index.js'; /** * The fixed application ID for Admin Console. diff --git a/packages/schemas/src/seeds/index.ts b/packages/schemas/src/seeds/index.ts index 21714fa99..8e9523955 100644 --- a/packages/schemas/src/seeds/index.ts +++ b/packages/schemas/src/seeds/index.ts @@ -1,5 +1,5 @@ -export * from './application'; -export * from './resource'; -export * from './setting'; -export * from './sign-in-experience'; -export * from './roles'; +export * from './application.js'; +export * from './resource.js'; +export * from './setting.js'; +export * from './sign-in-experience.js'; +export * from './roles.js'; diff --git a/packages/schemas/src/seeds/resource.ts b/packages/schemas/src/seeds/resource.ts index ddaf88735..b8e13eaad 100644 --- a/packages/schemas/src/seeds/resource.ts +++ b/packages/schemas/src/seeds/resource.ts @@ -1,4 +1,4 @@ -import type { CreateResource } from '../db-entries'; +import type { CreateResource } from '../db-entries/index.js'; export const managementResource: Readonly = Object.freeze({ id: 'management-api', diff --git a/packages/schemas/src/seeds/roles.ts b/packages/schemas/src/seeds/roles.ts index eeb18e807..27f4bd368 100644 --- a/packages/schemas/src/seeds/roles.ts +++ b/packages/schemas/src/seeds/roles.ts @@ -1,5 +1,5 @@ -import type { CreateRole } from '../db-entries'; -import { UserRole } from '../types'; +import type { CreateRole } from '../db-entries/index.js'; +import { UserRole } from '../types/index.js'; /** * Default Admin Role for Admin Console. diff --git a/packages/schemas/src/seeds/setting.ts b/packages/schemas/src/seeds/setting.ts index 04dbe1069..10a321e86 100644 --- a/packages/schemas/src/seeds/setting.ts +++ b/packages/schemas/src/seeds/setting.ts @@ -1,5 +1,5 @@ -import type { CreateSetting } from '../db-entries'; -import { AppearanceMode } from '../foundations'; +import type { CreateSetting } from '../db-entries/index.js'; +import { AppearanceMode } from '../foundations/index.js'; export const defaultSettingId = 'default'; diff --git a/packages/schemas/src/seeds/sign-in-experience.ts b/packages/schemas/src/seeds/sign-in-experience.ts index c32dfcec4..6bdf3b68b 100644 --- a/packages/schemas/src/seeds/sign-in-experience.ts +++ b/packages/schemas/src/seeds/sign-in-experience.ts @@ -1,8 +1,8 @@ import { generateDarkColor } from '@logto/core-kit'; -import type { CreateSignInExperience } from '../db-entries'; -import { SignInMode } from '../db-entries'; -import { BrandingStyle, SignInIdentifier, SignUpIdentifier } from '../foundations'; +import type { CreateSignInExperience } from '../db-entries/index.js'; +import { SignInMode } from '../db-entries/index.js'; +import { BrandingStyle, SignInIdentifier, SignUpIdentifier } from '../foundations/index.js'; const defaultPrimaryColor = '#6139F6'; diff --git a/packages/schemas/src/types/connector.ts b/packages/schemas/src/types/connector.ts index a83b8e99a..14de9e202 100644 --- a/packages/schemas/src/types/connector.ts +++ b/packages/schemas/src/types/connector.ts @@ -1,6 +1,6 @@ import type { BaseConnector, ConnectorMetadata, ConnectorType } from '@logto/connector-kit'; -import type { Connector } from '../db-entries'; +import type { Connector } from '../db-entries/index.js'; export type { ConnectorMetadata } from '@logto/connector-kit'; export { ConnectorType, ConnectorPlatform } from '@logto/connector-kit'; diff --git a/packages/schemas/src/types/index.ts b/packages/schemas/src/types/index.ts index 9bb6fd003..bdb872c33 100644 --- a/packages/schemas/src/types/index.ts +++ b/packages/schemas/src/types/index.ts @@ -1,5 +1,5 @@ -export * from './connector'; -export * from './log'; -export * from './oidc-config'; -export * from './user'; -export * from './logto-config'; +export * from './connector.js'; +export * from './log.js'; +export * from './oidc-config.js'; +export * from './user.js'; +export * from './logto-config.js'; diff --git a/packages/schemas/src/types/log.ts b/packages/schemas/src/types/log.ts index 7f1642d43..d3cdb927b 100644 --- a/packages/schemas/src/types/log.ts +++ b/packages/schemas/src/types/log.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import type { Log } from '../db-entries'; +import type { Log } from '../db-entries/index.js'; export enum LogResult { Success = 'Success', diff --git a/packages/schemas/src/types/user.ts b/packages/schemas/src/types/user.ts index 1830b9d31..9e05c76d2 100644 --- a/packages/schemas/src/types/user.ts +++ b/packages/schemas/src/types/user.ts @@ -1,4 +1,4 @@ -import type { CreateUser } from '../db-entries'; +import type { CreateUser } from '../db-entries/index.js'; export const userInfoSelectFields = Object.freeze([ 'id', diff --git a/packages/schemas/tsconfig.json b/packages/schemas/tsconfig.json index 6dac33b10..bf5e57cc9 100644 --- a/packages/schemas/tsconfig.json +++ b/packages/schemas/tsconfig.json @@ -2,7 +2,9 @@ "extends": "@silverhand/ts-config/tsconfig.base", "compilerOptions": { "outDir": "lib", - "declaration": true + "declaration": true, + "moduleResolution": "nodenext", + "module": "es2022" }, "include": [ "src", diff --git a/packages/shared/package.json b/packages/shared/package.json index e589befb3..7f4f77312 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -4,6 +4,7 @@ "main": "lib/index.js", "author": "Silverhand Inc. ", "license": "MPL-2.0", + "type": "module", "files": [ "lib" ], diff --git a/packages/shared/src/database/index.ts b/packages/shared/src/database/index.ts index 6d5a6ef49..920534d03 100644 --- a/packages/shared/src/database/index.ts +++ b/packages/shared/src/database/index.ts @@ -1,2 +1,2 @@ -export * from './types'; -export * from './utils'; +export * from './types.js'; +export * from './utils.js'; diff --git a/packages/shared/src/database/utils.test.ts b/packages/shared/src/database/utils.test.ts index 79653f147..27937c833 100644 --- a/packages/shared/src/database/utils.test.ts +++ b/packages/shared/src/database/utils.test.ts @@ -1,7 +1,7 @@ import { sql } from 'slonik'; import { SqlToken } from 'slonik/dist/src/tokens.js'; -import type { Table } from './types'; +import type { Table } from './types.js'; import { excludeAutoSetFields, autoSetFields, @@ -9,7 +9,7 @@ import { convertToIdentifiers, convertToTimestamp, conditionalSql, -} from './utils'; +} from './utils.js'; describe('conditionalSql()', () => { it('returns empty sql when value is falsy', () => { diff --git a/packages/shared/src/database/utils.ts b/packages/shared/src/database/utils.ts index 910e8e9b2..0601cf589 100644 --- a/packages/shared/src/database/utils.ts +++ b/packages/shared/src/database/utils.ts @@ -4,7 +4,7 @@ import { notFalsy } from '@silverhand/essentials'; import type { SqlSqlToken, SqlToken, QueryResult, IdentifierSqlToken } from 'slonik'; import { sql } from 'slonik'; -import type { FieldIdentifiers, Table } from './types'; +import type { FieldIdentifiers, Table } from './types.js'; export const conditionalSql = (value: T, buildSql: (value: Exclude) => SqlSqlToken) => notFalsy(value) ? buildSql(value) : sql``; diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index b5963a52c..7bf661541 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -1,2 +1,2 @@ -export * from './database'; -export * from './utils'; +export * from './database/index.js'; +export * from './utils/index.js'; diff --git a/packages/shared/src/utils/id.test.ts b/packages/shared/src/utils/id.test.ts index 189b6dd3f..b6cc4d532 100644 --- a/packages/shared/src/utils/id.test.ts +++ b/packages/shared/src/utils/id.test.ts @@ -1,4 +1,4 @@ -import { buildIdGenerator, alphabet } from './id'; +import { buildIdGenerator, alphabet } from './id.js'; describe('id generator', () => { it('should match the input length', () => { diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts index 3912ce027..8bfcfa7f3 100644 --- a/packages/shared/src/utils/index.ts +++ b/packages/shared/src/utils/index.ts @@ -1,3 +1,3 @@ -export * from './id'; -export * from './function'; -export { default as findPackage } from './find-package'; +export * from './id.js'; +export * from './function.js'; +export { default as findPackage } from './find-package.js'; diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 00b88e2de..3bccdbc71 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -3,7 +3,9 @@ "compilerOptions": { "outDir": "lib", "declaration": true, - "types": ["node", "jest"] + "types": ["node", "jest"], + "moduleResolution": "nodenext", + "module": "es2022" }, "include": [ "src",