@nrwl/linter 14.6.0-beta.4 → 14.6.0-beta.5
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/CHANGELOG.md +9 -1
- package/package.json +5 -5
- package/src/generators/init/init.d.ts +0 -1
- package/src/generators/init/init.js +51 -63
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/lint-project/lint-project.d.ts +0 -1
- package/src/generators/lint-project/lint-project.js +0 -1
- package/src/generators/lint-project/lint-project.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.6.0-beta.
|
|
6
|
+
# [14.6.0-beta.5](https://github.com/nrwl/nx/compare/14.5.7...14.6.0-beta.5) (2022-08-18)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @nrwl/linter
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [14.5.7](https://github.com/nrwl/nx/compare/14.5.6...14.5.7) (2022-08-17)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @nrwl/linter
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/linter",
|
|
3
|
-
"version": "14.6.0-beta.
|
|
3
|
+
"version": "14.6.0-beta.5",
|
|
4
4
|
"description": "The Linter plugin contains executors, generator, plugin and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"eslint": "^8.0.0"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@nrwl/devkit": "14.6.0-beta.
|
|
37
|
-
"@nrwl/jest": "14.6.0-beta.
|
|
36
|
+
"@nrwl/devkit": "14.6.0-beta.5",
|
|
37
|
+
"@nrwl/jest": "14.6.0-beta.5",
|
|
38
38
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
39
|
-
"nx": "14.6.0-beta.
|
|
39
|
+
"nx": "14.6.0-beta.5",
|
|
40
40
|
"tmp": "~0.2.1",
|
|
41
41
|
"tslib": "^2.3.0"
|
|
42
42
|
},
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"optional": true
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "15d83258fe3b9e0c4143d937868f77f040e30bb0"
|
|
49
49
|
}
|
|
@@ -2,7 +2,6 @@ import type { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
|
2
2
|
import { Linter } from '../utils/linter';
|
|
3
3
|
export interface LinterInitOptions {
|
|
4
4
|
linter?: Linter;
|
|
5
|
-
unitTestRunner?: string;
|
|
6
5
|
skipPackageJson?: boolean;
|
|
7
6
|
}
|
|
8
7
|
export declare function lintInitGenerator(tree: Tree, options: LinterInitOptions): GeneratorCallback;
|
|
@@ -67,76 +67,64 @@ const globalTsLintConfiguration = {
|
|
|
67
67
|
],
|
|
68
68
|
},
|
|
69
69
|
};
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
70
|
+
const globalEsLintConfiguration = {
|
|
71
|
+
root: true,
|
|
72
|
+
ignorePatterns: ['**/*'],
|
|
73
|
+
plugins: ['@nrwl/nx'],
|
|
74
|
+
/**
|
|
75
|
+
* We leverage ESLint's "overrides" capability so that we can set up a root config which will support
|
|
76
|
+
* all permutations of Nx workspaces across all frameworks, libraries and tools.
|
|
77
|
+
*
|
|
78
|
+
* The key point is that we need entirely different ESLint config to apply to different types of files,
|
|
79
|
+
* but we still want to share common config where possible.
|
|
80
|
+
*/
|
|
81
|
+
overrides: [
|
|
75
82
|
/**
|
|
76
|
-
*
|
|
77
|
-
*
|
|
78
|
-
*
|
|
79
|
-
* The key point is that we need entirely different ESLint config to apply to different types of files,
|
|
80
|
-
* but we still want to share common config where possible.
|
|
83
|
+
* This configuration is intended to apply to all "source code" (but not
|
|
84
|
+
* markup like HTML, or other custom file types like GraphQL)
|
|
81
85
|
*/
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
depConstraints: [
|
|
96
|
-
{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },
|
|
97
|
-
],
|
|
98
|
-
},
|
|
99
|
-
],
|
|
100
|
-
},
|
|
86
|
+
{
|
|
87
|
+
files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
|
|
88
|
+
rules: {
|
|
89
|
+
'@nrwl/nx/enforce-module-boundaries': [
|
|
90
|
+
'error',
|
|
91
|
+
{
|
|
92
|
+
enforceBuildableLibDependency: true,
|
|
93
|
+
allow: [],
|
|
94
|
+
depConstraints: [
|
|
95
|
+
{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },
|
|
96
|
+
],
|
|
97
|
+
},
|
|
98
|
+
],
|
|
101
99
|
},
|
|
100
|
+
},
|
|
101
|
+
/**
|
|
102
|
+
* This configuration is intended to apply to all TypeScript source files.
|
|
103
|
+
* See the eslint-plugin-nx package for what is in the referenced shareable config.
|
|
104
|
+
*/
|
|
105
|
+
{
|
|
106
|
+
files: ['*.ts', '*.tsx'],
|
|
107
|
+
extends: ['plugin:@nrwl/nx/typescript'],
|
|
102
108
|
/**
|
|
103
|
-
*
|
|
104
|
-
*
|
|
109
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
110
|
+
* extend things from if they needed to
|
|
105
111
|
*/
|
|
106
|
-
{
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
112
|
+
rules: {},
|
|
113
|
+
},
|
|
114
|
+
/**
|
|
115
|
+
* This configuration is intended to apply to all JavaScript source files.
|
|
116
|
+
* See the eslint-plugin-nx package for what is in the referenced shareable config.
|
|
117
|
+
*/
|
|
118
|
+
{
|
|
119
|
+
files: ['*.js', '*.jsx'],
|
|
120
|
+
extends: ['plugin:@nrwl/nx/javascript'],
|
|
115
121
|
/**
|
|
116
|
-
*
|
|
117
|
-
*
|
|
122
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
123
|
+
* extend things from if they needed to
|
|
118
124
|
*/
|
|
119
|
-
{
|
|
120
|
-
files: ['*.js', '*.jsx'],
|
|
121
|
-
extends: ['plugin:@nrwl/nx/javascript'],
|
|
122
|
-
/**
|
|
123
|
-
* Having an empty rules object present makes it more obvious to the user where they would
|
|
124
|
-
* extend things from if they needed to
|
|
125
|
-
*/
|
|
126
|
-
rules: {},
|
|
127
|
-
},
|
|
128
|
-
],
|
|
129
|
-
};
|
|
130
|
-
if (unitTestRunner === 'jest') {
|
|
131
|
-
config.overrides.push({
|
|
132
|
-
files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
|
|
133
|
-
env: {
|
|
134
|
-
jest: true,
|
|
135
|
-
},
|
|
136
125
|
rules: {},
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
return config;
|
|
126
|
+
},
|
|
127
|
+
],
|
|
140
128
|
};
|
|
141
129
|
function initTsLint(tree, options) {
|
|
142
130
|
if (tree.exists('/tslint.json')) {
|
|
@@ -157,7 +145,7 @@ function initEsLint(tree, options) {
|
|
|
157
145
|
if (!options.skipPackageJson) {
|
|
158
146
|
(0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nrwl/linter'], []);
|
|
159
147
|
}
|
|
160
|
-
(0, devkit_1.writeJson)(tree, '.eslintrc.json',
|
|
148
|
+
(0, devkit_1.writeJson)(tree, '.eslintrc.json', globalEsLintConfiguration);
|
|
161
149
|
if (tree.exists('.vscode/extensions.json')) {
|
|
162
150
|
(0, devkit_1.updateJson)(tree, '.vscode/extensions.json', (json) => {
|
|
163
151
|
json.recommendations || (json.recommendations = []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,mDAO8B;AAE9B,4CAAyC;AACzC,sDAAsD;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ interface LintProjectOptions {
|
|
|
8
8
|
skipFormat: boolean;
|
|
9
9
|
setParserOptionsProject?: boolean;
|
|
10
10
|
skipPackageJson?: boolean;
|
|
11
|
-
unitTestRunner?: string;
|
|
12
11
|
}
|
|
13
12
|
export declare function lintProjectGenerator(tree: Tree, options: LintProjectOptions): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
14
13
|
export {};
|
|
@@ -64,7 +64,6 @@ function lintProjectGenerator(tree, options) {
|
|
|
64
64
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
const installTask = (0, init_1.lintInitGenerator)(tree, {
|
|
66
66
|
linter: options.linter,
|
|
67
|
-
unitTestRunner: options.unitTestRunner,
|
|
68
67
|
skipPackageJson: options.skipPackageJson,
|
|
69
68
|
});
|
|
70
69
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,4CAAyC;AACzC,sDAAsD;AACtD,+BAA4B;AAC5B,uCAAiD;
|
|
1
|
+
{"version":3,"file":"lint-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"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"}
|