@nrwl/linter 10.3.0-rc.1 → 10.3.0
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/jest.config.js +2 -2
- package/migrations.json +5 -0
- package/package.json +2 -2
- package/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.d.ts +1 -0
- package/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.js +18 -0
- package/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.js.map +1 -0
- package/src/migrations/update-10-3-0/update-eslint-builder-and-config.js +37 -15
- package/src/migrations/update-10-3-0/update-eslint-builder-and-config.js.map +1 -1
package/jest.config.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
module.exports = {
|
|
2
|
-
|
|
3
|
-
preset: '../../jest.config.js',
|
|
2
|
+
preset: '../../jest.preset.js',
|
|
4
3
|
transform: {
|
|
5
4
|
'^.+\\.[tj]sx?$': 'ts-jest',
|
|
6
5
|
},
|
|
7
6
|
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
|
|
8
7
|
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
|
|
8
|
+
displayName: 'linter',
|
|
9
9
|
};
|
package/migrations.json
CHANGED
|
@@ -14,6 +14,11 @@
|
|
|
14
14
|
"version": "10.3.0-beta.2",
|
|
15
15
|
"description": "Add explicit .json file extension to .eslintrc files, not using an extension is deprecated",
|
|
16
16
|
"factory": "./src/migrations/update-10-3-0/add-json-ext-to-eslintrc"
|
|
17
|
+
},
|
|
18
|
+
"add-root-eslintrc-json-to-workspace-implicit-deps": {
|
|
19
|
+
"version": "10.3.0-beta.3",
|
|
20
|
+
"description": "Update implicitDependencies within nx.json to include root .eslintrc.json",
|
|
21
|
+
"factory": "./src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps"
|
|
17
22
|
}
|
|
18
23
|
},
|
|
19
24
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/linter",
|
|
3
|
-
"version": "10.3.0
|
|
3
|
+
"version": "10.3.0",
|
|
4
4
|
"description": "Lint Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"builders": "./builders.json",
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@nrwl/workspace": "10.3.0
|
|
31
|
+
"@nrwl/workspace": "10.3.0"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@angular-devkit/architect": "~0.1001.3",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function (): import("@angular-devkit/schematics").Rule;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
|
+
const workspace_1 = require("@nrwl/workspace");
|
|
5
|
+
function addRootESLintrcToImplicitDependencies(host) {
|
|
6
|
+
return host.exists('nx.json')
|
|
7
|
+
? workspace_1.updateJsonInTree('nx.json', (json) => {
|
|
8
|
+
const implicitDependencies = json.implicitDependencies || {};
|
|
9
|
+
json.implicitDependencies['.eslintrc.json'] = '*';
|
|
10
|
+
return json;
|
|
11
|
+
})
|
|
12
|
+
: schematics_1.noop();
|
|
13
|
+
}
|
|
14
|
+
function default_1() {
|
|
15
|
+
return schematics_1.chain([addRootESLintrcToImplicitDependencies, workspace_1.formatFiles()]);
|
|
16
|
+
}
|
|
17
|
+
exports.default = default_1;
|
|
18
|
+
//# sourceMappingURL=add-root-eslintrc-json-to-workspace-implicit-deps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-root-eslintrc-json-to-workspace-implicit-deps.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps.ts"],"names":[],"mappings":";;AAAA,2DAA+D;AAC/D,+CAAgE;AAEhE,SAAS,qCAAqC,CAAC,IAAU;IACvD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAC3B,CAAC,CAAC,4BAAgB,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;YAC7D,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC;YAClD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACJ,CAAC,CAAC,iBAAI,EAAE,CAAC;AACb,CAAC;AAED;IACE,OAAO,kBAAK,CAAC,CAAC,qCAAqC,EAAE,uBAAW,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC;AAFD,4BAEC"}
|
|
@@ -16,25 +16,46 @@ function updateESLintBuilder(host) {
|
|
|
16
16
|
}
|
|
17
17
|
target.builder = '@nrwl/linter:eslint';
|
|
18
18
|
const tsconfigs = [];
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
if (options.tsConfig) {
|
|
20
|
+
const normalizedTsConfigOption = Array.isArray(options.tsConfig)
|
|
21
|
+
? options.tsConfig
|
|
22
|
+
: [options.tsConfig];
|
|
23
|
+
normalizedTsConfigOption.forEach((tsConfigPath) => {
|
|
24
|
+
try {
|
|
25
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, tsConfigPath));
|
|
26
|
+
}
|
|
27
|
+
catch (_a) { }
|
|
28
|
+
try {
|
|
29
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.json`));
|
|
30
|
+
}
|
|
31
|
+
catch (_b) { }
|
|
32
|
+
});
|
|
21
33
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
34
|
+
else {
|
|
35
|
+
try {
|
|
36
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.json`));
|
|
37
|
+
}
|
|
38
|
+
catch (_a) { }
|
|
39
|
+
try {
|
|
40
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.app.json`));
|
|
41
|
+
}
|
|
42
|
+
catch (_b) { }
|
|
43
|
+
try {
|
|
44
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.lib.json`));
|
|
45
|
+
}
|
|
46
|
+
catch (_c) { }
|
|
47
|
+
try {
|
|
48
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.spec.json`));
|
|
49
|
+
}
|
|
50
|
+
catch (_d) { }
|
|
51
|
+
try {
|
|
52
|
+
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.e2e.json`));
|
|
53
|
+
}
|
|
54
|
+
catch (_e) { }
|
|
25
55
|
}
|
|
26
|
-
catch (_b) { }
|
|
27
|
-
try {
|
|
28
|
-
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.lib.json`));
|
|
29
|
-
}
|
|
30
|
-
catch (_c) { }
|
|
31
|
-
try {
|
|
32
|
-
tsconfigs.push(workspace_1.readJsonInTree(host, `${project.root}/tsconfig.spec.json`));
|
|
33
|
-
}
|
|
34
|
-
catch (_d) { }
|
|
35
56
|
const defaultLintFilePatterns = [`${project.root}/**/*.ts`];
|
|
36
57
|
// Merge any available `includes` and `files` from the tsconfig files
|
|
37
|
-
|
|
58
|
+
let lintFilePatterns = !tsconfigs.length
|
|
38
59
|
? defaultLintFilePatterns
|
|
39
60
|
: tsconfigs
|
|
40
61
|
.map((tsconfig) => {
|
|
@@ -42,6 +63,7 @@ function updateESLintBuilder(host) {
|
|
|
42
63
|
})
|
|
43
64
|
.reduce((flat, val) => flat.concat(val), [])
|
|
44
65
|
.map((pattern) => core_1.join(core_1.normalize(project.root), pattern));
|
|
66
|
+
lintFilePatterns = [...new Set(lintFilePatterns)];
|
|
45
67
|
return { lintFilePatterns };
|
|
46
68
|
}, '@nrwl/linter:lint');
|
|
47
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-eslint-builder-and-config.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAIyB;AACzB,+CAAuD;AAEvD;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,IAAU;IACrC,OAAO,+BAAmB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,OAAO,OAAO,CAAC;SAChB;QACD,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC;QAEvC,MAAM,SAAS,GAAG,EAAE,CAAC;QAErB,IAAI;
|
|
1
|
+
{"version":3,"file":"update-eslint-builder-and-config.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.ts"],"names":[],"mappings":"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"}
|