@nrwl/linter 16.0.0-beta.0 → 16.0.0-beta.1

package/src/migrations/update-12-9-0/add-outputs.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-function addOutputs(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        for (const [projectName, project] of (0, devkit_1.getProjects)(tree)) {
-            if (!project.targets) {
-                continue;
-            }
-            for (const target of Object.values(project.targets)) {
-                if (target.executor !== '@nrwl/linter:eslint' || target.outputs) {
-                    continue;
-                }
-                target.outputs = ['{options.outputFile}'];
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-            }
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
-}
-exports.default = addOutputs;
-//# sourceMappingURL=add-outputs.js.map

package/src/migrations/update-12-9-0/add-outputs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-outputs.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-12-9-0/add-outputs.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,SAA8B,UAAU,CAAC,IAAU;;QACjD,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACpB,SAAS;aACV;YAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACnD,IAAI,MAAM,CAAC,QAAQ,KAAK,qBAAqB,IAAI,MAAM,CAAC,OAAO,EAAE;oBAC/D,SAAS;iBACV;gBAED,MAAM,CAAC,OAAO,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBAE1C,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlBD,6BAkBC"}

package/src/migrations/update-13-3-0/eslint-8-updates.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function eslint8Updates(tree: Tree): Promise<void>;

package/src/migrations/update-13-3-0/eslint-8-updates.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const versions_1 = require("../../utils/versions");
-function eslint8Updates(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const { addPropertyToJestConfig } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
-            const existingJestConfigPath = (0, devkit_1.normalizePath)('tools/eslint-rules/jest.config.js');
-            // Add extra config to the jest.config.js file to allow ESLint 8 exports mapping to work with jest
-            addPropertyToJestConfig(tree, existingJestConfigPath, 'moduleNameMapper', {
-                '@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs',
-            });
-            (0, devkit_1.visitNotIgnoredFiles)(tree, 'tools/eslint-rules', (path) => {
-                if (!path.endsWith('.ts')) {
-                    return;
-                }
-                const fileContents = tree.read(path).toString('utf-8');
-                const fileAst = tsquery_1.tsquery.ast(fileContents);
-                const isESLintRuleFile = (0, tsquery_1.tsquery)(fileAst, 'PropertyAccessExpression[expression.escapedText=ESLintUtils][name.escapedText=RuleCreator]').length > 0;
-                if (!isESLintRuleFile) {
-                    return;
-                }
-                const categoryPropertyAssignmentNode = (0, tsquery_1.tsquery)(fileAst, 'PropertyAssignment[name.escapedText=meta] PropertyAssignment[name.escapedText=docs]  PropertyAssignment[name.escapedText=category]')[0];
-                if (!categoryPropertyAssignmentNode) {
-                    return;
-                }
-                let end = categoryPropertyAssignmentNode.getEnd();
-                if (fileContents.substring(end, end + 1) === ',') {
-                    end++;
-                }
-                const updatedContents = fileContents.slice(0, categoryPropertyAssignmentNode.getFullStart()) +
-                    fileContents.slice(end);
-                tree.write(path, updatedContents);
-            });
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        catch (_a) { }
-    });
-}
-exports.default = eslint8Updates;
-//# sourceMappingURL=eslint-8-updates.js.map

package/src/migrations/update-13-3-0/eslint-8-updates.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eslint-8-updates.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-13-3-0/eslint-8-updates.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,uDAAoD;AACpD,mDAAiD;AAEjD,SAA8B,cAAc,CAAC,IAAU;;QACrD,IAAI;YACF,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;YAC3E,MAAM,sBAAsB,GAAG,IAAA,sBAAa,EAC1C,mCAAmC,CACpC,CAAC;YAEF,kGAAkG;YAClG,uBAAuB,CAAC,IAAI,EAAE,sBAAsB,EAAE,kBAAkB,EAAE;gBACxE,kBAAkB,EAAE,8CAA8C;aACnE,CAAC,CAAC;YAEH,IAAA,6BAAoB,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBACzB,OAAO;iBACR;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACvD,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC1C,MAAM,gBAAgB,GACpB,IAAA,iBAAO,EACL,OAAO,EACP,4FAA4F,CAC7F,CAAC,MAAM,GAAG,CAAC,CAAC;gBACf,IAAI,CAAC,gBAAgB,EAAE;oBACrB,OAAO;iBACR;gBACD,MAAM,8BAA8B,GAAG,IAAA,iBAAO,EAC5C,OAAO,EACP,oIAAoI,CACrI,CAAC,CAAC,CAAC,CAAC;gBACL,IAAI,CAAC,8BAA8B,EAAE;oBACnC,OAAO;iBACR;gBACD,IAAI,GAAG,GAAG,8BAA8B,CAAC,MAAM,EAAE,CAAC;gBAClD,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;oBAChD,GAAG,EAAE,CAAC;iBACP;gBACD,MAAM,eAAe,GACnB,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC,YAAY,EAAE,CAAC;oBACpE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AA7CD,iCA6CC"}

