diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts index 7cb0e12c574..2a02edbdfc8 100644 --- a/apps/meteor/server/lib/i18n.ts +++ b/apps/meteor/server/lib/i18n.ts @@ -1,4 +1,5 @@ -import i18nDict, { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces } from '@rocket.chat/i18n'; +import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces } from '@rocket.chat/i18n'; +import i18nDict from '@rocket.chat/i18n/dist/resources'; import { i18n } from '../../app/utils/lib/i18n'; diff --git a/ee/apps/omnichannel-transcript/src/i18n.ts b/ee/apps/omnichannel-transcript/src/i18n.ts index 902925cc264..fa39b0c8f1e 100644 --- a/ee/apps/omnichannel-transcript/src/i18n.ts +++ b/ee/apps/omnichannel-transcript/src/i18n.ts @@ -1,4 +1,5 @@ -import i18nDict, { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces } from '@rocket.chat/i18n'; +import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces } from '@rocket.chat/i18n'; +import i18nDict from '@rocket.chat/i18n/dist/resources'; import i18next from 'i18next'; import sprintf from 'i18next-sprintf-postprocessor'; diff --git a/packages/i18n/src/index.ts b/packages/i18n/src/index.ts index 585d2230cd2..bd0aa3ac4de 100644 --- a/packages/i18n/src/index.ts +++ b/packages/i18n/src/index.ts @@ -1,8 +1,11 @@ -import type { RocketchatI18nKeys } from '@rocket.chat/i18n'; import { isObject } from '@rocket.chat/tools'; import type i18next from 'i18next'; import type { TOptions } from 'i18next'; +import type { RocketchatI18nKeys } from '../resources'; + +export type { RocketchatI18nKeys }; + declare module 'i18next' { // eslint-disable-next-line @typescript-eslint/naming-convention interface TFunction { diff --git a/packages/i18n/src/resources.ts b/packages/i18n/src/resources.ts new file mode 100644 index 00000000000..53c8d2ff5f8 --- /dev/null +++ b/packages/i18n/src/resources.ts @@ -0,0 +1,12 @@ +// dummy +export type RocketchatI18nKeys = + | 'core.key1' + | 'core.key2' + | 'onboarding.key1' + | 'onboarding.key2' + | 'registration.key1' + | 'registration.key2' + | 'cloud.key1' + | 'cloud.key2' + | 'subscription.key1' + | 'subscription.key2'; diff --git a/packages/i18n/src/scripts/build.mjs b/packages/i18n/src/scripts/build.mjs index 200c4c50e97..fbfff753ec8 100644 --- a/packages/i18n/src/scripts/build.mjs +++ b/packages/i18n/src/scripts/build.mjs @@ -98,12 +98,7 @@ export default languages;`, ); // ./index - await writeFile( - join(distDirectory, 'index.mjs'), - `export { default } from './resources.mjs'; -export * from './resources.mjs'; -export * from './esm/index.js';`, - ); + await writeFile(join(distDirectory, 'index.mjs'), `export * from './esm/index.js';`); await writeFile( join(distDirectory, 'index.js'), @@ -126,19 +121,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = void 0; -var resources_1 = require("./resources"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(resources_1).default; } }); -__exportStar(require("./resources"), exports); __exportStar(require("./cjs/index"), exports);`, ); - await writeFile( - join(distDirectory, 'index.d.ts'), - `export { default } from './resources'; -export * from './resources'; -export * from './esm/index';`, - ); + await writeFile(join(distDirectory, 'index.d.ts'), `export * from './esm/index';`); } if (import.meta.url.startsWith('file:')) { diff --git a/packages/i18n/tsconfig.json b/packages/i18n/tsconfig.json index d3ff0b8bdc0..9538ff3463d 100644 --- a/packages/i18n/tsconfig.json +++ b/packages/i18n/tsconfig.json @@ -3,7 +3,10 @@ "compilerOptions": { "rootDirs": ["./src", "./"], "outDir": "./dist", - "declaration": true + "declaration": true, + "paths": { + "../resources": ["./src/resources"], + } }, "include": ["./src/**/*", "./jest.config.ts"] }