Merge branch 'main' of https://github.com/lingui/js-lingui into compile-ts-files

Author: Sergio Moreno

docs/guides/typescript.rst

@@ -53,13 +53,13 @@ In your ``webpack.config.js``, use both ``babel-loader`` and ``ts-loader`` for T
    To supply babel options for the extraction process use :conf:`extractBabelOptions` configuration option.
 
 
-:conf:`compileNamespace` must be set to ``es`` (ES6 default export) in the Lingui config
+:conf:`compileNamespace` must be set to ``ts`` (ES6 default export) in the Lingui config
 otherwise compiled catalogs can't be imported using ES ``import``, but rather CommonJS ``require``:
 
 .. code:: js
 
   {
-    "compileNamespace": "es"
+    "compileNamespace": "ts"
   }
 
 Type definitions

packages/cli/src/lingui-compile.ts

@@ -82,7 +82,7 @@ function command(config: LinguiConfig, options) {
       if (doMerge) {
         mergedCatalogs = { ...mergedCatalogs, ...messages }
       } else {
-        const namespace = options.namespace || config.compileNamespace
+        const namespace = options.typescript ? "ts" : options.namespace || config.compileNamespace
         const compiledCatalog = createCompiledCatalog(locale, messages, {
           strict: false,
           namespace,
@@ -97,7 +97,7 @@ function command(config: LinguiConfig, options) {
         )
 
         if (options.typescript) {
-          const typescriptPath = compiledPath.replace(/\.jsx?$/, "") + ".d.ts"
+          const typescriptPath = compiledPath.replace(/\.ts?$/, "") + ".d.ts"
           fs.writeFileSync(
             typescriptPath,
             `import { Messages } from '@lingui/core';