@nrwl/linter 13.1.3 → 13.2.0-beta.1
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/index.js +1 -1
- package/index.js.map +1 -1
- package/package.json +4 -4
- package/src/executors/eslint/compat.js +1 -1
- package/src/executors/eslint/compat.js.map +1 -1
- package/src/executors/eslint/hasher.js +1 -1
- package/src/executors/eslint/lint.impl.js +8 -8
- package/src/executors/eslint/lint.impl.js.map +1 -1
- package/src/executors/eslint/utility/create-directory.js +3 -3
- package/src/executors/eslint/utility/create-directory.js.map +1 -1
- package/src/executors/eslint/utility/eslint-utils.js +2 -2
- package/src/executors/lint/lint.impl.js +7 -7
- package/src/executors/lint/lint.impl.js.map +1 -1
- package/src/executors/lint/utility/eslint-utils.js +3 -3
- package/src/executors/lint/utility/eslint-utils.js.map +1 -1
- package/src/executors/lint/utility/ts-utils.js +1 -1
- package/src/executors/lint/utility/ts-utils.js.map +1 -1
- package/src/generators/init/init.js +6 -6
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/lint-project/lint-project.js +9 -9
- package/src/generators/lint-project/lint-project.js.map +1 -1
- package/src/generators/workspace-rule/workspace-rule.js +9 -9
- package/src/generators/workspace-rule/workspace-rule.js.map +1 -1
- package/src/generators/workspace-rules-project/workspace-rules-project.js +9 -9
- package/src/generators/workspace-rules-project/workspace-rules-project.js.map +1 -1
- package/src/migrations/update-10-3-0/add-json-ext-to-eslintrc.js +5 -5
- package/src/migrations/update-10-3-0/add-json-ext-to-eslintrc.js.map +1 -1
- package/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.js +3 -3
- package/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.js.map +1 -1
- package/src/migrations/update-10-3-0/update-10-3-0.js +4 -4
- package/src/migrations/update-10-3-0/update-10-3-0.js.map +1 -1
- package/src/migrations/update-10-3-0/update-eslint-builder-and-config.js +10 -10
- package/src/migrations/update-10-3-0/update-eslint-builder-and-config.js.map +1 -1
- package/src/migrations/update-10-3-1/revert-node-modules-files-in-eslint-builder-options.js +2 -2
- package/src/migrations/update-10-3-1/revert-node-modules-files-in-eslint-builder-options.js.map +1 -1
- package/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.js +9 -9
- package/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.js.map +1 -1
- package/src/migrations/update-10-4-0/update-root-eslint-config-to-use-overrides.js +3 -3
- package/src/migrations/update-10-4-0/update-root-eslint-config-to-use-overrides.js.map +1 -1
- package/src/migrations/update-11-5-0/always-use-project-level-tsconfigs-with-eslint.js +6 -6
- package/src/migrations/update-11-5-0/always-use-project-level-tsconfigs-with-eslint.js.map +1 -1
- package/src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules.js +7 -7
- package/src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules.js.map +1 -1
- package/src/migrations/update-12-9-0/add-outputs.js +4 -4
- package/src/migrations/update-12-9-0/add-outputs.js.map +1 -1
- package/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.js +6 -6
- package/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.js.map +1 -1
- package/src/utils/convert-tslint-to-eslint/project-converter.js +32 -32
- package/src/utils/convert-tslint-to-eslint/project-converter.js.map +1 -1
- package/src/utils/convert-tslint-to-eslint/utils.js +4 -4
- package/src/utils/convert-tslint-to-eslint/utils.js.map +1 -1
- package/src/utils/testing.js +1 -1
- package/src/utils/testing.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/utils/workspace-lint-rules.js +1 -1
- package/src/utils/workspace-lint-rules.js.map +1 -1
|
@@ -35,8 +35,8 @@ class ProjectConverter {
|
|
|
35
35
|
this.projectName = projectName;
|
|
36
36
|
this.ignoreExistingTslintConfig = ignoreExistingTslintConfig;
|
|
37
37
|
this.eslintInitializer = eslintInitializer;
|
|
38
|
-
this.projectConfig = devkit_1.readProjectConfiguration(this.host, this.projectName);
|
|
39
|
-
this.projectTSLintJsonPath = devkit_1.joinPathFragments(this.projectConfig.root, 'tslint.json');
|
|
38
|
+
this.projectConfig = (0, devkit_1.readProjectConfiguration)(this.host, this.projectName);
|
|
39
|
+
this.projectTSLintJsonPath = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tslint.json');
|
|
40
40
|
/**
|
|
41
41
|
* Given the user is converting a project from TSLint to ESLint, we expect them
|
|
42
42
|
* to have both a root and a project-specific tslint.json
|
|
@@ -47,8 +47,8 @@ class ProjectConverter {
|
|
|
47
47
|
if (!host.exists(this.projectTSLintJsonPath)) {
|
|
48
48
|
throw new Error(`We could not find a tslint.json for the selected project "${this.projectTSLintJsonPath}", maybe you have already migrated to ESLint?`);
|
|
49
49
|
}
|
|
50
|
-
this.rootTSLintJson = devkit_1.readJson(host, this.rootTSLintJsonPath);
|
|
51
|
-
this.projectTSLintJson = devkit_1.readJson(host, this.projectTSLintJsonPath);
|
|
50
|
+
this.rootTSLintJson = (0, devkit_1.readJson)(host, this.rootTSLintJsonPath);
|
|
51
|
+
this.projectTSLintJson = (0, devkit_1.readJson)(host, this.projectTSLintJsonPath);
|
|
52
52
|
/**
|
|
53
53
|
* We are not able to support --dry-run in this generator, because we need to dynamically install
|
|
54
54
|
* and use the tslint-to-eslint-config package within the same execution.
|
|
@@ -62,14 +62,14 @@ class ProjectConverter {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
initESLint() {
|
|
65
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
66
66
|
yield this.eslintInitializer({
|
|
67
67
|
projectName: this.projectName,
|
|
68
68
|
projectConfig: this.projectConfig,
|
|
69
69
|
});
|
|
70
70
|
// Ensure that all the dependencies added as part ESLint initialization are installed
|
|
71
71
|
return () => {
|
|
72
|
-
devkit_1.installPackagesTask(this.host);
|
|
72
|
+
(0, devkit_1.installPackagesTask)(this.host);
|
|
73
73
|
};
|
|
74
74
|
});
|
|
75
75
|
}
|
|
@@ -80,7 +80,7 @@ class ProjectConverter {
|
|
|
80
80
|
* focus on the project-level config conversion.
|
|
81
81
|
*/
|
|
82
82
|
convertRootTSLintConfig(applyPackageSpecificModifications, rootEslintConfigExists) {
|
|
83
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
83
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
84
84
|
if (this.ignoreExistingTslintConfig) {
|
|
85
85
|
return Promise.resolve(() => { });
|
|
86
86
|
}
|
|
@@ -96,7 +96,7 @@ class ProjectConverter {
|
|
|
96
96
|
devkit_1.logger.warn(`Root '.eslintrc.json' found. Assuming conversion was already run for other projects.`);
|
|
97
97
|
return Promise.resolve(() => { });
|
|
98
98
|
}
|
|
99
|
-
const convertedRoot = yield utils_1.convertTSLintConfig(this.rootTSLintJson, this.rootTSLintJsonPath, []);
|
|
99
|
+
const convertedRoot = yield (0, utils_1.convertTSLintConfig)(this.rootTSLintJson, this.rootTSLintJsonPath, []);
|
|
100
100
|
const convertedRootESLintConfig = convertedRoot.convertedESLintConfig;
|
|
101
101
|
/**
|
|
102
102
|
* Already set by Nx's shareable configs
|
|
@@ -116,7 +116,7 @@ class ProjectConverter {
|
|
|
116
116
|
const nxRuleName = '@nrwl/nx/enforce-module-boundaries';
|
|
117
117
|
const nxEnforceModuleBoundariesRule = convertedRootESLintConfig.rules[nxRuleName];
|
|
118
118
|
if (nxEnforceModuleBoundariesRule) {
|
|
119
|
-
devkit_1.updateJson(this.host, '.eslintrc.json', (json) => {
|
|
119
|
+
(0, devkit_1.updateJson)(this.host, '.eslintrc.json', (json) => {
|
|
120
120
|
if (!json.overrides) {
|
|
121
121
|
return json;
|
|
122
122
|
}
|
|
@@ -141,7 +141,7 @@ class ProjectConverter {
|
|
|
141
141
|
* Update the root workspace .eslintrc.json with additional overrides
|
|
142
142
|
*/
|
|
143
143
|
const finalConvertedRootESLintConfig = applyPackageSpecificModifications(convertedRootESLintConfig);
|
|
144
|
-
devkit_1.updateJson(this.host, '.eslintrc.json', (json) => {
|
|
144
|
+
(0, devkit_1.updateJson)(this.host, '.eslintrc.json', (json) => {
|
|
145
145
|
json.overrides || (json.overrides = []);
|
|
146
146
|
if (finalConvertedRootESLintConfig.overrides &&
|
|
147
147
|
finalConvertedRootESLintConfig.overrides.length) {
|
|
@@ -153,12 +153,12 @@ class ProjectConverter {
|
|
|
153
153
|
else {
|
|
154
154
|
json.overrides.push(Object.assign({ files: ['*.ts'] }, finalConvertedRootESLintConfig));
|
|
155
155
|
}
|
|
156
|
-
json.overrides = utils_1.deduplicateOverrides(json.overrides);
|
|
156
|
+
json.overrides = (0, utils_1.deduplicateOverrides)(json.overrides);
|
|
157
157
|
/**
|
|
158
158
|
* Remove the parserOptions.project config if it is not required for the final config,
|
|
159
159
|
* so that lint runs can be as fast and efficient as possible.
|
|
160
160
|
*/
|
|
161
|
-
return rules_requiring_type_checking_1.removeParserOptionsProjectIfNotRequired(json);
|
|
161
|
+
return (0, rules_requiring_type_checking_1.removeParserOptionsProjectIfNotRequired)(json);
|
|
162
162
|
});
|
|
163
163
|
/**
|
|
164
164
|
* Through converting the config we may encounter TSLint rules whose closest
|
|
@@ -167,17 +167,17 @@ class ProjectConverter {
|
|
|
167
167
|
* We therefore automatically install those extra packages for the user and
|
|
168
168
|
* explain that that's what we are doing.
|
|
169
169
|
*/
|
|
170
|
-
return utils_1.ensureESLintPluginsAreInstalled(this.host, convertedRoot.ensureESLintPlugins);
|
|
170
|
+
return (0, utils_1.ensureESLintPluginsAreInstalled)(this.host, convertedRoot.ensureESLintPlugins);
|
|
171
171
|
});
|
|
172
172
|
}
|
|
173
173
|
convertProjectConfig(applyPackageSpecificModifications) {
|
|
174
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
174
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
175
175
|
if (this.ignoreExistingTslintConfig) {
|
|
176
176
|
return Promise.resolve(() => { });
|
|
177
177
|
}
|
|
178
|
-
const convertedProjectConfig = yield utils_1.convertTSLintConfig(this.projectTSLintJson, this.projectTSLintJsonPath,
|
|
178
|
+
const convertedProjectConfig = yield (0, utils_1.convertTSLintConfig)(this.projectTSLintJson, this.projectTSLintJsonPath,
|
|
179
179
|
// Strip the extends on workspace tslint.json (see this util's docs for more info)
|
|
180
|
-
[`${devkit_1.offsetFromRoot(this.projectConfig.root)}tslint.json`]);
|
|
180
|
+
[`${(0, devkit_1.offsetFromRoot)(this.projectConfig.root)}tslint.json`]);
|
|
181
181
|
const convertedProjectESLintConfig = convertedProjectConfig.convertedESLintConfig;
|
|
182
182
|
/**
|
|
183
183
|
* Already set by Nx's shareable configs
|
|
@@ -189,11 +189,11 @@ class ProjectConverter {
|
|
|
189
189
|
convertedProjectESLintConfig.plugins =
|
|
190
190
|
convertedProjectESLintConfig.plugins.filter((p) => p !== '@typescript-eslint/tslint');
|
|
191
191
|
}
|
|
192
|
-
const projectESLintConfigPath = devkit_1.joinPathFragments(this.projectConfig.root, '.eslintrc.json');
|
|
192
|
+
const projectESLintConfigPath = (0, devkit_1.joinPathFragments)(this.projectConfig.root, '.eslintrc.json');
|
|
193
193
|
/**
|
|
194
194
|
* Apply updates to the new .eslintrc.json file for the project
|
|
195
195
|
*/
|
|
196
|
-
devkit_1.updateJson(this.host, projectESLintConfigPath, (json) => {
|
|
196
|
+
(0, devkit_1.updateJson)(this.host, projectESLintConfigPath, (json) => {
|
|
197
197
|
var _a;
|
|
198
198
|
if (typeof json.extends === 'string') {
|
|
199
199
|
json.extends = [json.extends];
|
|
@@ -241,13 +241,13 @@ class ProjectConverter {
|
|
|
241
241
|
* Remove the parserOptions.project config if it is not required for the final config,
|
|
242
242
|
* so that lint runs can be as fast and efficient as possible.
|
|
243
243
|
*/
|
|
244
|
-
return rules_requiring_type_checking_1.removeParserOptionsProjectIfNotRequired(finalJson);
|
|
244
|
+
return (0, rules_requiring_type_checking_1.removeParserOptionsProjectIfNotRequired)(finalJson);
|
|
245
245
|
});
|
|
246
246
|
/**
|
|
247
247
|
* Convert any instances of comment-based configuration in the source files
|
|
248
248
|
* of the project
|
|
249
249
|
*/
|
|
250
|
-
convert_to_eslint_config_1.convertTSLintDisableCommentsForProject(this.host, this.projectName);
|
|
250
|
+
(0, convert_to_eslint_config_1.convertTSLintDisableCommentsForProject)(this.host, this.projectName);
|
|
251
251
|
/**
|
|
252
252
|
* Through converting the config we may encounter TSLint rules whose closest
|
|
253
253
|
* equivalent in the ESLint ecosystem comes from a separate package/plugin.
|
|
@@ -255,14 +255,14 @@ class ProjectConverter {
|
|
|
255
255
|
* We therefore automatically install those extra packages for the user and
|
|
256
256
|
* explain that that's what we are doing.
|
|
257
257
|
*/
|
|
258
|
-
return utils_1.ensureESLintPluginsAreInstalled(this.host, convertedProjectConfig.ensureESLintPlugins);
|
|
258
|
+
return (0, utils_1.ensureESLintPluginsAreInstalled)(this.host, convertedProjectConfig.ensureESLintPlugins);
|
|
259
259
|
});
|
|
260
260
|
}
|
|
261
261
|
removeProjectTSLintFile() {
|
|
262
|
-
this.host.delete(devkit_1.joinPathFragments(this.projectConfig.root, 'tslint.json'));
|
|
262
|
+
this.host.delete((0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tslint.json'));
|
|
263
263
|
}
|
|
264
264
|
isTSLintUsedInWorkspace() {
|
|
265
|
-
const projects = devkit_1.getProjects(this.host);
|
|
265
|
+
const projects = (0, devkit_1.getProjects)(this.host);
|
|
266
266
|
for (const [, projectConfig] of projects.entries()) {
|
|
267
267
|
for (const [, targetConfig] of Object.entries(projectConfig.targets)) {
|
|
268
268
|
if (targetConfig.executor === '@angular-devkit/build-angular:tslint') {
|
|
@@ -283,24 +283,24 @@ class ProjectConverter {
|
|
|
283
283
|
/**
|
|
284
284
|
* Prepare the package.json and the uninstall task
|
|
285
285
|
*/
|
|
286
|
-
const uninstallTask = devkit_1.removeDependenciesFromPackageJson(this.host, [], ['tslint', 'codelyzer']);
|
|
286
|
+
const uninstallTask = (0, devkit_1.removeDependenciesFromPackageJson)(this.host, [], ['tslint', 'codelyzer']);
|
|
287
287
|
/**
|
|
288
288
|
* Update global linter configuration defaults in workspace.json
|
|
289
289
|
*/
|
|
290
|
-
const workspace = devkit_1.readWorkspaceConfiguration(this.host);
|
|
290
|
+
const workspace = (0, devkit_1.readWorkspaceConfiguration)(this.host);
|
|
291
291
|
this.cleanUpGeneratorsConfig(workspace);
|
|
292
|
-
devkit_1.updateWorkspaceConfiguration(this.host, workspace);
|
|
292
|
+
(0, devkit_1.updateWorkspaceConfiguration)(this.host, workspace);
|
|
293
293
|
/**
|
|
294
294
|
* Update project-level linter configuration defaults in workspace.json
|
|
295
295
|
*/
|
|
296
|
-
const projects = devkit_1.getProjects(this.host);
|
|
296
|
+
const projects = (0, devkit_1.getProjects)(this.host);
|
|
297
297
|
for (const [projectName, { generators }] of projects.entries()) {
|
|
298
298
|
if (!generators || Object.keys(generators).length === 0) {
|
|
299
299
|
continue;
|
|
300
300
|
}
|
|
301
|
-
const project = devkit_1.readProjectConfiguration(this.host, projectName);
|
|
301
|
+
const project = (0, devkit_1.readProjectConfiguration)(this.host, projectName);
|
|
302
302
|
this.cleanUpGeneratorsConfig(project);
|
|
303
|
-
devkit_1.updateProjectConfiguration(this.host, projectName, project);
|
|
303
|
+
(0, devkit_1.updateProjectConfiguration)(this.host, projectName, project);
|
|
304
304
|
}
|
|
305
305
|
return uninstallTask;
|
|
306
306
|
}
|
|
@@ -365,7 +365,7 @@ class ProjectConverter {
|
|
|
365
365
|
return null;
|
|
366
366
|
}
|
|
367
367
|
let e2eProjectName = null;
|
|
368
|
-
const projects = devkit_1.getProjects(this.host);
|
|
368
|
+
const projects = (0, devkit_1.getProjects)(this.host);
|
|
369
369
|
for (const [projectName, projectConfig] of projects.entries()) {
|
|
370
370
|
for (const [, targetConfig] of Object.entries(projectConfig.targets)) {
|
|
371
371
|
if (targetConfig.executor === '@nrwl/cypress:cypress') {
|
|
@@ -380,12 +380,12 @@ class ProjectConverter {
|
|
|
380
380
|
}
|
|
381
381
|
setDefaults(collectionName, defaults) {
|
|
382
382
|
var _a;
|
|
383
|
-
const workspace = devkit_1.readWorkspaceConfiguration(this.host);
|
|
383
|
+
const workspace = (0, devkit_1.readWorkspaceConfiguration)(this.host);
|
|
384
384
|
workspace.generators || (workspace.generators = {});
|
|
385
385
|
(_a = workspace.generators)[collectionName] || (_a[collectionName] = {});
|
|
386
386
|
const prev = workspace.generators[collectionName];
|
|
387
387
|
workspace.generators = Object.assign(Object.assign({}, workspace.generators), { [collectionName]: Object.assign(Object.assign({}, prev), { 'convert-tslint-to-eslint': Object.assign(Object.assign({}, prev['convert-tslint-to-eslint']), defaults) }) });
|
|
388
|
-
devkit_1.updateWorkspaceConfiguration(this.host, workspace);
|
|
388
|
+
(0, devkit_1.updateWorkspaceConfiguration)(this.host, workspace);
|
|
389
389
|
}
|
|
390
390
|
}
|
|
391
391
|
exports.ProjectConverter = ProjectConverter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-converter.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/project-converter.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AAOtB,oFAA2F;AAC3F,yEAAoF;AACpF,mCAIiB;AAajB;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,gBAAgB;IAc3B;;;;OAIG;IACH,YAAY,EACV,IAAI,EACJ,WAAW,EACX,0BAA0B,EAC1B,iBAAiB,GASlB;QA9BgB,uBAAkB,GAAG,aAAa,CAAC;QA+BlD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,aAAa,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"project-converter.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/project-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ function ensureESLintPluginsAreInstalled(host, eslintPluginsToBeInstalled) {
|
|
|
16
16
|
devkit_1.logger.info('\nINFO: To most closely match your tslint.json, we will ensure the `latest` version of the following eslint plugin(s) are installed:');
|
|
17
17
|
devkit_1.logger.info('\n - ' + eslintPluginsToBeInstalled.join('\n - '));
|
|
18
18
|
devkit_1.logger.info('\nPlease note, you may later wish to pin these to a specific version number in your package.json, rather than leaving it open to `latest`.\n');
|
|
19
|
-
return devkit_1.addDependenciesToPackageJson(host, {}, additionalDevDependencies);
|
|
19
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, additionalDevDependencies);
|
|
20
20
|
}
|
|
21
21
|
exports.ensureESLintPluginsAreInstalled = ensureESLintPluginsAreInstalled;
|
|
22
22
|
/**
|
|
@@ -38,13 +38,13 @@ function warnInCaseOfUnconvertedRules(tslintConfigPath, unconvertedTSLintRules)
|
|
|
38
38
|
}
|
|
39
39
|
function convertTSLintConfig(rawTSLintJson, tslintJsonPath, ignoreExtendsVals) {
|
|
40
40
|
var _a;
|
|
41
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
const convertedProject = yield convert_to_eslint_config_1.convertToESLintConfig(tslintJsonPath, rawTSLintJson, ignoreExtendsVals);
|
|
41
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
42
|
+
const convertedProject = yield (0, convert_to_eslint_config_1.convertToESLintConfig)(tslintJsonPath, rawTSLintJson, ignoreExtendsVals);
|
|
43
43
|
(_a = convertedProject.convertedESLintConfig).rules || (_a.rules = {});
|
|
44
44
|
/**
|
|
45
45
|
* Apply the custom converter for the nx-module-boundaries rule if applicable
|
|
46
46
|
*/
|
|
47
|
-
const convertedNxRule = convert_nx_enforce_module_boundaries_rule_1.convertTslintNxRuleToEslintNxRule(rawTSLintJson);
|
|
47
|
+
const convertedNxRule = (0, convert_nx_enforce_module_boundaries_rule_1.convertTslintNxRuleToEslintNxRule)(rawTSLintJson);
|
|
48
48
|
if (convertedNxRule) {
|
|
49
49
|
convertedProject.convertedESLintConfig.rules[convertedNxRule.ruleName] =
|
|
50
50
|
convertedNxRule.ruleConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/utils.ts"],"names":[],"mappings":";;;;AAAA,yCAAoE;AAIpE,2GAAgG;AAChG,yEAAmE;AAEnE,SAAgB,+BAA+B,CAC7C,IAAU,EACV,0BAAoC;IAEpC,IAAI,CAAC,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAA,EAAE;QACvC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC;KACxB;IAED,MAAM,yBAAyB,GAAG,EAAE,CAAC;IAErC,KAAK,MAAM,UAAU,IAAI,0BAA0B,EAAE;QACnD,yBAAyB,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;KAClD;IAED,eAAM,CAAC,IAAI,CACT,sIAAsI,CACvI,CAAC;IACF,eAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClE,eAAM,CAAC,IAAI,CACT,8IAA8I,CAC/I,CAAC;IAEF,OAAO,qCAA4B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/testing.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runMigration = void 0;
|
|
4
4
|
const testing_1 = require("@angular-devkit/schematics/testing");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const migrationTestRunner = new testing_1.SchematicTestRunner('@nrwl/linter-migrations', path_1.join(__dirname, '../../migrations.json'));
|
|
6
|
+
const migrationTestRunner = new testing_1.SchematicTestRunner('@nrwl/linter-migrations', (0, path_1.join)(__dirname, '../../migrations.json'));
|
|
7
7
|
function runMigration(migrationName, options, tree) {
|
|
8
8
|
return migrationTestRunner
|
|
9
9
|
.runSchematicAsync(migrationName, options, tree)
|
package/src/utils/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../packages/linter/src/utils/testing.ts"],"names":[],"mappings":";;;AAAA,gEAAyE;AACzE,+BAA4B;AAG5B,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CACjD,yBAAyB,EACzB,WAAI,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../packages/linter/src/utils/testing.ts"],"names":[],"mappings":";;;AAAA,gEAAyE;AACzE,+BAA4B;AAG5B,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CACjD,yBAAyB,EACzB,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEF,SAAgB,YAAY,CAC1B,aAAqB,EACrB,OAAU,EACV,IAAU;IAEV,OAAO,mBAAmB;SACvB,iBAAiB,CAAI,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC;SAClD,SAAS,EAAE,CAAC;AACjB,CAAC;AARD,oCAQC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const nxVersion = "*";
|
|
2
2
|
export declare const tslintVersion = "~6.1.0";
|
|
3
3
|
export declare const tslintToEslintConfigVersion = "^2.4.0";
|
|
4
|
-
export declare const buildAngularVersion = "~
|
|
4
|
+
export declare const buildAngularVersion = "~13.0.0";
|
|
5
5
|
export declare const typescriptESLintVersion = "~4.33.0";
|
|
6
6
|
export declare const eslintVersion = "7.32.0";
|
|
7
7
|
export declare const eslintConfigPrettierVersion = "8.1.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.buildAngularVersion = exports.tslintToEslintConfigVersion = exports.tslintVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.1
|
|
4
|
+
exports.nxVersion = '13.2.0-beta.1';
|
|
5
5
|
exports.tslintVersion = '~6.1.0';
|
|
6
6
|
exports.tslintToEslintConfigVersion = '^2.4.0';
|
|
7
|
-
exports.buildAngularVersion = '~
|
|
7
|
+
exports.buildAngularVersion = '~13.0.0';
|
|
8
8
|
exports.typescriptESLintVersion = '~4.33.0';
|
|
9
9
|
exports.eslintVersion = '7.32.0';
|
|
10
10
|
exports.eslintConfigPrettierVersion = '8.1.0';
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.workspaceLintPluginDir = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
exports.workspaceLintPluginDir = devkit_1.joinPathFragments('tools/eslint-rules');
|
|
5
|
+
exports.workspaceLintPluginDir = (0, devkit_1.joinPathFragments)('tools/eslint-rules');
|
|
6
6
|
//# sourceMappingURL=workspace-lint-rules.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-lint-rules.js","sourceRoot":"","sources":["../../../../../packages/linter/src/utils/workspace-lint-rules.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEpC,QAAA,sBAAsB,GAAG,0BAAiB,
|
|
1
|
+
{"version":3,"file":"workspace-lint-rules.js","sourceRoot":"","sources":["../../../../../packages/linter/src/utils/workspace-lint-rules.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEpC,QAAA,sBAAsB,GAAG,IAAA,0BAAiB,EAAC,oBAAoB,CAAC,CAAC"}
|