Skip to content

Commit

Permalink
Merge branch 'lerna:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
SherfeyInv authored Jun 30, 2024
2 parents 8b726bf + 52c3bcb commit 1b0992d
Show file tree
Hide file tree
Showing 164 changed files with 6,302 additions and 4,327 deletions.
15 changes: 13 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
],
"checkDynamicDependenciesExceptions": [".*"]
}
],
"no-restricted-imports": [
"error",
{
"name": "npmlog",
"message": "Please use the inlined core utility instead."
}
]
}
},
Expand All @@ -34,7 +41,9 @@
"extends": ["plugin:@nx/typescript"],
"rules": {
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off"
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
Expand Down Expand Up @@ -77,7 +86,9 @@
"strict": "off",
"default-param-last": "warn",
"max-len": "off",
"arrow-body-style": "off"
"arrow-body-style": "off",
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
Expand Down
27 changes: 22 additions & 5 deletions .github/actions/install-node-and-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
using: "composite"
steps:
- name: Install node and npm based on the given values (or the volta config in package.json)
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ${{ inputs.node-version == '' && 'package.json' || '' }}
node-version: ${{ inputs.node-version }}
Expand All @@ -28,21 +28,38 @@ runs:
- name: Enable corepack
run: corepack enable
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"
COREPACK_ENABLE_STRICT: "0"

- name: Install pnpm v8
run: corepack install -g pnpm@8
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"

- name: Print installed pnpm version
run: pnpm --version
shell: bash
COREPACK_ENABLE_STRICT: "0"

- name: Use Yarn classic
run: yarn set version classic
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"
COREPACK_ENABLE_STRICT: "0"

- name: Print installed node, npm, yarn and pnpm versions
run: |
node --version
npm --version
yarn --version
pnpm --version
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"
COREPACK_ENABLE_STRICT: "0"

- name: Install dependencies
run: ${{ inputs.install-command }}
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"
COREPACK_ENABLE_STRICT: "0"
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ concurrency:

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
NX_CLOUD_DISTRIBUTED_EXECUTION: true
NX_VERBOSE_LOGGING: false

jobs:
Expand Down
35 changes: 18 additions & 17 deletions .github/workflows/other-node-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ concurrency:

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
NX_CLOUD_DISTRIBUTED_EXECUTION: true
NX_VERBOSE_LOGGING: false
COREPACK_ENABLE_AUTO_PIN: "0"
COREPACK_ENABLE_STRICT: "0"

jobs:
set-node-versions:
Expand Down Expand Up @@ -46,8 +47,6 @@ jobs:
with:
fetch-depth: 0

- uses: nrwl/nx-set-shas@v4

- name: Install node v${{ matrix.node }} and dependencies
uses: ./.github/actions/install-node-and-dependencies
with:
Expand All @@ -65,23 +64,15 @@ jobs:
- name: Install pnpm v8
run: corepack install -g pnpm@8
shell: bash
env:
COREPACK_ENABLE_AUTO_PIN: "0"

- name: Print installed pnpm version
run: pnpm --version
- name: Print installed node, npm, yarn and pnpm versions
run: |
node --version
npm --version
yarn --version
pnpm --version
shell: bash

- name: Run parallel distributed builds and tests on each node version
uses: jameshenry/parallel-bash-commands@v1
with:
cmd1: npx nx run-many -t build --parallel=3
cmd2: npx nx run-many -t test --parallel=3 --ci --maxWorkers=2
cmd3: npx nx run integration:integration --ci --maxWorkers=2

# e2e tests for everything except the primary task runner
- run: PUBLISHED_VERSION=999.9.9-e2e.0 npx nx run-many --t e2e --parallel=1

- name: Configure git metadata
run: |
git config --global user.email test@example.com
Expand Down Expand Up @@ -116,6 +107,16 @@ jobs:
git config tag.gpgsign true
git config --global user.signingkey $GPG_KEY_ID
- name: Run parallel distributed builds and tests on each node version
uses: jameshenry/parallel-bash-commands@v1
with:
cmd1: npx nx run-many -t build --parallel=3
cmd2: npx nx run-many -t test --parallel=3 --ci --maxWorkers=2
cmd3: npx nx run integration:integration --ci --maxWorkers=2

# e2e tests for everything except the primary task runner
- run: PUBLISHED_VERSION=999.9.9-e2e.0 npx nx run-many --t e2e --parallel=1

- name: Run e2e tests for task-runner
run: |
# We do not want the automatic Github Actions grouping to be applied to the e2e tests, or the snapshots won't match local
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ website/build
website/.docusaurus
website/.cache-loader

.nx/cache
.nx/cache
.nx/workspace-data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@

dist
tmp
/.nx/cache
/.nx/cache
/.nx/workspace-data
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.1.5](https://github.com/lerna/lerna/compare/v8.1.4...v8.1.5) (2024-06-24)

### Bug Fixes

- update npm utility dependencies and related packages ([#4033](https://github.com/lerna/lerna/issues/4033)) ([bd1c2d8](https://github.com/lerna/lerna/commit/bd1c2d8a267af47b409e2933fde2186dd73f4772))

## [8.1.4](https://github.com/lerna/lerna/compare/v8.1.3...v8.1.4) (2024-06-09)

### Bug Fixes

- specify 'dependencies: true' when prepping task runner options ([#4017](https://github.com/lerna/lerna/issues/4017)) ([244462d](https://github.com/lerna/lerna/commit/244462d59008f627ca7836c490a97951a9e5dd26))

## [8.1.3](https://github.com/lerna/lerna/compare/v8.1.2...v8.1.3) (2024-05-13)

### Bug Fixes
Expand Down
Loading

0 comments on commit 1b0992d

Please sign in to comment.