package/src/migrations/update-14-1-9/add-swc-deps-if-needed.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function addSwcNodeIfNeeded(tree: Tree): Promise<void>;

package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("nx/src/utils/versions");
-const workspace_rules_project_1 = require("../../generators/workspace-rules-project/workspace-rules-project");
-function addSwcNodeIfNeeded(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            if (tree.exists(workspace_rules_project_1.WORKSPACE_PLUGIN_DIR)) {
-                (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@swc-node/register': versions_1.swcNodeVersion, '@swc/core': versions_1.swcCoreVersion });
-                yield (0, devkit_1.formatFiles)(tree);
-                return;
-            }
-        }
-        catch (_a) { }
-    });
-}
-exports.default = addSwcNodeIfNeeded;
-//# sourceMappingURL=add-swc-deps-if-needed.js.map

package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-swc-deps-if-needed.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts"],"names":[],"mappings":";;;AAAA,yCAA+E;AAC/E,oDAAuE;AACvE,8GAAwG;AAExG,SAA8B,kBAAkB,CAAC,IAAU;;QACzD,IAAI;YACF,IAAI,IAAI,CAAC,MAAM,CAAC,8CAAoB,CAAC,EAAE;gBACrC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,oBAAoB,EAAE,yBAAc,EAAE,WAAW,EAAE,yBAAc,EAAE,CACtE,CAAC;gBACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;gBACxB,OAAO;aACR;SACF;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AAZD,qCAYC"}

package/src/migrations/update-14-4-4/experimental-to-utils-deps.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function addTypescriptEslintUtilsIfNeeded(tree: Tree): Promise<void>;

package/src/migrations/update-14-4-4/experimental-to-utils-deps.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const workspace_rules_project_1 = require("../../generators/workspace-rules-project/workspace-rules-project");
-const versions_1 = require("../../utils/versions");
-function addTypescriptEslintUtilsIfNeeded(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-            let removed = false;
-            if (packageJson.devDependencies['@typescript-eslint/experimental-utils']) {
-                yield (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['@typescript-eslint/experimental-utils']);
-                removed = true;
-            }
-            if (packageJson.dependencies['@typescript-eslint/experimental-utils']) {
-                yield (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@typescript-eslint/experimental-utils'], []);
-                removed = true;
-            }
-            if (removed || tree.exists(workspace_rules_project_1.WORKSPACE_PLUGIN_DIR)) {
-                (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@typescript-eslint/utils': versions_1.typescriptESLintVersion });
-                yield (0, devkit_1.formatFiles)(tree);
-            }
-            return;
-        }
-        catch (_a) { }
-    });
-}
-exports.default = addTypescriptEslintUtilsIfNeeded;
-//# sourceMappingURL=experimental-to-utils-deps.js.map

package/src/migrations/update-14-4-4/experimental-to-utils-deps.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"experimental-to-utils-deps.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-14-4-4/experimental-to-utils-deps.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,8GAAwG;AACxG,mDAA+D;AAE/D,SAA8B,gCAAgC,CAAC,IAAU;;QACvE,IAAI;YACF,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACnD,IAAI,OAAO,GAAG,KAAK,CAAC;YAEpB,IAAI,WAAW,CAAC,eAAe,CAAC,uCAAuC,CAAC,EAAE;gBACxE,MAAM,IAAA,0CAAiC,EACrC,IAAI,EACJ,EAAE,EACF,CAAC,uCAAuC,CAAC,CAC1C,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC;aAChB;YAED,IAAI,WAAW,CAAC,YAAY,CAAC,uCAAuC,CAAC,EAAE;gBACrE,MAAM,IAAA,0CAAiC,EACrC,IAAI,EACJ,CAAC,uCAAuC,CAAC,EACzC,EAAE,CACH,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC;aAChB;YAED,IAAI,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,8CAAoB,CAAC,EAAE;gBAChD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,0BAA0B,EAAE,kCAAuB,EAAE,CACxD,CAAC;gBAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;aACzB;YACD,OAAO;SACR;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AAlCD,mDAkCC"}

