@nx/eslint-plugin 23.0.0-beta.5 → 23.0.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/eslint-plugin",
|
|
3
|
-
"version": "23.0.0-beta.
|
|
3
|
+
"version": "23.0.0-beta.6",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
|
|
6
6
|
"repository": {
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
}
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@nx/devkit": "23.0.0-beta.
|
|
39
|
-
"@nx/js": "23.0.0-beta.
|
|
38
|
+
"@nx/devkit": "23.0.0-beta.6",
|
|
39
|
+
"@nx/js": "23.0.0-beta.6",
|
|
40
40
|
"@phenomnomnominal/tsquery": "~6.1.4",
|
|
41
41
|
"@typescript-eslint/type-utils": "^8.0.0",
|
|
42
42
|
"@typescript-eslint/utils": "^8.0.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"tslib": "^2.3.0"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"nx": "23.0.0-beta.
|
|
51
|
+
"nx": "23.0.0-beta.6"
|
|
52
52
|
},
|
|
53
53
|
"publishConfig": {
|
|
54
54
|
"access": "public"
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.workspaceRules = void 0;
|
|
4
4
|
exports.loadWorkspaceRules = loadWorkspaceRules;
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
7
|
+
const internal_2 = require("@nx/js/src/internal");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const constants_1 = require("./constants");
|
|
@@ -113,11 +113,11 @@ async function loadWorkspaceRules(directory, tsConfigPath) {
|
|
|
113
113
|
try {
|
|
114
114
|
const effectiveTsConfigPath = findTsConfig(resolvedDirectory, tsConfigPath);
|
|
115
115
|
if (effectiveTsConfigPath) {
|
|
116
|
-
registrationCleanup = (0,
|
|
116
|
+
registrationCleanup = (0, internal_2.registerTsProject)(effectiveTsConfigPath);
|
|
117
117
|
}
|
|
118
118
|
const entryFile = resolveDirectoryEntryFile(resolvedDirectory);
|
|
119
119
|
// Only rules are supported (not configs, processors, etc.)
|
|
120
|
-
const module = await (0,
|
|
120
|
+
const module = await (0, internal_1.loadConfigFile)(entryFile);
|
|
121
121
|
const rules = module.rules || module;
|
|
122
122
|
return rules;
|
|
123
123
|
}
|
|
@@ -137,7 +137,7 @@ exports.workspaceRules = (() => {
|
|
|
137
137
|
return {};
|
|
138
138
|
}
|
|
139
139
|
// Register `tools/eslint-rules` for TS transpilation
|
|
140
|
-
const registrationCleanup = (0,
|
|
140
|
+
const registrationCleanup = (0, internal_2.registerTsProject)((0, path_1.join)(constants_1.WORKSPACE_PLUGIN_DIR, 'tsconfig.json'));
|
|
141
141
|
try {
|
|
142
142
|
/**
|
|
143
143
|
* Currently we only support applying the rules from the user's workspace plugin object
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RULE_NAME = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const internal_1 = require("@nx/devkit/internal");
|
|
6
6
|
const find_npm_dependencies_1 = require("@nx/js/src/utils/find-npm-dependencies");
|
|
7
7
|
const utils_1 = require("@typescript-eslint/utils");
|
|
8
8
|
const path_1 = require("path");
|
|
@@ -100,7 +100,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
|
|
|
100
100
|
const packageJson = JSON.parse(context.sourceCode.getText());
|
|
101
101
|
const projPackageJsonDeps = (0, package_json_utils_1.getProductionDependencies)(packageJson);
|
|
102
102
|
const rootPackageJsonDeps = (0, package_json_utils_1.getAllDependencies)(rootPackageJson);
|
|
103
|
-
const catalogManager = (0,
|
|
103
|
+
const catalogManager = (0, internal_1.getCatalogManager)(devkit_1.workspaceRoot);
|
|
104
104
|
const catalogDefs = catalogManager?.getCatalogDefinitions(devkit_1.workspaceRoot);
|
|
105
105
|
function catalogEntryMatchesInstalled(catalogVersionSpec, installedVersion) {
|
|
106
106
|
if (installedVersion === '*') {
|