fix: bump cosmiconfig to v8 (#3701)

lerna · May 31, 2023 · 898923d · 898923d
1 parent f67288b
commit 898923d
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 55 deletions.
diff --git a/e2e/info/src/info.spec.ts b/e2e/info/src/info.spec.ts
@@ -5,7 +5,7 @@ expect.addSnapshotSerializer({
     return normalizeEnvironment(
       str
         .replaceAll(/OS: .*\n/g, "OS: {OS}\n")
-        .replaceAll(/CPU: \(\d{1,2}\) x(64|32) .* CPU .*\n/g, "CPU: {CPU}\n")
+        .replaceAll(/CPU: \(\d{1,2}\) x(64|32) .* (CPU|Processor).*\n/g, "CPU: {CPU}\n")
         .replaceAll(/CPU: \(\d{1,2}\) arm64 .*\n/g, "CPU: {CPU}\n")
         .replaceAll(/Node: (\d{1,2})\.(\d{1,2})\.(\d{1,2}) - .*\n/g, "Node: XX.XX.XX - {Node}\n")
         .replaceAll(/Yarn: (\d{1,2})\.(\d{1,2})\.(\d{1,2}) - .*\n/g, "Yarn: XX.XX.XX - {Yarn}\n")

diff --git a/libs/core/src/lib/project/index.ts b/libs/core/src/lib/project/index.ts
@@ -227,52 +227,52 @@ export class Project {
   }
 
   #resolveLernaConfig(cwd?: string) {
-    const explorer = cosmiconfigSync("lerna", {
-      loaders: {
-        ...defaultLoaders,
-        ".json": (filepath, content) => {
-          if (!filepath.endsWith("lerna.json")) {
-            return defaultLoaders[".json"](filepath, content);
-          }
-          /**
-           * This prevents lerna from blowing up on trailing commas and comments in lerna configs,
-           * however it should be noted that we will not be able to respect those things whenever
-           * we perform an automated config migration, e.g. via `lerna repair` and they will be lost.
-           * (Although that will be easy enough for the user to see and updated in their `git diff`)
-           */
-          try {
-            return parseJson(content);
-          } catch (err: unknown) {
-            if (err instanceof Error) {
-              err.name = "JSONError";
-              err.message = `Error in: ${filepath}\n${err.message}`;
+    try {
+      const explorer = cosmiconfigSync("lerna", {
+        loaders: {
+          ...defaultLoaders,
+          ".json": (filepath, content) => {
+            if (!filepath.endsWith("lerna.json")) {
+              return defaultLoaders[".json"](filepath, content);
+            }
+            /**
+             * This prevents lerna from blowing up on trailing commas and comments in lerna configs,
+             * however it should be noted that we will not be able to respect those things whenever
+             * we perform an automated config migration, e.g. via `lerna repair` and they will be lost.
+             * (Although that will be easy enough for the user to see and updated in their `git diff`)
+             */
+            try {
+              return parseJson(content);
+            } catch (err: unknown) {
+              if (err instanceof Error) {
+                err.name = "JSONError";
+                err.message = `Error in: ${filepath}\n${err.message}`;
+              }
+              throw err;
             }
-            throw err;
+          },
+        },
+        searchPlaces: ["lerna.json", "package.json"],
+        transform(obj) {
+          // cosmiconfig returns null when nothing is found
+          if (!obj) {
+            const configNotFoundResult: CosmiconfigNotFoundResult = {
+              // No need to distinguish between missing and empty,
+              // saves a lot of noisy guards elsewhere
+              config: {},
+              configNotFound: true,
+              // path.resolve(".", ...) starts from process.cwd()
+              filepath: path.resolve(cwd || ".", "lerna.json"),
+            };
+            return configNotFoundResult;
           }
+
+          obj.config = applyExtends(obj.config, path.dirname(obj.filepath));
+
+          return obj;
         },
-      },
-      searchPlaces: ["lerna.json", "package.json"],
-      transform(obj) {
-        // cosmiconfig returns null when nothing is found
-        if (!obj) {
-          const configNotFoundResult: CosmiconfigNotFoundResult = {
-            // No need to distinguish between missing and empty,
-            // saves a lot of noisy guards elsewhere
-            config: {},
-            configNotFound: true,
-            // path.resolve(".", ...) starts from process.cwd()
-            filepath: path.resolve(cwd || ".", "lerna.json"),
-          };
-          return configNotFoundResult;
-        }
-
-        obj.config = applyExtends(obj.config, path.dirname(obj.filepath));
-
-        return obj;
-      },
-    });
+      });
 
-    try {
       /**
        * We explicitly handle the missing config case in the transform function above,
        * so we can remove null from the types and replace it with the custom ConfigNotFoundResult.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "conventional-changelog-angular": "^5.0.12",
     "conventional-changelog-core": "^4.2.4",
     "conventional-recommended-bump": "^6.1.0",
-    "cosmiconfig": "^7.0.0",
+    "cosmiconfig": "8.1.3",
     "dedent": "^0.7.0",
     "envinfo": "^7.7.4",
     "execa": "^5.0.0",

diff --git a/packages/legacy-package-management/package.json b/packages/legacy-package-management/package.json
@@ -38,7 +38,7 @@
     "config-chain": "1.1.12",
     "conventional-changelog-core": "4.2.4",
     "conventional-recommended-bump": "6.1.0",
-    "cosmiconfig": "7.0.0",
+    "cosmiconfig": "8.1.3",
     "dedent": "0.7.0",
     "execa": "5.0.0",
     "file-url": "3.0.0",

diff --git a/packages/lerna/package.json b/packages/lerna/package.json
@@ -53,7 +53,7 @@
     "conventional-changelog-angular": "5.0.12",
     "conventional-changelog-core": "4.2.4",
     "conventional-recommended-bump": "6.1.0",
-    "cosmiconfig": "7.0.0",
+    "cosmiconfig": "8.1.3",
     "dedent": "0.7.0",
     "envinfo": "^7.7.4",
     "execa": "5.0.0",