package/src/migrations/update-14-4-4/experimental-to-utils-rules.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function experimentalToUtilsUpdate(tree: Tree): Promise<void>;

package/src/migrations/update-14-4-4/experimental-to-utils-rules.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-function updateFile(fileAst, fileContents) {
-    const importStatement = (0, tsquery_1.tsquery)(fileAst, 'ImportDeclaration StringLiteral[value=@typescript-eslint/experimental-utils]');
-    if (importStatement.length === 0) {
-        return;
-    }
-    const contentSlices = fileContents.split('@typescript-eslint/experimental-utils');
-    let updatedFileContents = '';
-    for (let i = 0; i < contentSlices.length / 2; i++) {
-        updatedFileContents += `${contentSlices[i]}@typescript-eslint/utils`;
-    }
-    updatedFileContents += contentSlices[contentSlices.length - 1];
-    return updatedFileContents;
-}
-function experimentalToUtilsUpdate(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            (0, devkit_1.visitNotIgnoredFiles)(tree, 'tools/eslint-rules', (path) => {
-                if (path.endsWith('.ts')) {
-                    const fileContents = tree.read(path).toString('utf-8');
-                    const fileAst = tsquery_1.tsquery.ast(fileContents);
-                    const updatedContents = updateFile(fileAst, fileContents);
-                    if (updatedContents) {
-                        tree.write(path, updatedContents);
-                    }
-                }
-            });
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        catch (_a) { }
-    });
-}
-exports.default = experimentalToUtilsUpdate;
-//# sourceMappingURL=experimental-to-utils-rules.js.map

package/src/migrations/update-14-4-4/experimental-to-utils-rules.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"experimental-to-utils-rules.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-14-4-4/experimental-to-utils-rules.ts"],"names":[],"mappings":";;;AAAA,yCAAuE;AACvE,uDAAoD;AAEpD,SAAS,UAAU,CAAC,OAAY,EAAE,YAAoB;IACpD,MAAM,eAAe,GAAU,IAAA,iBAAO,EACpC,OAAO,EACP,8EAA8E,CAC/E,CAAC;IACF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO;KACR;IACD,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CACtC,uCAAuC,CACxC,CAAC;IACF,IAAI,mBAAmB,GAAG,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACjD,mBAAmB,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,0BAA0B,CAAC;KACtE;IACD,mBAAmB,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,SAA8B,yBAAyB,CAAC,IAAU;;QAChE,IAAI;YACF,IAAA,6BAAoB,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACvD,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBAE1C,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAC1D,IAAI,eAAe,EAAE;wBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;qBACnC;iBACF;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AAhBD,4CAgBC"}

package/src/migrations/update-15-0-0/add-eslint-inputs.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function addEslintInputs(tree: Tree): Promise<void>;

