Adapt to lerna 7 defaults

joshuajaco · Nov 18, 2023 · d19410d · d19410d
1 parent 03019c7
commit d19410d
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 100 deletions.
diff --git a/fixtures/lerna-with-defaults/lerna.json b/fixtures/lerna-with-defaults/lerna.json
diff --git a/fixtures/lerna-with-defaults/package.json b/fixtures/lerna-with-defaults/package.json
diff --git a/fixtures/lerna-with-defaults/packages/a/package.json b/fixtures/lerna-with-defaults/packages/a/package.json
diff --git a/fixtures/lerna-with-defaults/packages/b/package.json b/fixtures/lerna-with-defaults/packages/b/package.json
diff --git a/fixtures/lerna-with-packages/lerna.json b/fixtures/lerna-with-packages/lerna.json
@@ -0,0 +1 @@
+{ "packages": ["packages/*"] }
diff --git a/fixtures/lerna-with-packages/package.json b/fixtures/lerna-with-packages/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "lerna",
+  "private": true
+}
diff --git a/fixtures/lerna-with-packages/packages/a/package.json b/fixtures/lerna-with-packages/packages/a/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "@lerna-with-packages/a",
+  "private": true
+}
diff --git a/fixtures/lerna-with-packages/packages/b/package.json b/fixtures/lerna-with-packages/packages/b/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "@lerna-with-packages/b",
+  "private": true
+}
diff --git a/fixtures/lerna/lerna.json b/fixtures/lerna/lerna.json
@@ -1 +1 @@
-{ "packages": ["packages/*"] }
+{}
diff --git a/fixtures/lerna/package.json b/fixtures/lerna/package.json
@@ -1,4 +1,7 @@
 {
   "name": "lerna",
-  "private": true
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ]
 }
