@nx/plugin 16.3.0-beta.7 → 16.3.0-beta.8
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/plugin",
|
|
3
|
-
"version": "16.3.0-beta.
|
|
3
|
+
"version": "16.3.0-beta.8",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"migrations": "./migrations.json"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/nx-plugin": "16.3.0-beta.
|
|
32
|
-
"@nx/devkit": "16.3.0-beta.
|
|
33
|
-
"@nx/jest": "16.3.0-beta.
|
|
34
|
-
"@nx/js": "16.3.0-beta.
|
|
35
|
-
"@nx/linter": "16.3.0-beta.
|
|
31
|
+
"@nrwl/nx-plugin": "16.3.0-beta.8",
|
|
32
|
+
"@nx/devkit": "16.3.0-beta.8",
|
|
33
|
+
"@nx/jest": "16.3.0-beta.8",
|
|
34
|
+
"@nx/js": "16.3.0-beta.8",
|
|
35
|
+
"@nx/linter": "16.3.0-beta.8",
|
|
36
36
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
37
37
|
"dotenv": "~10.0.0",
|
|
38
38
|
"fs-extra": "^11.1.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "1b21c824ec666988e43c996307f381fbf53e9154"
|
|
45
45
|
}
|
|
@@ -107,50 +107,64 @@ function updateProjectEslintConfig(host, options, packageJson) {
|
|
|
107
107
|
// Update the project level lint configuration to specify
|
|
108
108
|
// the plugin schema rule for generated files
|
|
109
109
|
const eslintPath = `${options.root}/.eslintrc.json`;
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
Object.keys((
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
...(
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
110
|
+
if (host.exists(eslintPath)) {
|
|
111
|
+
const eslintConfig = (0, devkit_1.readJson)(host, eslintPath);
|
|
112
|
+
(_a = eslintConfig.overrides) !== null && _a !== void 0 ? _a : (eslintConfig.overrides = []);
|
|
113
|
+
let entry = eslintConfig.overrides.find((x) => {
|
|
114
|
+
var _a, _b;
|
|
115
|
+
return Object.keys((_a = x.rules) !== null && _a !== void 0 ? _a : {}).includes('@nx/nx-plugin-checks') ||
|
|
116
|
+
Object.keys((_b = x.rules) !== null && _b !== void 0 ? _b : {}).includes('@nrwl/nx/nx-plugin-checks');
|
|
117
|
+
});
|
|
118
|
+
const newentry = !entry;
|
|
119
|
+
entry !== null && entry !== void 0 ? entry : (entry = { files: [] });
|
|
120
|
+
entry.files = [
|
|
121
|
+
...new Set([
|
|
122
|
+
...((_b = entry.files) !== null && _b !== void 0 ? _b : []),
|
|
123
|
+
...[
|
|
124
|
+
'./package.json',
|
|
125
|
+
packageJson.generators,
|
|
126
|
+
packageJson.executors,
|
|
127
|
+
packageJson.schematics,
|
|
128
|
+
packageJson.builders,
|
|
129
|
+
].filter((f) => !!f),
|
|
130
|
+
]),
|
|
131
|
+
];
|
|
132
|
+
entry.parser = 'jsonc-eslint-parser';
|
|
133
|
+
(_c = entry.rules) !== null && _c !== void 0 ? _c : (entry.rules = {
|
|
134
|
+
'@nx/nx-plugin-checks': 'error',
|
|
135
|
+
});
|
|
136
|
+
if (newentry) {
|
|
137
|
+
eslintConfig.overrides.push(entry);
|
|
138
|
+
}
|
|
139
|
+
(0, devkit_1.writeJson)(host, eslintPath, eslintConfig);
|
|
137
140
|
}
|
|
138
|
-
(0, devkit_1.writeJson)(host, eslintPath, eslintConfig);
|
|
139
141
|
}
|
|
140
142
|
// Update the root eslint to specify a parser for json files
|
|
141
143
|
// This is required, otherwise every json file that is not overriden
|
|
142
144
|
// will display false errors in the IDE
|
|
143
145
|
function updateRootEslintConfig(host) {
|
|
144
146
|
var _a;
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
rootESLint
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
147
|
+
if (host.exists('.eslintrc.json')) {
|
|
148
|
+
const rootESLint = (0, devkit_1.readJson)(host, '.eslintrc.json');
|
|
149
|
+
(_a = rootESLint.overrides) !== null && _a !== void 0 ? _a : (rootESLint.overrides = []);
|
|
150
|
+
if (!eslintConfigContainsJsonOverride(rootESLint)) {
|
|
151
|
+
rootESLint.overrides.push({
|
|
152
|
+
files: '*.json',
|
|
153
|
+
parser: 'jsonc-eslint-parser',
|
|
154
|
+
rules: {},
|
|
155
|
+
});
|
|
156
|
+
(0, devkit_1.writeJson)(host, '.eslintrc.json', rootESLint);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
devkit_1.output.note({
|
|
161
|
+
title: 'Unable to update root eslint config.',
|
|
162
|
+
bodyLines: [
|
|
163
|
+
'We only automatically update the root eslint config if it is json.',
|
|
164
|
+
'If you are using a different format, you will need to update it manually.',
|
|
165
|
+
'You need to set the parser to jsonc-eslint-parser for json files.',
|
|
166
|
+
],
|
|
152
167
|
});
|
|
153
|
-
(0, devkit_1.writeJson)(host, '.eslintrc.json', rootESLint);
|
|
154
168
|
}
|
|
155
169
|
}
|
|
156
170
|
function setupVsCodeLintingForJsonFiles(host) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"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"}
|