Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate nx to latest v20, bump typescript-eslint to v7 #7511

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
9 changes: 7 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@
"no-prototype-builtins": "off",
"@typescript-eslint/no-inferrable-types": "warn",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-empty-interface": "off"
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
# Prevent GitHub from canceling all in-progress jobs when a matrix job fails
fail-fast: false
matrix:
node: ['18', '20']

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ integration/import/**/rx.json
integration/import/**/operators.json


.nx/cache
.nx/cache
.nx/workspace-data
9 changes: 2 additions & 7 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"affected": {
"defaultBase": "master"
},
"defaultBase": "master",
"nxCloudAccessToken": "OWE4MTMzMTEtNDZlZi00MWMwLWJkYmEtN2EwYTQ1ZWNjMzRkfHJlYWQ=",
"targetDefaults": {
"build": {
Expand Down Expand Up @@ -50,10 +48,7 @@
"projectChangelogs": true
},
"version": {
"generatorOptions": {
"currentVersionResolver": "git-tag",
"specifierSource": "conventional-commits"
}
"conventionalCommits": true
}
}
}
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
"release": "node scripts/release.js"
},
"devDependencies": {
"@nx/eslint-plugin": "17.3.2",
"@nx/js": "17.3.2",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@nx/eslint-plugin": "20.0.6",
"@nx/js": "20.0.6",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"cz-conventional-changelog": "1.2.0",
"eslint": "^8.56.0",
"husky": "^4.2.5",
"lint-staged": "^10.2.11",
"nx": "17.3.2",
"nx": "20.0.6",
"ts-node": "^10.9.2",
"tshy": "^1.11.0",
"typescript": "~5.3.3",
Expand All @@ -57,4 +57,3 @@
"*.{js,css,md}": "prettier --write"
}
}

4 changes: 3 additions & 1 deletion packages/rxjs/spec/support/.mocharc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module.exports = {
require: ['ts-node/register', 'spec/helpers/setup.ts'],
reporter: 'dot',
reporter: 'spec',
'full-trace': true,
'stack-trace-limit': 25,
extensions: ['ts', 'js'],
timeout: 5000,
recursive: true,
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check

const { prerelease, valid } = require('semver');
const { releasePublish } = require('nx/src/command-line/release');
const { releasePublish } = require('nx/release');

/**
* Maps git branch names to npm dist tags. If master is an alpha/beta release,
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check

const { execSync } = require('node:child_process');
const { releaseChangelog, releaseVersion } = require('nx/src/command-line/release');
const { releaseChangelog, releaseVersion } = require('nx/release');
// There are multiple copies of outdated yargs in the workspace, access a known modern one
const yargs = require('nx/node_modules/yargs');

Expand Down
Loading
Loading