Merge remote-tracking branch 'upstream/main' into feature/AddPublishJ…

…sonOutput

.eslintrc.json

@@ -1,8 +1,18 @@
 {
   "root": true,
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
   "extends": ["airbnb-base", "plugin:jest/recommended", "plugin:node/recommended", "prettier"],
   "plugins": ["jest", "node"],
   "ignorePatterns": ["website/**/*"],
+  "settings": {
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".ts"]
+      }
+    }
+  },
   "rules": {
     "class-methods-use-this": [
       "error",
@@ -33,6 +43,7 @@
         "classes": false
       }
     ],
+    "node/no-unsupported-features/es-syntax": "off",
     "prefer-destructuring": "off",
     "prefer-object-spread": "off",
     "strict": "off",
@@ -48,7 +59,7 @@
       }
     },
     {
-      "files": ["integration/**", "**/__tests__/**", "**/__mocks__/**", "**/__helpers__/**"],
+      "files": ["integration/**", "helpers/**", "**/__tests__/**", "**/__mocks__/**", "**/__helpers__/**"],
       "env": {
         "jest": true
       },

.github/actions/install-node-and-dependencies/action.yml

@@ -9,15 +9,15 @@ runs:
   using: "composite"
   steps:
     - name: Install node and npm based on the given values (or the volta config in package.json)
-      uses: volta-cli/action@v1
+      uses: volta-cli/action@v4
       with:
         node-version: ${{ inputs.node-version }}
 
     - name: Get npm cache directory and node version for cache key
       id: npm-cache-dir
       run: |
-        echo "::set-output name=node_version::$(node --version)"
-        echo "::set-output name=dir::$(npm config get cache)"
+        echo "node_version=$(node --version)" >> $GITHUB_OUTPUT
+        echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
       shell: bash
 
     - uses: actions/cache@v3
@@ -31,3 +31,7 @@ runs:
     - name: Install dependencies
       run: npm ci
       shell: bash
+
+    - name: Install pnpm
+      run: npm install -g pnpm
+      shell: bash

.github/workflows/ci.yml

@@ -13,6 +13,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
 jobs:
   lint:
     runs-on: ubuntu-latest

README.md

@@ -46,7 +46,7 @@ A few links to help you get started:
 
 - [lerna.js.org: Documentation, Guides, Interactive Tutorials](https://lerna.js.org)
 - [Getting Started](https://lerna.js.org/docs/getting-started)
-- [Core Concepts](https://lerna.js.org/docs/core-concepts)
+- [Features](https://lerna.js.org/docs/features)
 - [Official Nrwl YouTube Channel](https://www.youtube.com/c/Nrwl_io)
 - [Blog Posts About Lerna and Nx](https://blog.nrwl.io/nx/home)
 

__fixtures__/cycle-intersection/lerna.json

@@ -1,3 +1,5 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"],
+  "useNx": false
 }

__fixtures__/cycle-parent/lerna.json

@@ -1,3 +1,4 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"]
 }

__fixtures__/cycle-separate/lerna.json

@@ -1,3 +1,5 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"],
+  "useNx": false
 }

__fixtures__/independent/package.json

@@ -1,3 +1,6 @@
 {
-  "name": "independent"
+  "name": "independent",
+  "repository": {
+    "url": "https://github.com/lerna/independent-packages"
+  }
 }

__fixtures__/independent/packages/package-1/package.json

@@ -1,4 +1,7 @@
 {
   "name": "package-1",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "repository": {
+    "url": "https://github.com/lerna/independent-package-1"
+  }
 }

__fixtures__/independent/packages/package-2/package.json

@@ -3,5 +3,8 @@
   "version": "2.0.0",
   "dependencies": {
     "package-1": "^1.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/independent-package-2"
   }
 }

__fixtures__/independent/packages/package-3/package.json

@@ -3,5 +3,8 @@
   "version": "3.0.0",
   "devDependencies": {
     "package-2": "^2.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/independent-package-3"
   }
 }

__fixtures__/independent/packages/package-4/package.json

@@ -3,5 +3,8 @@
   "version": "4.0.0",
   "dependencies": {
     "package-1": "^0.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/independent-package-4"
   }
 }

__fixtures__/independent/packages/package-5/package.json

@@ -4,5 +4,8 @@
     "package-3": "^3.0.0"
   },
   "private": true,
-  "version": "5.0.0"
+  "version": "5.0.0",
+  "repository": {
+    "url": "https://github.com/lerna/independent-package-5"
+  }
 }

__fixtures__/licenses-missing/lerna.json

@@ -1,3 +1,4 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"]
 }

__fixtures__/licenses/lerna.json

@@ -1,3 +1,4 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"]
 }

__fixtures__/lifecycle/lerna.json

@@ -1,3 +1,4 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"]
 }

__fixtures__/lockfile-leaf-v2/packages/package-1/package.json

@@ -2,6 +2,10 @@
   "name": "package-1",
   "version": "1.0.0",
   "dependencies": {
-    "tiny-tarball": "^1.0.0"
+    "tiny-tarball": "^1.0.0",
+    "package-2": "^1.0.0"
+  },
+  "devDependencies": {
+    "package-3": "2.0.0"
   }
 }

__fixtures__/normal/lerna.json

@@ -1,3 +1,6 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": [
+    "packages/*"
+  ]
 }

__fixtures__/normal/package.json

@@ -1,3 +1,6 @@
 {
-  "name": "normal"
+  "name": "normal",
+  "repository": {
+    "url": "https://github.com/lerna/normal-packages"
+  }
 }

__fixtures__/normal/packages/package-1/package.json

@@ -1,4 +1,7 @@
 {
   "name": "package-1",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "repository": {
+    "url": "https://github.com/lerna/normal-package-1"
+  }
 }

__fixtures__/normal/packages/package-2/package.json

@@ -3,5 +3,8 @@
   "version": "1.0.0",
   "dependencies": {
     "package-1": "^1.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/normal-package-2"
   }
 }

__fixtures__/normal/packages/package-3/package.json

@@ -6,5 +6,8 @@
   },
   "devDependencies": {
     "package-2": "^1.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/normal-package-3"
   }
 }

__fixtures__/normal/packages/package-4/package.json

@@ -3,5 +3,8 @@
   "version": "1.0.0",
   "dependencies": {
     "package-1": "^0.0.0"
+  },
+  "repository": {
+    "url": "https://github.com/lerna/normal-package-4"
   }
 }

__fixtures__/normal/packages/package-5/package.json

@@ -7,5 +7,8 @@
     "package-3": "^1.0.0"
   },
   "private": true,
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "repository": {
+    "url": "https://github.com/lerna/normal-package-5"
+  }
 }

__fixtures__/toposort/lerna.json

@@ -1,3 +1,5 @@
 {
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "packages": ["packages/*"],
+  "useNx": false
 }

commands/__mocks__/@lerna/output.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const chalk = require("chalk");
-const { multiLineTrimRight } = require("@lerna-test/multi-line-trim-right");
+const { multiLineTrimRight } = require("@lerna-test/helpers");
 
 // keep snapshots stable cross-platform
 chalk.level = 0;