feat: Switch to cosmiconfig-typescript-loader #1247

Author: marek-saji

packages/conf/package.json

@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
     "chalk": "^4.1.0",
     "cosmiconfig": "^7.0.0",
+    "cosmiconfig-typescript-loader": "^2.0.1",
     "jest-validate": "^26.5.2",
     "lodash.get": "^4.4.2"
   },

packages/conf/src/__snapshots__/index.test.ts.snap

@@ -72,6 +72,26 @@ Documentation: https://lingui.js.org/ref/conf.html
     Please update your configuration.
     
 
+Documentation: https://lingui.js.org/ref/conf.html
+`;
+
+exports[`@lingui/conf config file fallbackLocales logic if fallbackLocale is defined, we use the default one on fallbackLocales 1`] = `
+● Deprecation Warning:
+
+ Option fallbackLocale was replaced by fallbackLocales
+
+    You can find more information here: https://github.com/lingui/js-lingui/issues/791
+
+    @lingui/cli now treats your current configuration as:
+    {
+      "fallbackLocales": {
+        default: "en"
+      }
+    }
+
+    Please update your configuration.
+    
+
 Documentation: https://lingui.js.org/ref/conf.html
 `;
 

packages/conf/src/fixtures/valid/custom.config.ts

@@ -0,0 +1,3 @@
+export default {
+  locales: ["pl"],
+}

packages/conf/src/index.test.ts

@@ -119,18 +119,18 @@ describe("@lingui/conf", function () {
     })
   })
 
-  it("searches for a config file", function () {
-    // hide validation warning about missing locales
-    mockConsole(() => {
-      const config = getConfig({
-        cwd: path.resolve(__dirname, path.join("fixtures", "valid")),
+  describe("config file", function () {
+    it("searches for a .linguirc config file", function () {
+      // hide validation warning about missing locales
+      mockConsole(() => {
+        const config = getConfig({
+          cwd: path.resolve(__dirname, path.join("fixtures", "valid")),
+        })
+        expect(config.locales).toEqual(["en-gb"])
       })
-      expect(config.locales).toEqual(["en-gb"])
     })
-  })
 
-  describe("with configPath parameter", function () {
-    it("allows specific config file to be loaded", function () {
+    it("allows specific config file to be loaded with configPath parameter", function () {
       // hide validation warning about missing locales
       mockConsole(() => {
         const config = getConfig({
@@ -142,39 +142,52 @@ describe("@lingui/conf", function () {
         expect(config.locales).toEqual(["cs", "sk"])
       })
     })
-  })
-
-  describe("fallbackLocales logic", () => {
-    afterEach(() => {
-      mockFs.restore()
-    })
 
-    it ("if fallbackLocale is defined, we use the default one on fallbackLocales", () => {
-      mockFs({
-        ".linguirc": JSON.stringify({
-          locales: ["en-US"],
-          fallbackLocale: "en"
-        })
-      })
-      mockConsole((console) => {
+    it("loads TypeScript config", function () {
+      // hide validation warning about missing locales
+      mockConsole(() => {
         const config = getConfig({
-          configPath: ".linguirc",
+          configPath: path.resolve(
+            __dirname,
+            path.join("fixtures", "valid", "custom.config.ts")
+          ),
         })
-        expect(config.fallbackLocales.default).toEqual("en")
-        expect(getConsoleMockCalls(console.warn)).toMatchSnapshot()
+        expect(config.locales).toEqual(["pl"])
       })
     })
 
-    it ("if fallbackLocales default is defined, we dont build the cldr", () => {
-      const config = getConfig({
-        configPath: path.resolve(
-          __dirname,
-          path.join("fixtures", "valid", ".fallbacklocalesrc")
-        ),
+    describe("fallbackLocales logic", () => {
+      afterEach(() => {
+        mockFs.restore()
+      })
+
+      it("if fallbackLocale is defined, we use the default one on fallbackLocales", () => {
+        mockFs({
+          ".linguirc": JSON.stringify({
+            locales: ["en-US"],
+            fallbackLocale: "en",
+          }),
+        })
+        mockConsole((console) => {
+          const config = getConfig({
+            configPath: ".linguirc",
+          })
+          expect(config.fallbackLocales.default).toEqual("en")
+          expect(getConsoleMockCalls(console.warn)).toMatchSnapshot()
+        })
       })
-      expect(config.fallbackLocales).toEqual({
-        "en-US": ["en"],
-        default: "en",
+
+      it("if fallbackLocales default is defined, we dont build the cldr", () => {
+        const config = getConfig({
+          configPath: path.resolve(
+            __dirname,
+            path.join("fixtures", "valid", ".fallbacklocalesrc")
+          ),
+        })
+        expect(config.fallbackLocales).toEqual({
+          "en-US": ["en"],
+          default: "en",
+        })
       })
     })
   })