Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: update to latest nx and lerna#7019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
JamesHenry merged 4 commits intomainfromnx-latest
May 31, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions.github/renovate.json5
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,10 +12,15 @@
'ts-node',
// the nx packages get updated using the nx migrate CLI
'@nrwl/cli',
'@nx/cli',
'@nrwl/devkit',
'@nx/devkit',
'@nrwl/jest',
'@nx/jest',
'@nrwl/nx-cloud',
'nx-cloud',
'@nrwl/tao',
'@nx/tao',
// TODO - once we bump pass the major, we can remove these. Currently renovate is creating broken, immortal PRs
'@rollup/plugin-babel',
'@rollup/plugin-commonjs',
Expand Down
16 changes: 8 additions & 8 deletions.github/workflows/nx-migrate.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
# This workflow is used to augment the capabilities of the renovate GitHub app by running a full
# `nx migrate` when renovate opens a PR to change the version of @nrwl/workspace.
# `nx migrate` when renovate opens a PR to change the version of @nx/workspace.
#
# You will therefore also notice that in the renovate configuration, we ignore any packages which
# Nx will manage for us as part of `nx migrate` such as the remaining @nrwl/* packages and jest.
# Nx will manage for us as part of `nx migrate` such as the remaining @nx/* packages and jest.

name:Nx Migrate

Expand DownExpand Up@@ -33,12 +33,12 @@ jobs:
-name:Derive appropriate SHAs for base and head for `nx affected` commands
uses:nrwl/nx-set-shas@v3

-name:Check if @nrwl/workspace was changed as part of the latest commit on the PR
-name:Check if @nx/workspace was changed as part of the latest commit on the PR
id:nrwl-workspace-package-check
run:|
git diff HEAD~1 -G"@nrwl/workspace" --exit-code package.json && echo "@nrwl/workspace unchanged" || echo "::set-output name=was-changed::true"
git diff HEAD~1 -G"@nx/workspace" --exit-code package.json && echo "@nx/workspace unchanged" || echo "::set-output name=was-changed::true"
-name:Run nx migrate if @nrwl/workspace changed and commit the results
-name:Run nx migrate if @nx/workspace changed and commit the results
if:${{ steps.nrwl-workspace-package-check.outputs.was-changed == 'true' }}
env:
# We cannot use secrets.GITHUB_TOKEN for this because it is not permitted to kick off subsequent actions worfklow runs, so we use a PAT instead
Expand All@@ -50,14 +50,14 @@ jobs:
gh pr checkout ${{ github.event.pull_request.number }}
# Get the version of Nx we are migrating to
NX_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@nrwl/workspace'])")
NX_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@nx/workspace'])")
# Revert renovate's changes to package.json and yarn.lock so that it is a clean migrate from the status quo
git checkout HEAD~1 -- package.json yarn.lock
yarn --ignore-scripts
npx nx migrate @nrwl/workspace@$NX_VERSION
npx nx migrate @nx/workspace@$NX_VERSION
# Sometimes Nx can require config formatting changes after a migrate command
yarn --ignore-scripts
Expand All@@ -81,5 +81,5 @@ jobs:
git remote set-url origin https://x-access-token:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git
git add --all
git commit -m "chore: run nx migrate for @nrwl/workspace v$NX_VERSION"
git commit -m "chore: run nx migrate for @nx/workspace v$NX_VERSION"
git push
2 changes: 1 addition & 1 deletionjest.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
const{ getJestProjects}=require('@nrwl/jest');
const{ getJestProjects}=require('@nx/jest');

module.exports={
projects:getJestProjects(),
Expand Down
1 change: 0 additions & 1 deletionlerna.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
{
"version": "5.59.5",
"npmClient": "yarn",
"useWorkspaces": true,
"stream": true
}
2 changes: 1 addition & 1 deletionnx.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
"npmScope":"typescript-eslint",
"tasksRunnerOptions": {
"default": {
"runner":"@nrwl/nx-cloud",
"runner":"nx-cloud",
"options": {
"cacheableOperations": ["build","lint","package","prebuild","test"],
"accessToken":"YjIzMmMxMWItMjhiMS00NWY2LTk1NWYtYWU3YWQ0YjE4YjBlfHJlYWQ="
Expand Down
15 changes: 8 additions & 7 deletionspackage.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,17 +54,17 @@
"@babel/eslint-parser":"^7.19.1",
"@babel/parser":"^7.21.2",
"@babel/types":"^7.20.2",
"@nrwl/jest":"15.7.2",
"@nrwl/nx-cloud":"15.0.3",
"@nrwl/workspace":"15.7.2",
"@nx/jest":"16.2.2",
"@nx/linter":"16.2.2",
"@nx/workspace":"16.2.2",
"@swc/core":"^1.3.1",
"@swc/jest":"^0.2.21",
"@types/babel__code-frame":"^7.0.3",
"@types/debug":"^4.1.7",
"@types/eslint-visitor-keys":"^1.0.0",
"@types/glob":"^8.0.0",
"@types/is-glob":"^4.0.2",
"@types/jest":"^29.0.2",
"@types/jest":"29.4.4",
"@types/jest-specific-snapshot":"^0.5.5",
"@types/lodash":"^4.14.182",
"@types/marked":"^4.0.3",
Expand All@@ -90,16 +90,17 @@
"execa":"5.1.1",
"glob":"^8.0.1",
"husky":"^8.0.1",
"jest":"^29.0.3",
"jest":"29.4.3",
"jest-diff":"^29.0.3",
"jest-snapshot":"^29.0.3",
"jest-specific-snapshot":"^8.0.0",
"lerna":"6.6.2",
"lerna":"7.0.0-alpha.3",
"lint-staged":"^13.0.0",
"make-dir":"^3.1.0",
"markdownlint-cli":"^0.33.0",
"ncp":"^2.0.0",
"nx":"15.7.2",
"nx":"16.2.2",
"nx-cloud":"16.0.5",
"patch-package":"^6.4.7",
"prettier":"2.8.1",
"pretty-format":"^29.0.3",
Expand Down
2 changes: 1 addition & 1 deletionpackages/ast-spec/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
"outputs": ["{projectRoot}/dist/**/*.ts"]
},
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/ast-spec/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/eslint-plugin-internal/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/eslint-plugin-internal/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/eslint-plugin-tslint/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/eslint-plugin-tslint/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/eslint-plugin/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/eslint-plugin/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/experimental-utils/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/experimental-utils/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/parser/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/parser/**/*.ts"]
Expand Down
4 changes: 2 additions & 2 deletionspackages/scope-manager/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,14 +50,14 @@
}
},
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/scope-manager/**/*.ts"]
}
},
"test": {
"executor":"@nrwl/jest:jest",
"executor":"@nx/jest:jest",
"outputs": ["{projectRoot}/coverage"],
"options": {
"jestConfig":"packages/scope-manager/jest.config.js",
Expand Down
2 changes: 1 addition & 1 deletionpackages/type-utils/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/type-utils/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/types/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": ["ast-spec"],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/types/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/typescript-estree/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": ["types"],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/typescript-estree/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/utils/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/utils/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/visitor-keys/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/visitor-keys/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletionpackages/website/project.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
"implicitDependencies": [],
"targets": {
"lint": {
"executor":"@nrwl/linter:eslint",
"executor":"@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/website/**/*.ts"]
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp