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: update repo to nx 19 #9270

Merged
merged 3 commits into from
Jun 11, 2024
Merged
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,4 @@ packages/**/.yarn
!.yarn/versions

.nx/cache
.nx/workspace-data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ packages/website/build
# see the file header in eslint-base.test.js for more info
packages/rule-tester/tests/eslint-base

/.nx/cache
/.nx/cache
/.nx/workspace-data
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/src/utils/config-file.js b/src/utils/config-file.js
index 8c8061bc2649aca55de16abbbdae0e9fcc11e202..cdafd9e9809bf569acf97745c6701291e14860ec 100644
--- a/src/utils/config-file.js
+++ b/src/utils/config-file.js
@@ -30,11 +30,14 @@ function findFlatConfigFile(directory, workspaceRoot) {
if (currentDir === workspaceRoot) {
return getConfigFileInDirectory(currentDir, exports.ESLINT_FLAT_CONFIG_FILENAMES);
}
- while (currentDir !== workspaceRoot) {
+ while (true) {
const configFilePath = getConfigFileInDirectory(currentDir, exports.ESLINT_FLAT_CONFIG_FILENAMES);
if (configFilePath) {
return configFilePath;
}
+ if (currentDir === workspaceRoot) {
+ break;
+ }
currentDir = (0, path_1.dirname)(currentDir);
}
return null;
@@ -47,11 +50,14 @@ function findOldConfigFile(filePathOrDirectory, workspaceRoot) {
if (currentDir === workspaceRoot) {
return getConfigFileInDirectory(currentDir, exports.ESLINT_OLD_CONFIG_FILENAMES);
}
- while (currentDir !== workspaceRoot) {
+ while (true) {
const configFilePath = getConfigFileInDirectory(currentDir, exports.ESLINT_OLD_CONFIG_FILENAMES);
if (configFilePath) {
return configFilePath;
}
+ if (currentDir === workspaceRoot) {
+ break;
+ }
currentDir = (0, path_1.dirname)(currentDir);
}
return null;
30 changes: 0 additions & 30 deletions .yarn/patches/nx-npm-18.3.5-58c0bedf91.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/src/command-line/release/utils/resolve-changelog-renderer.js b/src/command-line/release/utils/resolve-changelog-renderer.js
index 8c6fa468633703fcdbe491c08e509d10574cd75d..b1a669d22097dde0c88c7c8d5a956159b246b33c 100644
--- a/src/command-line/release/utils/resolve-changelog-renderer.js
+++ b/src/command-line/release/utils/resolve-changelog-renderer.js
@@ -13,10 +13,10 @@ function resolveChangelogRenderer(changelogRendererPath) {
let changelogRenderer;
let cleanupTranspiler = () => { };
try {
- const rootTsconfigPath = (0, typescript_1.getRootTsConfigPath)();
- if (rootTsconfigPath) {
- cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
- }
+ // const rootTsconfigPath = (0, typescript_1.getRootTsConfigPath)();
+ // if (rootTsconfigPath) {
+ // cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
+ // }
const r = require(interpolatedChangelogRendererPath);
changelogRenderer = r.default || r;
}
6 changes: 5 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@
}
},
"lint": {
"dependsOn": ["eslint-plugin:build"],
"dependsOn": [
"eslint-plugin:build",
"eslint-plugin-internal:build",
"typescript-eslint:build"
],
"inputs": [
"default",
"{workspaceRoot}/eslint.config.js",
Expand Down
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@eslint/eslintrc": "^2.1.4",
"@eslint/js": "^8.57.0",
"@jest/types": "29.6.3",
"@nx/eslint": "18.3.5",
"@nx/jest": "18.3.5",
"@nx/workspace": "18.3.5",
"@nx/eslint": "19.3.0-canary.20240611-1600875",
"@nx/jest": "19.3.0-canary.20240611-1600875",
"@nx/workspace": "19.3.0-canary.20240611-1600875",
"@swc/core": "^1.4.12",
"@swc/jest": "^0.2.36",
"@types/babel__code-frame": "^7.0.6",
Expand Down Expand Up @@ -109,7 +109,7 @@
"markdownlint-cli": "^0.41.0",
"ncp": "^2.0.0",
"netlify": "^13.1.14",
"nx": "18.3.5",
"nx": "19.3.0-canary.20240611-1600875",
"prettier": "3.3.1",
"pretty-format": "^29.7.0",
"rimraf": "^5.0.5",
Expand Down Expand Up @@ -140,7 +140,9 @@
"tsx": "^4.7.2",
"typescript": "5.4.5",
"nx@18.3.5": "patch:nx@npm%3A18.3.5#./.yarn/patches/nx-npm-18.3.5-58c0bedf91.patch",
"eslint-plugin-eslint-plugin@^5.5.0": "patch:eslint-plugin-eslint-plugin@npm%3A5.5.1#./.yarn/patches/eslint-plugin-eslint-plugin-npm-5.5.1-4206c2506d.patch"
"eslint-plugin-eslint-plugin@^5.5.0": "patch:eslint-plugin-eslint-plugin@npm%3A5.5.1#./.yarn/patches/eslint-plugin-eslint-plugin-npm-5.5.1-4206c2506d.patch",
"@nx/eslint@19.3.0-canary.20240611-1600875": "patch:@nx/eslint@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/@nx-eslint-npm-19.3.0-canary.20240611-1600875-f5cb695794.patch",
"nx@19.3.0-canary.20240611-1600875": "patch:nx@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/nx-npm-19.3.0-canary.20240611-1600875-bd96520563.patch"
},
"packageManager": "yarn@3.8.2"
}
6 changes: 3 additions & 3 deletions packages/eslint-plugin-internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"main": "dist/index.js",
"types": "index.d.ts",
"scripts": {
"build": "tsc -b tsconfig.build.json",
"clean": "tsc -b tsconfig.build.json --clean",
"build": "npx tsc -b tsconfig.build.json",
"clean": "npx tsc -b tsconfig.build.json --clean",
"postclean": "rimraf dist && rimraf coverage",
"format": "prettier --write \"./**/*.{ts,mts,cts,tsx,js,mjs,cjs,jsx,json,md,css}\" --ignore-path ../../.prettierignore",
"lint": "npx nx lint",
"test": "jest --coverage",
"typecheck": "tsc --noEmit"
"typecheck": "npx tsc --noEmit"
},
"dependencies": {
"@prettier/sync": "^0.5.1",
Expand Down
8 changes: 8 additions & 0 deletions packages/repo-tools/src/postinstall.mts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ const $ = $_config({
stdout: 'inherit',
stderr: 'inherit',
verbose: true,
env: {
/**
* Do not apply the special GitHub Actions group markers within the
* postinstall logging, it cannot work correctly when nested within
* yarn's output and therefore just adds visual noise.
*/
NX_SKIP_LOG_GROUPING: 'true',
},
});

/**
Expand Down
Loading
Loading