@nrwl/linter 13.1.2 → 13.2.0-beta.3
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/README.md +1 -1
- 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
package/README.md
CHANGED
|
@@ -116,6 +116,6 @@ Even though Nx isn't technology specific, we provide 3 separate flavours of the
|
|
|
116
116
|
|
|
117
117
|
# Engage with the Core Team and the Community
|
|
118
118
|
|
|
119
|
-
- [Nx
|
|
119
|
+
- [The Nx Show Playlist on YouTube](https://www.youtube.com/playlist?list=PLakNactNC1dE8KLQ5zd3fQwu_yQHjTmR5). It's a regular YouTube stream where we talk all things Nx. Join the stream, ask questions, etc.
|
|
120
120
|
- [Follow Nx on Twitter](https://twitter.com/NxDevTools)
|
|
121
121
|
|
package/index.js
CHANGED
|
@@ -8,5 +8,5 @@ var init_1 = require("./src/generators/init/init");
|
|
|
8
8
|
Object.defineProperty(exports, "lintInitGenerator", { enumerable: true, get: function () { return init_1.lintInitGenerator; } });
|
|
9
9
|
var linter_1 = require("./src/generators/utils/linter");
|
|
10
10
|
Object.defineProperty(exports, "Linter", { enumerable: true, get: function () { return linter_1.Linter; } });
|
|
11
|
-
tslib_1.__exportStar(require("./src/utils/convert-tslint-to-eslint"), exports);
|
|
11
|
+
(0, tslib_1.__exportStar)(require("./src/utils/convert-tslint-to-eslint"), exports);
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/linter/index.ts"],"names":[],"mappings":";;;;AAAA,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,mDAA+D;AAAtD,yGAAA,iBAAiB,OAAA;AAC1B,wDAAuD;AAA9C,gGAAA,MAAM,OAAA;AACf
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/linter/index.ts"],"names":[],"mappings":";;;;AAAA,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,mDAA+D;AAAtD,yGAAA,iBAAiB,OAAA;AAC1B,wDAAuD;AAA9C,gGAAA,MAAM,OAAA;AACf,oFAAqD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/linter",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0-beta.3",
|
|
4
4
|
"description": "Lint Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"builders": "./executors.json",
|
|
31
31
|
"schematics": "./generators.json",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@nrwl/devkit": "13.
|
|
34
|
-
"@nrwl/jest": "13.
|
|
33
|
+
"@nrwl/devkit": "13.2.0-beta.3",
|
|
34
|
+
"@nrwl/jest": "13.2.0-beta.3",
|
|
35
35
|
"eslint": "7.32.0",
|
|
36
36
|
"glob": "7.1.4",
|
|
37
37
|
"minimatch": "3.0.4",
|
|
38
38
|
"tmp": "~0.2.1",
|
|
39
|
-
"tslib": "^2.
|
|
39
|
+
"tslib": "^2.3.0"
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nrwl/devkit");
|
|
4
4
|
const lint_impl_1 = require("./lint.impl");
|
|
5
|
-
exports.default = devkit_1.convertNxExecutor(lint_impl_1.default);
|
|
5
|
+
exports.default = (0, devkit_1.convertNxExecutor)(lint_impl_1.default);
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,2CAAuC;AAEvC,kBAAe,0BAAiB,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,2CAAuC;AAEvC,kBAAe,IAAA,0BAAiB,EAAC,mBAAY,CAAC,CAAC"}
|
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
5
5
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
6
6
|
function run(task, taskGraph, hasher) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
8
|
if (task.overrides['hasTypeAwareRules'] === true) {
|
|
9
9
|
return hasher.hashTaskWithDepsAndContext(task);
|
|
10
10
|
}
|
|
@@ -8,7 +8,7 @@ const eslint_utils_1 = require("./utility/eslint-utils");
|
|
|
8
8
|
const create_directory_1 = require("./utility/create-directory");
|
|
9
9
|
function run(options, context) {
|
|
10
10
|
var _a, _b, _c, _d, _e;
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
// this is only used for the hasher
|
|
13
13
|
delete options.hasTypeAwareRules;
|
|
14
14
|
const systemRoot = context.root;
|
|
@@ -18,7 +18,7 @@ function run(options, context) {
|
|
|
18
18
|
if (printInfo) {
|
|
19
19
|
console.info(`\nLinting ${JSON.stringify(projectName)}...`);
|
|
20
20
|
}
|
|
21
|
-
const projectESLint = yield eslint_utils_1.loadESLint();
|
|
21
|
+
const projectESLint = yield (0, eslint_utils_1.loadESLint)();
|
|
22
22
|
const version = (_b = (_a = projectESLint.ESLint) === null || _a === void 0 ? void 0 : _a.version) === null || _b === void 0 ? void 0 : _b.split('.');
|
|
23
23
|
if (!version ||
|
|
24
24
|
version.length < 2 ||
|
|
@@ -32,11 +32,11 @@ function run(options, context) {
|
|
|
32
32
|
* eslint automatically resolve the `.eslintrc.json` files in each folder.
|
|
33
33
|
*/
|
|
34
34
|
const eslintConfigPath = options.eslintConfig
|
|
35
|
-
? path_1.resolve(systemRoot, options.eslintConfig)
|
|
35
|
+
? (0, path_1.resolve)(systemRoot, options.eslintConfig)
|
|
36
36
|
: undefined;
|
|
37
37
|
let lintResults = [];
|
|
38
38
|
try {
|
|
39
|
-
lintResults = yield eslint_utils_1.lint(eslintConfigPath, options);
|
|
39
|
+
lintResults = yield (0, eslint_utils_1.lint)(eslintConfigPath, options);
|
|
40
40
|
}
|
|
41
41
|
catch (err) {
|
|
42
42
|
if (err.message.includes('You must therefore provide a value for the "parserOptions.project" property for @typescript-eslint/parser')) {
|
|
@@ -58,7 +58,7 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
|
|
|
58
58
|
throw err;
|
|
59
59
|
}
|
|
60
60
|
if (lintResults.length === 0) {
|
|
61
|
-
const ignoredPatterns = (yield Promise.all(options.lintFilePatterns.map((pattern) => tslib_1.__awaiter(this, void 0, void 0, function* () { return (yield eslint.isPathIgnored(pattern)) ? pattern : null; }))))
|
|
61
|
+
const ignoredPatterns = (yield Promise.all(options.lintFilePatterns.map((pattern) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () { return (yield eslint.isPathIgnored(pattern)) ? pattern : null; }))))
|
|
62
62
|
.filter((pattern) => !!pattern)
|
|
63
63
|
.map((pattern) => `- '${pattern}'`);
|
|
64
64
|
if (ignoredPatterns.length) {
|
|
@@ -84,9 +84,9 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
|
|
|
84
84
|
}
|
|
85
85
|
const formattedResults = formatter.format(lintResults);
|
|
86
86
|
if (options.outputFile) {
|
|
87
|
-
const pathToOutputFile = path_1.join(context.root, options.outputFile);
|
|
88
|
-
create_directory_1.createDirectory(path_1.dirname(pathToOutputFile));
|
|
89
|
-
fs_1.writeFileSync(pathToOutputFile, formattedResults);
|
|
87
|
+
const pathToOutputFile = (0, path_1.join)(context.root, options.outputFile);
|
|
88
|
+
(0, create_directory_1.createDirectory)((0, path_1.dirname)(pathToOutputFile));
|
|
89
|
+
(0, fs_1.writeFileSync)(pathToOutputFile, formattedResults);
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
92
92
|
console.info(formattedResults);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.impl.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/lint.impl.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAEhC,2BAAmC;AACnC,+BAA8C;AAG9C,yDAA0D;AAC1D,iEAA6D;AAE7D,SAA8B,GAAG,CAC/B,OAAe,EACf,OAAwB;;;QAExB,mCAAmC;QACnC,OAAO,OAAO,CAAC,iBAAiB,CAAC;QAEjC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC;QACnD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAEpD,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC7D;QAED,MAAM,aAAa,GAA8B,MAAM,yBAAU,
|
|
1
|
+
{"version":3,"file":"lint.impl.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/lint.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,18 +4,18 @@ exports.createDirectory = void 0;
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
function createDirectory(directoryPath) {
|
|
7
|
-
const parentPath = path_1.dirname(directoryPath);
|
|
7
|
+
const parentPath = (0, path_1.dirname)(directoryPath);
|
|
8
8
|
if (!directoryExists(parentPath)) {
|
|
9
9
|
createDirectory(parentPath);
|
|
10
10
|
}
|
|
11
11
|
if (!directoryExists(directoryPath)) {
|
|
12
|
-
fs_1.mkdirSync(directoryPath);
|
|
12
|
+
(0, fs_1.mkdirSync)(directoryPath);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
exports.createDirectory = createDirectory;
|
|
16
16
|
function directoryExists(name) {
|
|
17
17
|
try {
|
|
18
|
-
return fs_1.statSync(name).isDirectory();
|
|
18
|
+
return (0, fs_1.statSync)(name).isDirectory();
|
|
19
19
|
}
|
|
20
20
|
catch (_a) {
|
|
21
21
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-directory.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/eslint/utility/create-directory.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyC;AAEzC,SAAgB,eAAe,CAAC,aAAqB;IACnD,MAAM,UAAU,GAAG,cAAO,
|
|
1
|
+
{"version":3,"file":"create-directory.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/eslint/utility/create-directory.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyC;AAEzC,SAAgB,eAAe,CAAC,aAAqB;IACnD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC;IAC1C,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;QAChC,eAAe,CAAC,UAAU,CAAC,CAAC;KAC7B;IACD,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE;QACnC,IAAA,cAAS,EAAC,aAAa,CAAC,CAAC;KAC1B;AACH,CAAC;AARD,0CAQC;AAED,SAAS,eAAe,CAAC,IAAY;IACnC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;KACrC;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.lint = exports.loadESLint = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
function loadESLint() {
|
|
6
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
6
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
7
7
|
let eslint;
|
|
8
8
|
try {
|
|
9
9
|
eslint = yield Promise.resolve().then(() => require('eslint'));
|
|
@@ -16,7 +16,7 @@ function loadESLint() {
|
|
|
16
16
|
}
|
|
17
17
|
exports.loadESLint = loadESLint;
|
|
18
18
|
function lint(eslintConfigPath, options) {
|
|
19
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
20
20
|
const projectESLint = yield loadESLint();
|
|
21
21
|
const eslint = new projectESLint.ESLint({
|
|
22
22
|
/**
|
|
@@ -10,7 +10,7 @@ const create_directory_1 = require("../eslint/utility/create-directory");
|
|
|
10
10
|
* Adapted from @angular-eslint/builder source
|
|
11
11
|
*/
|
|
12
12
|
function run(options, context) {
|
|
13
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
14
14
|
if (options.linter === 'tslint') {
|
|
15
15
|
throw new Error(`'tslint' option is no longer supported. Update your angular.json to use "@nrwl/linter:eslint" builder.`);
|
|
16
16
|
}
|
|
@@ -21,7 +21,7 @@ function run(options, context) {
|
|
|
21
21
|
if (printInfo) {
|
|
22
22
|
console.info(`\nLinting ${JSON.stringify(projectName)}...`);
|
|
23
23
|
}
|
|
24
|
-
const projectESLint = yield eslint_utils_1.loadESLint();
|
|
24
|
+
const projectESLint = yield (0, eslint_utils_1.loadESLint)();
|
|
25
25
|
const version = projectESLint.Linter.version &&
|
|
26
26
|
projectESLint.Linter.version.split('.');
|
|
27
27
|
if (!version ||
|
|
@@ -41,18 +41,18 @@ function run(options, context) {
|
|
|
41
41
|
const tsConfigs = Array.isArray(options.tsConfig)
|
|
42
42
|
? options.tsConfig
|
|
43
43
|
: [options.tsConfig];
|
|
44
|
-
const allPrograms = tsConfigs.map((tsConfig) => ts_utils_1.createProgram(path.resolve(systemRoot, tsConfig)));
|
|
44
|
+
const allPrograms = tsConfigs.map((tsConfig) => (0, ts_utils_1.createProgram)(path.resolve(systemRoot, tsConfig)));
|
|
45
45
|
for (const program of allPrograms) {
|
|
46
46
|
lintReports = [
|
|
47
47
|
...lintReports,
|
|
48
|
-
...(yield eslint_utils_1.lint(systemRoot, eslintConfigPath, options, lintedFiles, program, allPrograms)),
|
|
48
|
+
...(yield (0, eslint_utils_1.lint)(systemRoot, eslintConfigPath, options, lintedFiles, program, allPrograms)),
|
|
49
49
|
];
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
lintReports = [
|
|
54
54
|
...lintReports,
|
|
55
|
-
...(yield eslint_utils_1.lint(systemRoot, eslintConfigPath, options, lintedFiles)),
|
|
55
|
+
...(yield (0, eslint_utils_1.lint)(systemRoot, eslintConfigPath, options, lintedFiles)),
|
|
56
56
|
];
|
|
57
57
|
}
|
|
58
58
|
if (lintReports.length === 0) {
|
|
@@ -83,8 +83,8 @@ function run(options, context) {
|
|
|
83
83
|
console.info(formattedResults);
|
|
84
84
|
if (options.outputFile) {
|
|
85
85
|
const pathToFile = path.join(context.root, options.outputFile);
|
|
86
|
-
create_directory_1.createDirectory(path.dirname(pathToFile));
|
|
87
|
-
fs_1.writeFileSync(pathToFile, formattedResults);
|
|
86
|
+
(0, create_directory_1.createDirectory)(path.dirname(pathToFile));
|
|
87
|
+
(0, fs_1.writeFileSync)(pathToFile, formattedResults);
|
|
88
88
|
}
|
|
89
89
|
if (bundledReport.warningCount > 0 && printInfo) {
|
|
90
90
|
console.warn('Lint warnings found in the listed files.\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.impl.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/lint/lint.impl.ts"],"names":[],"mappings":";;;AACA,2BAAmC;AACnC,6BAA6B;AAE7B,iDAAmD;AACnD,yDAA0D;AAC1D,yEAAqE;AAGrE;;GAEG;AACH,SAA8B,GAAG,CAC/B,OAAe,EACf,OAAwB;;QAExB,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;SACH;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC;QAEnD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAEpD,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC7D;QAED,MAAM,aAAa,GAAG,MAAM,yBAAU,
|
|
1
|
+
{"version":3,"file":"lint.impl.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/lint/lint.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const eslint_1 = require("eslint");
|
|
|
8
8
|
* Copied from @angular-eslint/builder source
|
|
9
9
|
*/
|
|
10
10
|
function loadESLint() {
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
let eslint;
|
|
13
13
|
try {
|
|
14
14
|
eslint = yield Promise.resolve().then(() => require('eslint'));
|
|
@@ -24,8 +24,8 @@ exports.loadESLint = loadESLint;
|
|
|
24
24
|
* Adapted from @angular-eslint/builder source
|
|
25
25
|
*/
|
|
26
26
|
function lint(systemRoot, eslintConfigPath, options, lintedFiles, program, allPrograms) {
|
|
27
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
const files = file_utils_1.getFilesToLint(systemRoot, options, program);
|
|
27
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
28
|
+
const files = (0, file_utils_1.getFilesToLint)(systemRoot, options, program);
|
|
29
29
|
const projectESLint = yield loadESLint();
|
|
30
30
|
const cli = new projectESLint.CLIEngine({
|
|
31
31
|
configFile: eslintConfigPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint-utils.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/lint/utility/eslint-utils.ts"],"names":[],"mappings":";;;;AAAA,6CAA8C;AAE9C,mCAAmC;AAEnC;;GAEG;AAEH,SAAsB,UAAU;;QAC9B,IAAI,MAAM,CAAC;QACX,IAAI;YACF,MAAM,GAAG,2CAAa,QAAQ,EAAC,CAAC;YAChC,OAAO,MAAM,CAAC;SACf;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACvE;IACH,CAAC;CAAA;AARD,gCAQC;AAED;;GAEG;AAEH,SAAsB,IAAI,CACxB,UAAkB,EAClB,gBAAwB,EACxB,OAAe,EACf,WAAwB,EACxB,OAAa,EACb,WAAmB;;QAEnB,MAAM,KAAK,GAAG,2BAAc,
|
|
1
|
+
{"version":3,"file":"eslint-utils.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/lint/utility/eslint-utils.ts"],"names":[],"mappings":";;;;AAAA,6CAA8C;AAE9C,mCAAmC;AAEnC;;GAEG;AAEH,SAAsB,UAAU;;QAC9B,IAAI,MAAM,CAAC;QACX,IAAI;YACF,MAAM,GAAG,2CAAa,QAAQ,EAAC,CAAC;YAChC,OAAO,MAAM,CAAC;SACf;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACvE;IACH,CAAC;CAAA;AARD,gCAQC;AAED;;GAEG;AAEH,SAAsB,IAAI,CACxB,UAAkB,EAClB,gBAAwB,EACxB,OAAe,EACf,WAAwB,EACxB,OAAa,EACb,WAAmB;;QAEnB,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,MAAM,UAAU,EAAE,CAAC;QACzC,MAAM,GAAG,GAAc,IAAI,aAAa,CAAC,SAAS,CAAC;YACjD,UAAU,EAAE,gBAAgB;YAC5B,WAAW,EAAE,IAAI;YACjB,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;YAClB,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK;YACtB,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;QAEH,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,IAAI,WAAW,EAAE;gBAC1B,+DAA+D;gBAC/D,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,EAAE;oBACjE,MAAM,IAAI,KAAK,CACb,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,yCAC1B,OAAO,CAAC,QACV,IAAI,CACL,CAAC;iBACH;qBAAM,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;oBACpD,0FAA0F;oBAC1F,SAAS;iBACV;aACF;YAED,sDAAsD;YACtD,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACzB,SAAS;aACV;YAED,qEAAqE;YACrE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1C,IAAI,OAAO,CAAC,KAAK,EAAE;gBACjB,MAAM,CAAC,OAAO,GAAG,kBAAS,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3D,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;aACvB;YACD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACvB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AArDD,oBAqDC"}
|
|
@@ -37,7 +37,7 @@ function createProgram(configFile, projectDirectory = path.dirname(configFile))
|
|
|
37
37
|
const parseConfigHost = {
|
|
38
38
|
fileExists: fs_1.existsSync,
|
|
39
39
|
readDirectory: ts.sys.readDirectory,
|
|
40
|
-
readFile: (file) => fs_1.readFileSync(file, 'utf8'),
|
|
40
|
+
readFile: (file) => (0, fs_1.readFileSync)(file, 'utf8'),
|
|
41
41
|
useCaseSensitiveFileNames: true,
|
|
42
42
|
};
|
|
43
43
|
const parsed = ts.parseJsonConfigFileContent(config.config, parseConfigHost, path.resolve(projectDirectory), { noEmit: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-utils.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/lint/utility/ts-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,iCAAiC;AACjC,6BAA6B;AAgB7B;;;;GAIG;AACH,MAAM,UAAW,SAAQ,KAAK;IAE5B,YAAmB,OAAe,EAAS,UAAkB;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,YAAO,GAAP,OAAO,CAAQ;QAAS,eAAU,GAAV,UAAU,CAAQ;QAE3D,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE5B,qCAAqC;QACrC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;;AAPa,eAAI,GAAG,YAAY,CAAC;AAUpC;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,UAAkB,EAClB,mBAA2B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IAEnD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;QAC9B,MAAM,IAAI,UAAU,CAClB,EAAE,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACnC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,mBAAmB,EAAE,OAAO,CAAC,GAAG;YAChC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;SACvB,CAAC,CACH,CAAC;KACH;IACD,MAAM,eAAe,GAAuB;QAC1C,UAAU,EAAE,eAAU;QACtB,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa;QACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAY,
|
|
1
|
+
{"version":3,"file":"ts-utils.js","sourceRoot":"","sources":["../../../../../../../packages/linter/src/executors/lint/utility/ts-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,iCAAiC;AACjC,6BAA6B;AAgB7B;;;;GAIG;AACH,MAAM,UAAW,SAAQ,KAAK;IAE5B,YAAmB,OAAe,EAAS,UAAkB;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,YAAO,GAAP,OAAO,CAAQ;QAAS,eAAU,GAAV,UAAU,CAAQ;QAE3D,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAE5B,qCAAqC;QACrC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;;AAPa,eAAI,GAAG,YAAY,CAAC;AAUpC;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,UAAkB,EAClB,mBAA2B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IAEnD,MAAM,MAAM,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;QAC9B,MAAM,IAAI,UAAU,CAClB,EAAE,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACnC,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,mBAAmB,EAAE,OAAO,CAAC,GAAG;YAChC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;SACvB,CAAC,CACH,CAAC;KACH;IACD,MAAM,eAAe,GAAuB;QAC1C,UAAU,EAAE,eAAU;QACtB,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa;QACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,MAAM,CAAC;QAC9C,yBAAyB,EAAE,IAAI;KAChC,CAAC;IACF,MAAM,MAAM,GAAG,EAAE,CAAC,0BAA0B,CAC1C,MAAM,CAAC,MAAM,EACb,eAAe,EACf,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC9B,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;QAC/B,yEAAyE;QACzE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,KAAK,CACtE,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,MAAM,IAAI,UAAU,CAClB,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE;gBAC3B,oBAAoB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9B,mBAAmB,EAAE,OAAO,CAAC,GAAG;gBAChC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;aACvB,CAAC,CACH,CAAC;SACH;KACF;IACD,MAAM,IAAI,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEzE,OAAO,OAAO,CAAC;AACjB,CAAC;AA7CD,sCA6CC"}
|
|
@@ -129,8 +129,8 @@ function initTsLint(tree) {
|
|
|
129
129
|
if (tree.exists('/tslint.json')) {
|
|
130
130
|
return () => { };
|
|
131
131
|
}
|
|
132
|
-
devkit_1.writeJson(tree, 'tslint.json', globalTsLintConfiguration);
|
|
133
|
-
return devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
132
|
+
(0, devkit_1.writeJson)(tree, 'tslint.json', globalTsLintConfiguration);
|
|
133
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
134
134
|
tslint: versions_1.tslintVersion,
|
|
135
135
|
'@angular-devkit/build-angular': versions_1.buildAngularVersion,
|
|
136
136
|
});
|
|
@@ -139,14 +139,14 @@ function initEsLint(tree) {
|
|
|
139
139
|
if (tree.exists('/.eslintrc.json')) {
|
|
140
140
|
return () => { };
|
|
141
141
|
}
|
|
142
|
-
devkit_1.updateJson(tree, 'package.json', (json) => {
|
|
142
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
143
143
|
json.dependencies || (json.dependencies = {});
|
|
144
144
|
delete json.dependencies['@nrwl/linter'];
|
|
145
145
|
return json;
|
|
146
146
|
});
|
|
147
|
-
devkit_1.writeJson(tree, '.eslintrc.json', globalEsLintConfiguration);
|
|
147
|
+
(0, devkit_1.writeJson)(tree, '.eslintrc.json', globalEsLintConfiguration);
|
|
148
148
|
if (tree.exists('.vscode/extensions.json')) {
|
|
149
|
-
devkit_1.updateJson(tree, '.vscode/extensions.json', (json) => {
|
|
149
|
+
(0, devkit_1.updateJson)(tree, '.vscode/extensions.json', (json) => {
|
|
150
150
|
json.recommendations || (json.recommendations = []);
|
|
151
151
|
const extension = 'dbaeumer.vscode-eslint';
|
|
152
152
|
if (!json.recommendations.includes(extension)) {
|
|
@@ -155,7 +155,7 @@ function initEsLint(tree) {
|
|
|
155
155
|
return json;
|
|
156
156
|
});
|
|
157
157
|
}
|
|
158
|
-
return devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
158
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
159
159
|
'@nrwl/linter': versions_1.nxVersion,
|
|
160
160
|
'@nrwl/eslint-plugin-nx': versions_1.nxVersion,
|
|
161
161
|
'@typescript-eslint/parser': versions_1.typescriptESLintVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ const path_1 = require("path");
|
|
|
7
7
|
const linter_1 = require("../utils/linter");
|
|
8
8
|
const init_1 = require("../init/init");
|
|
9
9
|
function createTsLintConfiguration(tree, projectConfig) {
|
|
10
|
-
devkit_1.writeJson(tree, path_1.join(projectConfig.root, `tslint.json`), {
|
|
11
|
-
extends: `${devkit_1.offsetFromRoot(projectConfig.root)}tslint.json`,
|
|
10
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `tslint.json`), {
|
|
11
|
+
extends: `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}tslint.json`,
|
|
12
12
|
// Include project files to be linted since the global one excludes all files.
|
|
13
13
|
linterOptions: {
|
|
14
14
|
exclude: ['!**/*'],
|
|
@@ -17,8 +17,8 @@ function createTsLintConfiguration(tree, projectConfig) {
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject) {
|
|
20
|
-
devkit_1.writeJson(tree, path_1.join(projectConfig.root, `.eslintrc.json`), {
|
|
21
|
-
extends: [`${devkit_1.offsetFromRoot(projectConfig.root)}.eslintrc.json`],
|
|
20
|
+
(0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
|
|
21
|
+
extends: [`${(0, devkit_1.offsetFromRoot)(projectConfig.root)}.eslintrc.json`],
|
|
22
22
|
// Include project files to be linted since the global one excludes all files.
|
|
23
23
|
ignorePatterns: ['!**/*'],
|
|
24
24
|
overrides: [
|
|
@@ -60,11 +60,11 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
function lintProjectGenerator(tree, options) {
|
|
63
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
|
-
const installTask = init_1.lintInitGenerator(tree, {
|
|
63
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
64
|
+
const installTask = (0, init_1.lintInitGenerator)(tree, {
|
|
65
65
|
linter: options.linter,
|
|
66
66
|
});
|
|
67
|
-
const projectConfig = devkit_1.readProjectConfiguration(tree, options.project);
|
|
67
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
68
68
|
if (options.linter === linter_1.Linter.EsLint) {
|
|
69
69
|
projectConfig.targets['lint'] = {
|
|
70
70
|
executor: '@nrwl/linter:eslint',
|
|
@@ -85,9 +85,9 @@ function lintProjectGenerator(tree, options) {
|
|
|
85
85
|
};
|
|
86
86
|
createTsLintConfiguration(tree, projectConfig);
|
|
87
87
|
}
|
|
88
|
-
devkit_1.updateProjectConfiguration(tree, options.project, projectConfig);
|
|
88
|
+
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
89
89
|
if (!options.skipFormat) {
|
|
90
|
-
yield devkit_1.formatFiles(tree);
|
|
90
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
91
91
|
}
|
|
92
92
|
return installTask;
|
|
93
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,+BAA4B;AAC5B,4CAAyC;AACzC,uCAAiD;AAWjD,SAAS,yBAAyB,CAChC,IAAU,EACV,aAAmC;IAEnC,kBAAS,
|
|
1
|
+
{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,+BAA4B;AAC5B,4CAAyC;AACzC,uCAAiD;AAWjD,SAAS,yBAAyB,CAChC,IAAU,EACV,aAAmC;IAEnC,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;QACvD,OAAO,EAAE,GAAG,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,aAAa;QAC3D,8EAA8E;QAC9E,aAAa,EAAE;YACb,OAAO,EAAE,CAAC,OAAO,CAAC;SACnB;QACD,KAAK,EAAE,EAAE;KACV,CAAC,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,aAAmC,EACnC,uBAAgC;IAEhC,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE;QAC1D,OAAO,EAAE,CAAC,GAAG,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAChE,8EAA8E;QAC9E,cAAc,EAAE,CAAC,OAAO,CAAC;QACzB,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;gBACzC;;;;;;;;;;;;mBAYG;gBACH,aAAa,EAAE,CAAC,uBAAuB;oBACrC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,mBAAmB,CAAC;qBACpD;gBACL;;;mBAGG;gBACH,KAAK,EAAE,EAAE;aACV;YACD;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;gBACxB,KAAK,EAAE,EAAE;aACV;YACD;gBACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;gBACxB,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAA2B;;QAE3B,MAAM,WAAW,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;gBAC9B,QAAQ,EAAE,qBAAqB;gBAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,gBAAgB,EAAE,OAAO,CAAC,kBAAkB;iBAC7C;aACF,CAAC;YACF,yBAAyB,CACvB,IAAI,EACJ,aAAa,EACb,OAAO,CAAC,uBAAuB,CAChC,CAAC;SACH;aAAM;YACL,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;gBAC9B,QAAQ,EAAE,sCAAsC;gBAChD,OAAO,EAAE;oBACP,QAAQ,EAAE,OAAO,CAAC,aAAa;oBAC/B,OAAO,EAAE,CAAC,oBAAoB,EAAE,IAAI,aAAa,CAAC,IAAI,OAAO,CAAC;iBAC/D;aACF,CAAC;YACF,yBAAyB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAChD;QAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAxCD,oDAwCC"}
|
|
@@ -10,21 +10,21 @@ const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
|
|
|
10
10
|
const workspace_rules_project_1 = require("../workspace-rules-project/workspace-rules-project");
|
|
11
11
|
function lintWorkspaceRuleGenerator(tree, options) {
|
|
12
12
|
var _a;
|
|
13
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
14
14
|
// Ensure that the workspace rules project has been created
|
|
15
|
-
const projectGeneratorCallback = yield workspace_rules_project_1.lintWorkspaceRulesProjectGenerator(tree);
|
|
16
|
-
const ruleDir = devkit_1.joinPathFragments(workspace_lint_rules_1.workspaceLintPluginDir, (_a = options.directory) !== null && _a !== void 0 ? _a : '');
|
|
15
|
+
const projectGeneratorCallback = yield (0, workspace_rules_project_1.lintWorkspaceRulesProjectGenerator)(tree);
|
|
16
|
+
const ruleDir = (0, devkit_1.joinPathFragments)(workspace_lint_rules_1.workspaceLintPluginDir, (_a = options.directory) !== null && _a !== void 0 ? _a : '');
|
|
17
17
|
// Generate the required files for the new rule
|
|
18
|
-
devkit_1.generateFiles(tree, path_1.join(__dirname, 'files'), ruleDir, {
|
|
18
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), ruleDir, {
|
|
19
19
|
tmpl: '',
|
|
20
20
|
name: options.name,
|
|
21
21
|
});
|
|
22
|
-
const nameCamelCase = strings_1.camelize(options.name);
|
|
22
|
+
const nameCamelCase = (0, strings_1.camelize)(options.name);
|
|
23
23
|
/**
|
|
24
24
|
* Import the new rule into the workspace plugin index.ts and
|
|
25
25
|
* register it ready for use in .eslintrc.json configs.
|
|
26
26
|
*/
|
|
27
|
-
const pluginIndexPath = devkit_1.joinPathFragments(workspace_lint_rules_1.workspaceLintPluginDir, 'index.ts');
|
|
27
|
+
const pluginIndexPath = (0, devkit_1.joinPathFragments)(workspace_lint_rules_1.workspaceLintPluginDir, 'index.ts');
|
|
28
28
|
const existingPluginIndexContents = tree.read(pluginIndexPath, 'utf-8');
|
|
29
29
|
const pluginIndexSourceFile = ts.createSourceFile(pluginIndexPath, existingPluginIndexContents, ts.ScriptTarget.Latest, true);
|
|
30
30
|
function findRulesObject(node) {
|
|
@@ -50,7 +50,7 @@ function lintWorkspaceRuleGenerator(tree, options) {
|
|
|
50
50
|
leadingComma = ',';
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
const newContents = devkit_1.applyChangesToString(existingPluginIndexContents, [
|
|
53
|
+
const newContents = (0, devkit_1.applyChangesToString)(existingPluginIndexContents, [
|
|
54
54
|
{
|
|
55
55
|
type: devkit_1.ChangeType.Insert,
|
|
56
56
|
index: 0,
|
|
@@ -64,7 +64,7 @@ function lintWorkspaceRuleGenerator(tree, options) {
|
|
|
64
64
|
]);
|
|
65
65
|
tree.write(pluginIndexPath, newContents);
|
|
66
66
|
}
|
|
67
|
-
yield devkit_1.formatFiles(tree);
|
|
67
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
68
68
|
devkit_1.logger.info(`NX Reminder: Once you have finished writing your rule logic, you need to actually enable the rule within an appropriate .eslintrc.json in your workspace, for example:
|
|
69
69
|
|
|
70
70
|
"rules": {
|
|
@@ -75,5 +75,5 @@ function lintWorkspaceRuleGenerator(tree, options) {
|
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
exports.lintWorkspaceRuleGenerator = lintWorkspaceRuleGenerator;
|
|
78
|
-
exports.lintWorkspaceRuleSchematic = devkit_1.convertNxGenerator(lintWorkspaceRuleGenerator);
|
|
78
|
+
exports.lintWorkspaceRuleSchematic = (0, devkit_1.convertNxGenerator)(lintWorkspaceRuleGenerator);
|
|
79
79
|
//# sourceMappingURL=workspace-rule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-rule.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+DAA6D;AAC7D,+BAA4B;AAC5B,iCAAiC;AACjC,2EAA0E;AAC1E,gGAAwG;AAOxG,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAA0C;;;QAE1C,2DAA2D;QAC3D,MAAM,wBAAwB,GAAG,MAAM,4DAAkC,
|
|
1
|
+
{"version":3,"file":"workspace-rule.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,32 +9,32 @@ const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
|
|
|
9
9
|
exports.WORKSPACE_RULES_PROJECT_NAME = 'eslint-rules';
|
|
10
10
|
const WORKSPACE_PLUGIN_DIR = 'tools/eslint-rules';
|
|
11
11
|
function lintWorkspaceRulesProjectGenerator(tree) {
|
|
12
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
13
|
// Noop if the workspace rules project already exists
|
|
14
14
|
try {
|
|
15
|
-
devkit_1.readProjectConfiguration(tree, exports.WORKSPACE_RULES_PROJECT_NAME);
|
|
15
|
+
(0, devkit_1.readProjectConfiguration)(tree, exports.WORKSPACE_RULES_PROJECT_NAME);
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
catch (_a) { }
|
|
19
19
|
// Create the project, the test target is added below by the jest generator
|
|
20
|
-
devkit_1.addProjectConfiguration(tree, exports.WORKSPACE_RULES_PROJECT_NAME, {
|
|
20
|
+
(0, devkit_1.addProjectConfiguration)(tree, exports.WORKSPACE_RULES_PROJECT_NAME, {
|
|
21
21
|
root: WORKSPACE_PLUGIN_DIR,
|
|
22
22
|
sourceRoot: WORKSPACE_PLUGIN_DIR,
|
|
23
23
|
targets: {},
|
|
24
24
|
});
|
|
25
25
|
// Generate the required files
|
|
26
|
-
devkit_1.generateFiles(tree, path_1.join(__dirname, 'files'), workspace_lint_rules_1.workspaceLintPluginDir, {
|
|
26
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), workspace_lint_rules_1.workspaceLintPluginDir, {
|
|
27
27
|
tmpl: '',
|
|
28
|
-
offsetFromRoot: devkit_1.offsetFromRoot(WORKSPACE_PLUGIN_DIR),
|
|
28
|
+
offsetFromRoot: (0, devkit_1.offsetFromRoot)(WORKSPACE_PLUGIN_DIR),
|
|
29
29
|
});
|
|
30
30
|
/**
|
|
31
31
|
* Ensure that when workspace rules are updated they cause all projects to be affected for now.
|
|
32
32
|
* TODO: Explore writing a ProjectGraph plugin to make this more surgical.
|
|
33
33
|
*/
|
|
34
|
-
const workspaceConfig = devkit_1.readWorkspaceConfiguration(tree);
|
|
35
|
-
devkit_1.updateWorkspaceConfiguration(tree, Object.assign(Object.assign({}, workspaceConfig), { implicitDependencies: Object.assign(Object.assign({}, workspaceConfig.implicitDependencies), { [`${WORKSPACE_PLUGIN_DIR}/**/*`]: '*' }) }));
|
|
34
|
+
const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
35
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, Object.assign(Object.assign({}, workspaceConfig), { implicitDependencies: Object.assign(Object.assign({}, workspaceConfig.implicitDependencies), { [`${WORKSPACE_PLUGIN_DIR}/**/*`]: '*' }) }));
|
|
36
36
|
// Add jest to the project and return installation task
|
|
37
|
-
return yield jest_1.jestProjectGenerator(tree, {
|
|
37
|
+
return yield (0, jest_1.jestProjectGenerator)(tree, {
|
|
38
38
|
project: exports.WORKSPACE_RULES_PROJECT_NAME,
|
|
39
39
|
supportTsx: false,
|
|
40
40
|
skipSerializers: true,
|
|
@@ -44,5 +44,5 @@ function lintWorkspaceRulesProjectGenerator(tree) {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;
|
|
47
|
-
exports.lintWorkspaceRulesProjectSchematic = devkit_1.convertNxGenerator(lintWorkspaceRulesProjectGenerator);
|
|
47
|
+
exports.lintWorkspaceRulesProjectSchematic = (0, devkit_1.convertNxGenerator)(lintWorkspaceRulesProjectGenerator);
|
|
48
48
|
//# sourceMappingURL=workspace-rules-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-rules-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,qCAAkD;AAClD,+BAA4B;AAC5B,2EAA0E;AAE7D,QAAA,4BAA4B,GAAG,cAAc,CAAC;AAE3D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,SAAsB,kCAAkC,CAAC,IAAU;;QACjE,qDAAqD;QACrD,IAAI;YACF,iCAAwB,
|
|
1
|
+
{"version":3,"file":"workspace-rules-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,qCAAkD;AAClD,+BAA4B;AAC5B,2EAA0E;AAE7D,QAAA,4BAA4B,GAAG,cAAc,CAAC;AAE3D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,SAAsB,kCAAkC,CAAC,IAAU;;QACjE,qDAAqD;QACrD,IAAI;YACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,oCAA4B,CAAC,CAAC;YAC7D,OAAO;SACR;QAAC,WAAM,GAAE;QAEV,2EAA2E;QAC3E,IAAA,gCAAuB,EAAC,IAAI,EAAE,oCAA4B,EAAE;YAC1D,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,oBAAoB;YAChC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,8BAA8B;QAC9B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,6CAAsB,EAAE;YACpE,IAAI,EAAE,EAAE;YACR,cAAc,EAAE,IAAA,uBAAc,EAAC,oBAAoB,CAAC;SACrD,CAAC,CAAC;QAEH;;;WAGG;QACH,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACzD,IAAA,qCAA4B,EAAC,IAAI,kCAC5B,eAAe,KAClB,oBAAoB,kCACf,eAAe,CAAC,oBAAoB,KACvC,CAAC,GAAG,oBAAoB,OAAO,CAAC,EAAE,GAAG,OAEvC,CAAC;QAEH,uDAAuD;QACvD,OAAO,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YACtC,OAAO,EAAE,oCAA4B;YACrC,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,KAAK;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAzCD,gFAyCC;AAEY,QAAA,kCAAkC,GAAG,IAAA,2BAAkB,EAClE,kCAAkC,CACnC,CAAC"}
|
|
@@ -4,7 +4,7 @@ const core_1 = require("@angular-devkit/core");
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
6
|
function updateESLintConfigReferencesInWorkspace() {
|
|
7
|
-
return workspace_1.updateBuilderConfig((options, target, project) => {
|
|
7
|
+
return (0, workspace_1.updateBuilderConfig)((options, target, project) => {
|
|
8
8
|
if (target.builder === '@nrwl/linter:lint' &&
|
|
9
9
|
(options === null || options === void 0 ? void 0 : options.linter) === 'tslint') {
|
|
10
10
|
return options;
|
|
@@ -26,8 +26,8 @@ function updateESLintConfigReferencesInWorkspace() {
|
|
|
26
26
|
}, '@nrwl/linter:eslint', '@nrwl/linter:lint');
|
|
27
27
|
}
|
|
28
28
|
function renameESLintConfigFiles() {
|
|
29
|
-
return workspace_1.visitNotIgnoredFiles((file, host, context) => {
|
|
30
|
-
if (core_1.basename(file) !== '.eslintrc') {
|
|
29
|
+
return (0, workspace_1.visitNotIgnoredFiles)((file, host, context) => {
|
|
30
|
+
if ((0, core_1.basename)(file) !== '.eslintrc') {
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
// Using .eslintrc without an explicit file extension is deprecated
|
|
@@ -42,10 +42,10 @@ function renameESLintConfigFiles() {
|
|
|
42
42
|
});
|
|
43
43
|
}
|
|
44
44
|
function default_1() {
|
|
45
|
-
return schematics_1.chain([
|
|
45
|
+
return (0, schematics_1.chain)([
|
|
46
46
|
renameESLintConfigFiles,
|
|
47
47
|
updateESLintConfigReferencesInWorkspace,
|
|
48
|
-
workspace_1.formatFiles(),
|
|
48
|
+
(0, workspace_1.formatFiles)(),
|
|
49
49
|
]);
|
|
50
50
|
}
|
|
51
51
|
exports.default = default_1;
|