diff --git a/index.ts b/index.ts
@@ -111,14 +111,11 @@ function resolveLernaGlobs(dir: string): string[] | null {
   const lernaJson = resolveJSONFile(dir, "lerna.json");
   if (lernaJson === undefined) return null;
 
-  if (isObject(lernaJson)) {
-    if (lernaJson.useWorkspaces === true) return null;
-    if (!lernaJson.packages) return ["packages/*"];
-    if (isStringArray(lernaJson.packages)) return lernaJson.packages;
-    return null;
+  if (isObject(lernaJson) && isStringArray(lernaJson.packages)) {
+    return lernaJson.packages;
   }
 
-  return ["packages/*"];
+  return null;
 }
 
 function resolvePnpmGlobs(dir: string): string[] | null {

diff --git a/tests/findRoot.test.ts b/tests/findRoot.test.ts
@@ -19,23 +19,23 @@ assert.deepStrictEqual(findWorkspacesRoot(join("fixtures", "bolt")), {
   globs: ["packages/**/*"],
 });
 
-assert.deepStrictEqual(findWorkspacesRoot(join("fixtures", "lerna")), {
-  location: posixResolve("fixtures", "lerna"),
-  globs: ["packages/*"],
-});
+assert.deepStrictEqual(
+  findWorkspacesRoot(join("fixtures", "lerna-with-packages")),
+  {
+    location: posixResolve("fixtures", "lerna-with-packages"),
+    globs: ["packages/*"],
+  },
+);
 
 assert.strictEqual(
   findWorkspacesRoot(join("fixtures", "lerna-with-invalid-packages")),
   null,
 );
 
-assert.deepStrictEqual(
-  findWorkspacesRoot(join("fixtures", "lerna-with-defaults")),
-  {
-    location: posixResolve("fixtures", "lerna-with-defaults"),
-    globs: ["packages/*"],
-  },
-);
+assert.deepStrictEqual(findWorkspacesRoot(join("fixtures", "lerna")), {
+  location: posixResolve("fixtures", "lerna"),
+  globs: ["packages/*"],
+});
 
 assert.strictEqual(
   findWorkspacesRoot(join("fixtures", "lerna-with-invalid-workspaces")),

diff --git a/tests/findWorkspaces.test.ts b/tests/findWorkspaces.test.ts
@@ -16,54 +16,54 @@ assert.deepStrictEqual(findWorkspaces(join("fixtures", "bolt")), [
   },
 ]);
 
-assert.deepStrictEqual(findWorkspaces(join("fixtures", "lerna")), [
-  {
-    location: posixResolve("fixtures", "lerna", "packages", "a"),
-    package: { name: "@lerna/a", private: true },
-  },
-  {
-    location: posixResolve("fixtures", "lerna", "packages", "b"),
-    package: { name: "@lerna/b", private: true },
-  },
-]);
-
-assert.strictEqual(
-  findWorkspaces(join("fixtures", "lerna-with-invalid-packages")),
-  null,
-);
-
 assert.deepStrictEqual(
-  findWorkspaces(join("fixtures", "lerna-with-defaults")),
+  findWorkspaces(join("fixtures", "lerna-with-packages")),
   [
     {
       location: posixResolve(
         "fixtures",
-        "lerna-with-defaults",
+        "lerna-with-packages",
         "packages",
         "a",
       ),
-      package: { name: "@lerna-with-defaults/a", private: true },
+      package: { name: "@lerna-with-packages/a", private: true },
     },
     {
       location: posixResolve(
         "fixtures",
-        "lerna-with-defaults",
+        "lerna-with-packages",
         "packages",
         "b",
       ),
-      package: { name: "@lerna-with-defaults/b", private: true },
+      package: { name: "@lerna-with-packages/b", private: true },
     },
   ],
 );
 
+assert.strictEqual(
+  findWorkspaces(join("fixtures", "lerna-with-invalid-packages")),
+  null,
+);
+
+assert.deepStrictEqual(findWorkspaces(join("fixtures", "lerna")), [
+  {
+    location: posixResolve("fixtures", "lerna", "packages", "a"),
+    package: { name: "@lerna/a", private: true },
+  },
+  {
+    location: posixResolve("fixtures", "lerna", "packages", "b"),
+    package: { name: "@lerna/b", private: true },
+  },
+]);
+
 assert.strictEqual(
   findWorkspaces(join("fixtures", "lerna-with-invalid-workspaces")),
   null,
 );
 
 assert.deepStrictEqual(
   findWorkspaces(join("fixtures", "lerna-with-invalid-lerna-json")),
-  [],
+  null,
 );
 
 assert.strictEqual(
@@ -186,53 +186,67 @@ assert.deepStrictEqual(findWorkspaces(posixResolve("fixtures", "yarn-npm")), [
 const cache = createWorkspacesCache();
 
 assert.deepStrictEqual(
-  findWorkspaces(posixResolve("fixtures", "lerna", "foo"), { cache }),
-  [
-    {
-      location: posixResolve("fixtures", "lerna", "packages", "a"),
-      package: { name: "@lerna/a", private: true },
-    },
-    {
-      location: posixResolve("fixtures", "lerna", "packages", "b"),
-      package: { name: "@lerna/b", private: true },
-    },
-  ],
-);
-
-assert.deepStrictEqual(
-  findWorkspaces(posixResolve("fixtures", "lerna", "bar"), { cache }),
+  findWorkspaces(posixResolve("fixtures", "lerna-with-packages", "foo"), {
+    cache,
+  }),
   [
     {
-      location: posixResolve("fixtures", "lerna", "packages", "a"),
-      package: { name: "@lerna/a", private: true },
+      location: posixResolve(
+        "fixtures",
+        "lerna-with-packages",
+        "packages",
+        "a",
+      ),
+      package: { name: "@lerna-with-packages/a", private: true },
     },
     {
-      location: posixResolve("fixtures", "lerna", "packages", "b"),
-      package: { name: "@lerna/b", private: true },
+      location: posixResolve(
+        "fixtures",
+        "lerna-with-packages",
+        "packages",
+        "b",
+      ),
+      package: { name: "@lerna-with-packages/b", private: true },
     },
   ],
 );
 
 assert.deepStrictEqual(
-  findWorkspaces(posixResolve("fixtures", "lerna-with-defaults"), { cache }),
+  findWorkspaces(posixResolve("fixtures", "lerna-with-packages", "bar"), {
+    cache,
+  }),
   [
     {
       location: posixResolve(
         "fixtures",
-        "lerna-with-defaults",
+        "lerna-with-packages",
         "packages",
         "a",
       ),
-      package: { name: "@lerna-with-defaults/a", private: true },
+      package: { name: "@lerna-with-packages/a", private: true },
     },
     {
       location: posixResolve(
         "fixtures",
-        "lerna-with-defaults",
+        "lerna-with-packages",
         "packages",
         "b",
       ),
-      package: { name: "@lerna-with-defaults/b", private: true },
+      package: { name: "@lerna-with-packages/b", private: true },
+    },
+  ],
+);
+
+assert.deepStrictEqual(
+  findWorkspaces(posixResolve("fixtures", "lerna"), { cache }),
+  [
+    {
+      location: posixResolve("fixtures", "lerna", "packages", "a"),
+      package: { name: "@lerna/a", private: true },
+    },
+    {
+      location: posixResolve("fixtures", "lerna", "packages", "b"),
+      package: { name: "@lerna/b", private: true },
     },
   ],
 );
@@ -241,14 +255,17 @@ assert.deepStrictEqual(
   cache.root,
   new Map([
     [
-      resolve("fixtures", "lerna"),
-      { globs: ["packages/*"], location: posixResolve("fixtures", "lerna") },
+      resolve("fixtures", "lerna-with-packages"),
+      {
+        globs: ["packages/*"],
+        location: posixResolve("fixtures", "lerna-with-packages"),
+      },
     ],
     [
-      resolve("fixtures", "lerna-with-defaults"),
+      resolve("fixtures", "lerna"),
       {
         globs: ["packages/*"],
-        location: posixResolve("fixtures", "lerna-with-defaults"),
+        location: posixResolve("fixtures", "lerna"),
       },
     ],
   ]),
@@ -258,38 +275,38 @@ assert.deepStrictEqual(
   cache.workspaces,
   new Map([
     [
-      posixResolve("fixtures", "lerna"),
-      [
-        {
-          location: posixResolve("fixtures", "lerna", "packages", "a"),
-          package: { name: "@lerna/a", private: true },
-        },
-        {
-          location: posixResolve("fixtures", "lerna", "packages", "b"),
-          package: { name: "@lerna/b", private: true },
-        },
-      ],
-    ],
-    [
-      posixResolve("fixtures", "lerna-with-defaults"),
+      posixResolve("fixtures", "lerna-with-packages"),
       [
         {
           location: posixResolve(
             "fixtures",
-            "lerna-with-defaults",
+            "lerna-with-packages",
             "packages",
             "a",
           ),
-          package: { name: "@lerna-with-defaults/a", private: true },
+          package: { name: "@lerna-with-packages/a", private: true },
         },
         {
           location: posixResolve(
             "fixtures",
-            "lerna-with-defaults",
+            "lerna-with-packages",
             "packages",
             "b",
           ),
-          package: { name: "@lerna-with-defaults/b", private: true },
+          package: { name: "@lerna-with-packages/b", private: true },
+        },
+      ],
+    ],
+    [
+      posixResolve("fixtures", "lerna"),
+      [
+        {
+          location: posixResolve("fixtures", "lerna", "packages", "a"),
+          package: { name: "@lerna/a", private: true },
+        },
+        {
+          location: posixResolve("fixtures", "lerna", "packages", "b"),
+          package: { name: "@lerna/b", private: true },
         },
       ],
     ],