package/src/migrations/update-15-0-0/add-eslint-inputs.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const eslint_file_1 = require("../../generators/utils/eslint-file");
-const eslint_targets_1 = require("../../generators/utils/eslint-targets");
-function addEslintInputs(tree) {
-    var _a, _b, _c, _d;
-    var _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        const globalEslintFile = eslint_file_1.eslintConfigFileWhitelist.find((file) => tree.exists(file));
-        if (globalEslintFile && ((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production)) {
-            const productionFileset = new Set(nxJson.namedInputs.production);
-            productionFileset.add(`!{projectRoot}/${globalEslintFile}`);
-            nxJson.namedInputs.production = Array.from(productionFileset);
-        }
-        for (const targetName of (0, eslint_targets_1.getEslintTargets)(tree)) {
-            (_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
-            const lintTargetDefaults = ((_c = (_e = nxJson.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
-            (_d = lintTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (lintTargetDefaults.inputs = [
-                'default',
-                ...(globalEslintFile
-                    ? [(0, devkit_1.joinPathFragments)('{workspaceRoot}', globalEslintFile)]
-                    : []),
-            ]);
-        }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
-}
-exports.default = addEslintInputs;
-//# sourceMappingURL=add-eslint-inputs.js.map

package/src/migrations/update-15-0-0/add-eslint-inputs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-eslint-inputs.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-15-0-0/add-eslint-inputs.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,oEAA+E;AAC/E,0EAAyE;AAEzE,SAA8B,eAAe,CAAC,IAAU;;;;QACtD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,gBAAgB,GAAG,uCAAyB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAClB,CAAC;QAEF,IAAI,gBAAgB,KAAI,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,EAAE;YACtD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAEjE,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,gBAAgB,EAAE,CAAC,CAAC;YAE5D,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/D;QAED,KAAK,MAAM,UAAU,IAAI,IAAA,iCAAgB,EAAC,IAAI,CAAC,EAAE;YAC/C,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;YAE7B,MAAM,kBAAkB,GAAG,aAAC,MAAM,CAAC,cAAc,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC,CAAC;YAEtE,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK;gBAC5B,SAAS;gBACT,GAAG,CAAC,gBAAgB;oBAClB,CAAC,CAAC,CAAC,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;oBAC1D,CAAC,CAAC,EAAE,CAAC;aACR,EAAC;SACH;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AA/BD,kCA+BC"}

package/src/migrations/update-15-7-1/add-eslint-ignore.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-export default function addEslintIgnore(tree: Tree): Promise<void>;

package/src/migrations/update-15-7-1/add-eslint-ignore.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const eslint_file_1 = require("../../generators/utils/eslint-file");
-const eslint_targets_1 = require("../../generators/utils/eslint-targets");
-function addEslintIgnore(tree) {
-    var _a, _b;
-    var _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-        const globalEslintFile = eslint_file_1.eslintConfigFileWhitelist.find((file) => tree.exists(file));
-        if (globalEslintFile) {
-            if (tree.exists('.eslintignore')) {
-                const content = tree.read('.eslintignore', 'utf-8');
-                if (!content.includes('node_modules')) {
-                    tree.write('.eslintignore', `node_modules\n${content}`);
-                }
-            }
-            else {
-                tree.write('.eslintignore', 'node_modules\n');
-            }
-            for (const targetName of (0, eslint_targets_1.getEslintTargets)(tree)) {
-                (_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : (nxJson.targetDefaults = {});
-                const lintTargetDefaults = ((_b = (_c = nxJson.targetDefaults)[targetName]) !== null && _b !== void 0 ? _b : (_c[targetName] = {}));
-                const lintIgnorePath = (0, devkit_1.joinPathFragments)('{workspaceRoot}', globalEslintFile);
-                if (lintTargetDefaults.inputs) {
-                    if (!lintTargetDefaults.inputs.includes(lintIgnorePath)) {
-                        lintTargetDefaults.inputs.push(lintIgnorePath);
-                    }
-                }
-                else {
-                    lintTargetDefaults.inputs = ['default', lintIgnorePath];
-                }
-            }
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
-}
-exports.default = addEslintIgnore;
-//# sourceMappingURL=add-eslint-ignore.js.map

package/src/migrations/update-15-7-1/add-eslint-ignore.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-eslint-ignore.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-15-7-1/add-eslint-ignore.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,oEAA+E;AAC/E,0EAAyE;AAEzE,SAA8B,eAAe,CAAC,IAAU;;;;QACtD,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEzC,MAAM,gBAAgB,GAAG,uCAAyB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAClB,CAAC;QAEF,IAAI,gBAAgB,EAAE;YACpB,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBAChC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACpD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;oBACrC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,OAAO,EAAE,CAAC,CAAC;iBACzD;aACF;iBAAM;gBACL,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;aAC/C;YAED,KAAK,MAAM,UAAU,IAAI,IAAA,iCAAgB,EAAC,IAAI,CAAC,EAAE;gBAC/C,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;gBAC7B,MAAM,kBAAkB,GAAG,aAAC,MAAM,CAAC,cAAc,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC,CAAC;gBAEtE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,iBAAiB,EACjB,gBAAgB,CACjB,CAAC;gBAEF,IAAI,kBAAkB,CAAC,MAAM,EAAE;oBAC7B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;wBACvD,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;qBAChD;iBACF;qBAAM;oBACL,kBAAkB,CAAC,MAAM,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;iBACzD;aACF;YAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AAtCD,kCAsCC"}

package/src/utils/convert-tslint-to-eslint/convert-nx-enforce-module-boundaries-rule.d.ts

@@ -1,5 +0,0 @@
-import type { ESLintRuleSeverity } from 'tslint-to-eslint-config';
-export declare function convertTslintNxRuleToEslintNxRule(tslintJson: Record<string, unknown>): {
-    ruleName: string;
-    ruleConfig: [ESLintRuleSeverity, Record<string, unknown>];
-} | null;

package/src/utils/convert-tslint-to-eslint/convert-nx-enforce-module-boundaries-rule.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTslintNxRuleToEslintNxRule = void 0;
-function convertTSLintRuleSeverity(tslintConfig, tslintSeverity) {
-    if (tslintSeverity === true) {
-        tslintSeverity = 'default';
-    }
-    if (tslintSeverity === false) {
-        tslintSeverity = 'off';
-    }
-    if (tslintSeverity === 'default') {
-        tslintSeverity = tslintConfig.defaultSeverity || 'error';
-    }
-    const narrowedTslintSeverity = tslintSeverity;
-    return narrowedTslintSeverity === 'warning' ? 'warn' : narrowedTslintSeverity;
-}
-const NX_TSLINT_RULE_NAME = 'nx-enforce-module-boundaries';
-function convertTslintNxRuleToEslintNxRule(tslintJson) {
-    var _a;
-    /**
-     * TSLint supports a number of different formats for rule configuration
-     */
-    const existingRuleDefinition = (_a = tslintJson === null || tslintJson === void 0 ? void 0 : tslintJson.rules) === null || _a === void 0 ? void 0 : _a[NX_TSLINT_RULE_NAME];
-    if (!existingRuleDefinition) {
-        return null;
-    }
-    let existingRuleSeverity = 'error';
-    let existingRuleConfig = {
-        enforceBuildableLibDependency: true,
-        allow: [],
-        depConstraints: [
-            {
-                sourceTag: '*',
-                onlyDependOnLibsWithTags: ['*'],
-            },
-        ],
-    };
-    if (Array.isArray(existingRuleDefinition)) {
-        existingRuleSeverity = existingRuleDefinition[0];
-        existingRuleConfig = existingRuleDefinition[1];
-    }
-    else if (typeof existingRuleDefinition === 'object' &&
-        existingRuleDefinition.severity) {
-        existingRuleSeverity = existingRuleDefinition.severity;
-        if (Array.isArray(existingRuleDefinition.options) &&
-            existingRuleDefinition.options[0]) {
-            existingRuleConfig = existingRuleDefinition.options[0];
-        }
-    }
-    const ruleSeverity = convertTSLintRuleSeverity(tslintJson, existingRuleSeverity);
-    return {
-        ruleName: '@nrwl/nx/enforce-module-boundaries',
-        ruleConfig: [ruleSeverity, existingRuleConfig],
-    };
-}
-exports.convertTslintNxRuleToEslintNxRule = convertTslintNxRuleToEslintNxRule;
-//# sourceMappingURL=convert-nx-enforce-module-boundaries-rule.js.map

package/src/utils/convert-tslint-to-eslint/convert-nx-enforce-module-boundaries-rule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"convert-nx-enforce-module-boundaries-rule.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/convert-nx-enforce-module-boundaries-rule.ts"],"names":[],"mappings":";;;AAQA,SAAS,yBAAyB,CAChC,YAAiB,EACjB,cAAkC;IAElC,IAAI,cAAc,KAAK,IAAI,EAAE;QAC3B,cAAc,GAAG,SAAS,CAAC;KAC5B;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,cAAc,GAAG,KAAK,CAAC;KACxB;IACD,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,cAAc,GAAG,YAAY,CAAC,eAAe,IAAI,OAAO,CAAC;KAC1D;IACD,MAAM,sBAAsB,GAC1B,cAAoD,CAAC;IACvD,OAAO,sBAAsB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC;AAChF,CAAC;AAED,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;AAE3D,SAAgB,iCAAiC,CAC/C,UAAmC;;IAKnC;;OAEG;IACH,MAAM,sBAAsB,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,0CAAG,mBAAmB,CAAC,CAAC;IACxE,IAAI,CAAC,sBAAsB,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,oBAAoB,GAAuB,OAAO,CAAC;IACvD,IAAI,kBAAkB,GAAG;QACvB,6BAA6B,EAAE,IAAI;QACnC,KAAK,EAAE,EAAE;QACT,cAAc,EAAE;YACd;gBACE,SAAS,EAAE,GAAG;gBACd,wBAAwB,EAAE,CAAC,GAAG,CAAC;aAChC;SACF;KACF,CAAC;IAEF,IAAI,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE;QACzC,oBAAoB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACjD,kBAAkB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;KAChD;SAAM,IACL,OAAO,sBAAsB,KAAK,QAAQ;QAC1C,sBAAsB,CAAC,QAAQ,EAC/B;QACA,oBAAoB,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACvD,IACE,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC;YAC7C,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,EACjC;YACA,kBAAkB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACxD;KACF;IAED,MAAM,YAAY,GAAuB,yBAAyB,CAChE,UAAU,EACV,oBAAoB,CACrB,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,oCAAoC;QAC9C,UAAU,EAAE,CAAC,YAAY,EAAE,kBAAkB,CAAC;KAC/C,CAAC;AACJ,CAAC;AAlDD,8EAkDC"}

package/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.d.ts

@@ -1,9 +0,0 @@
-import type { Tree } from '@nrwl/devkit';
-import type { Linter as ESLintLinter } from 'eslint';
-import type { TSLintRuleOptions } from 'tslint-to-eslint-config';
-export declare function convertToESLintConfig(pathToTslintJson: string, tslintJson: Record<string, unknown>, ignoreExtendsVals: string[]): Promise<{
-    convertedESLintConfig: ESLintLinter.Config;
-    unconvertedTSLintRules: TSLintRuleOptions[];
-    ensureESLintPlugins: string[];
-}>;
-export declare function convertTSLintDisableCommentsForProject(tree: Tree, projectName: string): void;

package/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.js

@@ -1,152 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTSLintDisableCommentsForProject = exports.convertToESLintConfig = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const child_process_1 = require("child_process");
-const tmp_1 = require("tmp");
-const versions_1 = require("../versions");
-let tslintToEslint;
-function getConvertToEslintConfig() {
-    if (tslintToEslint) {
-        return tslintToEslint;
-    }
-    try {
-        // This is usually not possible during runtime but makes it easy to mock in tests
-        return require('tslint-to-eslint-config');
-    }
-    catch (_a) { }
-    /**
-     * In order to avoid all users of Nx needing to have tslint-to-eslint-config (and therefore tslint)
-     * in their node_modules, we dynamically install and uninstall the library as part of the conversion
-     * process.
-     *
-     * NOTE: By taking this approach we have to sacrifice dry-run capabilities for this generator.
-     */
-    const tempDir = (0, tmp_1.dirSync)().name;
-    (0, child_process_1.execSync)(`${(0, devkit_1.getPackageManagerCommand)().addDev} tslint-to-eslint-config@${versions_1.tslintToEslintConfigVersion}`, {
-        cwd: tempDir,
-        stdio: [0, 1, 2],
-    });
-    tslintToEslint = require(require.resolve('tslint-to-eslint-config', {
-        paths: [tempDir],
-    }));
-    return tslintToEslint;
-}
-function convertToESLintConfig(pathToTslintJson, tslintJson, ignoreExtendsVals) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * We need to avoid a direct dependency on tslint-to-eslint-config
-         * and ensure we are only resolving the dependency from the user's
-         * node_modules on demand (it will be installed as part of the
-         * conversion generator).
-         */
-        const { createESLintConfiguration, findReportedConfiguration, joinConfigConversionResults, } = getConvertToEslintConfig();
-        const updatedTSLintJson = tslintJson;
-        /**
-         * If ignoreExtendsVals are provided, strip them from the config
-         * and commit the result to disk per the notes below.
-         */
-        if (ignoreExtendsVals.length && updatedTSLintJson.extends) {
-            if (typeof updatedTSLintJson.extends === 'string' &&
-                ignoreExtendsVals.includes(updatedTSLintJson.extends)) {
-                delete updatedTSLintJson.extends;
-            }
-            if (Array.isArray(updatedTSLintJson.extends)) {
-                updatedTSLintJson.extends = updatedTSLintJson.extends.filter((ext) => !ignoreExtendsVals.includes(ext));
-            }
-            /**
-             * The reasons we need to interact with the filesystem here:
-             *
-             * 1) The result of the tslint CLI flag `--print-config` is needed for the
-             * conversion process, and unfortunately no equivalent Node API was ever
-             * added to tslint, so the tslint CLI needs to always read from disk.
-             *
-             * 2) When converting project configs, we need to strip the extends path
-             * which corresponds to the workspace's root config, otherwise all of the
-             * root config's rules will be included in the resultant eslint config for
-             * the project. The interaction with the filesystem is needed because of
-             * point (1) above - we need to strip the relevant extends and commit that
-             * change to disk before the tslint CLI reads the config file.
-             */
-            (0, devkit_1.writeJsonFile)(pathToTslintJson, updatedTSLintJson);
-        }
-        const reportedConfiguration = yield findReportedConfiguration('npx tslint --print-config', pathToTslintJson);
-        if (reportedConfiguration instanceof Error) {
-            if (reportedConfiguration.message.includes('unknown option `--print-config')) {
-                throw new Error('\nError: TSLint v5.18 required in order to run this schematic. Please update your version and try again.\n');
-            }
-            /**
-             * Make a print-config issue easier to understand for the end user.
-             * This error could occur if, for example, the user does not have a TSLint plugin installed correctly that they
-             * reference in their config.
-             */
-            const printConfigFailureMessageStart = 'Command failed: npx tslint --print-config "tslint.json"';
-            if (reportedConfiguration.message.startsWith(printConfigFailureMessageStart)) {
-                throw new Error(`\nThere was a critical error when trying to inspect your tslint.json: \n${reportedConfiguration.message.replace(printConfigFailureMessageStart, '')}`);
-            }
-            throw new Error(`Unexpected error: ${reportedConfiguration.message}`);
-        }
-        const originalConfigurations = {
-            tslint: {
-                full: reportedConfiguration,
-                raw: updatedTSLintJson,
-            },
-        };
-        const summarizedConfiguration = yield createESLintConfiguration(originalConfigurations);
-        /**
-         * We are expecting it to not find a converter for nx-enforce-module-boundaries
-         * and we will explicitly replace it with the ESLint equivalent ourselves.
-         */
-        if (summarizedConfiguration.missing) {
-            summarizedConfiguration.missing = summarizedConfiguration.missing.filter((missingRuleData) => missingRuleData.ruleName !== 'nx-enforce-module-boundaries');
-        }
-        // These are already covered by our extraEslintDependencies which get installed by the schematic
-        const expectedESLintPlugins = [
-            '@angular-eslint/eslint-plugin',
-            '@angular-eslint/eslint-plugin-template',
-        ];
-        const convertedESLintConfig = joinConfigConversionResults(summarizedConfiguration, originalConfigurations);
-        if (Array.isArray(convertedESLintConfig.extends) &&
-            convertedESLintConfig.extends.length) {
-            // Ignore any tslint-to-eslint-config default extends that do not apply to Nx
-            convertedESLintConfig.extends = convertedESLintConfig.extends.filter((ext) => !ext.startsWith('prettier'));
-            if (convertedESLintConfig.extends.length === 0) {
-                delete convertedESLintConfig.extends;
-            }
-        }
-        return {
-            convertedESLintConfig,
-            unconvertedTSLintRules: summarizedConfiguration.missing,
-            ensureESLintPlugins: Array.from(summarizedConfiguration.plugins).filter((pluginName) => !expectedESLintPlugins.includes(pluginName)),
-        };
-    });
-}
-exports.convertToESLintConfig = convertToESLintConfig;
-function likelyContainsTSLintComment(fileContent) {
-    return fileContent.includes('tslint:');
-}
-function convertTSLintDisableCommentsForProject(tree, projectName) {
-    /**
-     * We need to avoid a direct dependency on tslint-to-eslint-config
-     * and ensure we are only resolving the dependency from the user's
-     * node_modules on demand (it will be installed as part of the
-     * conversion generator).
-     */
-    const { convertFileComments } = getConvertToEslintConfig();
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    (0, devkit_1.visitNotIgnoredFiles)(tree, root, (filePath) => {
-        if (!filePath.endsWith('.ts')) {
-            return;
-        }
-        const fileContent = tree.read(filePath, 'utf-8');
-        // Avoid updating files if we don't have to
-        if (!fileContent || !likelyContainsTSLintComment(fileContent)) {
-            return;
-        }
-        const updatedFileContent = convertFileComments({ fileContent, filePath });
-        tree.write(filePath, updatedFileContent);
-    });
-}
-exports.convertTSLintDisableCommentsForProject = convertTSLintDisableCommentsForProject;
-//# sourceMappingURL=convert-to-eslint-config.js.map

package/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"convert-to-eslint-config.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.ts"],"names":[],"mappings":"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"}