@skyux-sdk/eslint-schematics 12.8.0 → 12.10.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/migrations.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skyux-sdk/eslint-schematics",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.10.0",
|
|
4
4
|
"author": "Blackbaud, Inc.",
|
|
5
5
|
"description": "SKY UX ESLint schematics for Angular CLI projects",
|
|
6
6
|
"keywords": [
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"packageGroupName": "@skyux-sdk/eslint-schematics",
|
|
25
25
|
"migrations": "./migrations.json",
|
|
26
26
|
"packageGroup": {
|
|
27
|
-
"skyux-eslint": "12.
|
|
27
|
+
"skyux-eslint": "12.10.0"
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
@@ -6,7 +6,19 @@ const cli_1 = require("@angular/cli");
|
|
|
6
6
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
7
7
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
8
8
|
const ESLINT_CONFIG_EXTENDS_REGEXP = /(?<=extends:\s*\[)[^\]]*(?=])/g;
|
|
9
|
-
|
|
9
|
+
function needsComma(contents) {
|
|
10
|
+
const len = contents.length;
|
|
11
|
+
for (let i = len; i > -1; i--) {
|
|
12
|
+
// Starting at the end of the string, find the first non-whitespace character
|
|
13
|
+
// and check if it's a comma. If it is, we don't need to insert one.
|
|
14
|
+
const maybeComma = contents.at(i);
|
|
15
|
+
if (maybeComma !== undefined && maybeComma.match(/[^\s]/)) {
|
|
16
|
+
return maybeComma !== ',';
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
/* istanbul ignore next: safety check */
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
10
22
|
function getRootEslintConfigFilePath(tree) {
|
|
11
23
|
if (!(0, dependencies_1.getPackageJsonDependency)(tree, 'angular-eslint')) {
|
|
12
24
|
throw new Error("The package 'angular-eslint' is not installed. " +
|
|
@@ -18,9 +30,9 @@ function getRootEslintConfigFilePath(tree) {
|
|
|
18
30
|
if (eslintMajorVersion && eslintMajorVersion < 9) {
|
|
19
31
|
throw new Error("The 'skyux-eslint' package requires eslint version 9.");
|
|
20
32
|
}
|
|
21
|
-
let
|
|
33
|
+
let configFile;
|
|
22
34
|
tree.getDir('/').visit((filePath) => {
|
|
23
|
-
if (
|
|
35
|
+
if (configFile) {
|
|
24
36
|
return;
|
|
25
37
|
}
|
|
26
38
|
if (filePath.match(/^\/\.eslintrc/)) {
|
|
@@ -28,32 +40,40 @@ function getRootEslintConfigFilePath(tree) {
|
|
|
28
40
|
'Migrate to ESLint\'s "flat" config and try the command again.');
|
|
29
41
|
}
|
|
30
42
|
if (filePath.match(/^\/eslint\.config\.(js|mjs|cjs)$/)) {
|
|
31
|
-
|
|
43
|
+
configFile = filePath;
|
|
32
44
|
}
|
|
33
45
|
});
|
|
34
|
-
if (!
|
|
46
|
+
if (!configFile) {
|
|
35
47
|
throw new Error('A compatible ESLint config file could not be found.');
|
|
36
48
|
}
|
|
37
|
-
|
|
49
|
+
const isEsm = tree.readText(configFile).includes('export default ');
|
|
50
|
+
return { configFile, isEsm };
|
|
38
51
|
}
|
|
39
52
|
/**
|
|
40
53
|
* Adds `skyux-eslint` to an existing `angular-eslint` config file.
|
|
41
54
|
*/
|
|
42
55
|
function ngAdd() {
|
|
43
56
|
return (tree) => {
|
|
44
|
-
const configFile = getRootEslintConfigFilePath(tree);
|
|
57
|
+
const { configFile, isEsm } = getRootEslintConfigFilePath(tree);
|
|
45
58
|
const contents = tree.readText(configFile);
|
|
59
|
+
const importStatement = isEsm
|
|
60
|
+
? 'import skyux from "skyux-eslint";\n'
|
|
61
|
+
: 'const skyux = require("skyux-eslint");\n';
|
|
62
|
+
if (contents.includes(importStatement)) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
46
65
|
const recorder = tree.beginUpdate(configFile);
|
|
47
|
-
const
|
|
66
|
+
const exportsRegexp = isEsm ? /\nexport default / : /\nmodule\.exports/;
|
|
67
|
+
const exportsMatch = exportsRegexp.exec(contents);
|
|
48
68
|
if (exportsMatch) {
|
|
49
|
-
recorder.insertLeft(exportsMatch.index,
|
|
69
|
+
recorder.insertLeft(exportsMatch.index, importStatement);
|
|
50
70
|
}
|
|
51
71
|
const statements = [
|
|
52
72
|
'skyux.configs.templateRecommended',
|
|
53
73
|
'skyux.configs.tsRecommended',
|
|
54
74
|
];
|
|
55
75
|
contents.match(ESLINT_CONFIG_EXTENDS_REGEXP)?.forEach((element) => {
|
|
56
|
-
recorder.insertRight(contents.indexOf(element) + element.length, `${' '.repeat(2)}...${statements.pop()},\n${' '.repeat(4)}`);
|
|
76
|
+
recorder.insertRight(contents.indexOf(element) + element.length, `${needsComma(element) ? ',' : ''}${' '.repeat(2)}...${statements.pop()},\n${' '.repeat(4)}`);
|
|
57
77
|
});
|
|
58
78
|
tree.commitUpdate(recorder);
|
|
59
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/sdk/eslint-schematics/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/sdk/eslint-schematics/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":"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"}
|