@o3r/schematics 12.3.0-prerelease.6 → 12.3.0-prerelease.60
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/package.json +16 -14
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +1 -3
- package/src/rule-factories/editor-config/editor-config.d.ts +7 -0
- package/src/rule-factories/editor-config/editor-config.d.ts.map +1 -0
- package/src/rule-factories/editor-config/editor-config.helpers.d.ts +15 -0
- package/src/rule-factories/editor-config/editor-config.helpers.d.ts.map +1 -0
- package/src/rule-factories/editor-config/editor-config.helpers.js +37 -0
- package/src/rule-factories/editor-config/editor-config.helpers.js.map +1 -0
- package/src/rule-factories/editor-config/editor-config.js +47 -0
- package/src/rule-factories/editor-config/editor-config.js.map +1 -0
- package/src/rule-factories/editor-config/index.d.ts +2 -0
- package/src/rule-factories/editor-config/index.d.ts.map +1 -0
- package/src/rule-factories/editor-config/index.js +5 -0
- package/src/rule-factories/editor-config/index.js.map +1 -0
- package/src/rule-factories/index.d.ts +1 -0
- package/src/rule-factories/index.d.ts.map +1 -1
- package/src/rule-factories/index.js +1 -0
- package/src/rule-factories/index.js.map +1 -1
- package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
- package/src/rule-factories/ng-add/dependencies.js +3 -2
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "12.3.0-prerelease.
|
|
3
|
+
"version": "12.3.0-prerelease.60",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"@angular-devkit/core": "^19.0.0",
|
|
30
30
|
"@angular-devkit/schematics": "^19.0.0",
|
|
31
31
|
"@angular/cli": "^19.0.0",
|
|
32
|
-
"@o3r/core": "^12.3.0-prerelease.
|
|
33
|
-
"@o3r/telemetry": "^12.3.0-prerelease.
|
|
32
|
+
"@o3r/core": "^12.3.0-prerelease.60",
|
|
33
|
+
"@o3r/telemetry": "^12.3.0-prerelease.60",
|
|
34
34
|
"@schematics/angular": "^19.0.0",
|
|
35
35
|
"eslint": "^9.14.0",
|
|
36
36
|
"rxjs": "^7.8.1",
|
|
@@ -70,6 +70,7 @@
|
|
|
70
70
|
"globby": "^11.1.0",
|
|
71
71
|
"minimatch": "~10.0.0",
|
|
72
72
|
"semver": "^7.5.2",
|
|
73
|
+
"tiny-editorconfig": "~1.0.0",
|
|
73
74
|
"tslib": "^2.6.2"
|
|
74
75
|
},
|
|
75
76
|
"generatorDependencies": {
|
|
@@ -91,23 +92,24 @@
|
|
|
91
92
|
"@babel/preset-typescript": "~7.27.0",
|
|
92
93
|
"@compodoc/compodoc": "^1.1.19",
|
|
93
94
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
94
|
-
"@nx/eslint": "~20.
|
|
95
|
-
"@nx/eslint-plugin": "~20.
|
|
96
|
-
"@nx/jest": "~20.
|
|
97
|
-
"@nx/js": "~20.
|
|
98
|
-
"@o3r/build-helpers": "^12.3.0-prerelease.
|
|
99
|
-
"@o3r/eslint-plugin": "^12.3.0-prerelease.
|
|
100
|
-
"@o3r/telemetry": "^12.3.0-prerelease.
|
|
95
|
+
"@nx/eslint": "~20.8.0",
|
|
96
|
+
"@nx/eslint-plugin": "~20.8.0",
|
|
97
|
+
"@nx/jest": "~20.8.0",
|
|
98
|
+
"@nx/js": "~20.8.0",
|
|
99
|
+
"@o3r/build-helpers": "^12.3.0-prerelease.60",
|
|
100
|
+
"@o3r/eslint-plugin": "^12.3.0-prerelease.60",
|
|
101
|
+
"@o3r/telemetry": "^12.3.0-prerelease.60",
|
|
102
|
+
"@o3r/test-helpers": "^12.3.0-prerelease.60",
|
|
101
103
|
"@schematics/angular": "~19.2.0",
|
|
102
104
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
103
105
|
"@swc/helpers": "~0.5.0",
|
|
104
106
|
"@types/jest": "~29.5.2",
|
|
105
107
|
"@types/node": "^20.0.0",
|
|
106
108
|
"@types/semver": "^7.3.13",
|
|
107
|
-
"@typescript-eslint/parser": "~8.
|
|
109
|
+
"@typescript-eslint/parser": "~8.31.0",
|
|
108
110
|
"angular-eslint": "~19.3.0",
|
|
109
111
|
"cpy-cli": "^5.0.0",
|
|
110
|
-
"eslint": "~9.
|
|
112
|
+
"eslint": "~9.25.0",
|
|
111
113
|
"eslint-import-resolver-node": "~0.3.9",
|
|
112
114
|
"eslint-import-resolver-typescript": "~3.10.0",
|
|
113
115
|
"eslint-plugin-import": "~2.31.0",
|
|
@@ -122,13 +124,13 @@
|
|
|
122
124
|
"jest-junit": "~16.0.0",
|
|
123
125
|
"jsonc-eslint-parser": "~2.4.0",
|
|
124
126
|
"jsonschema": "~1.5.0",
|
|
125
|
-
"nx": "~20.
|
|
127
|
+
"nx": "~20.8.0",
|
|
126
128
|
"rxjs": "^7.8.1",
|
|
127
129
|
"ts-jest": "~29.3.0",
|
|
128
130
|
"ts-node": "~10.9.2",
|
|
129
131
|
"type-fest": "^4.30.1",
|
|
130
132
|
"typescript": "~5.8.2",
|
|
131
|
-
"typescript-eslint": "~8.
|
|
133
|
+
"typescript-eslint": "~8.31.0",
|
|
132
134
|
"zone.js": "~0.15.0"
|
|
133
135
|
},
|
|
134
136
|
"engines": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -41,8 +41,6 @@ function ngAddFn(options) {
|
|
|
41
41
|
* Add Otter schematics to an Angular Project
|
|
42
42
|
* @param options
|
|
43
43
|
*/
|
|
44
|
-
const ngAdd = (options) => ()
|
|
45
|
-
return (0, public_api_1.createOtterSchematic)(ngAddFn)(options);
|
|
46
|
-
};
|
|
44
|
+
const ngAdd = (options) => (0, public_api_1.createOtterSchematic)(ngAddFn)(options);
|
|
47
45
|
exports.ngAdd = ngAdd;
|
|
48
46
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { Rule } from '@angular-devkit/schematics';
|
|
2
|
+
/**
|
|
3
|
+
* Apply the rule of the editor-config to the file listed by the patterns
|
|
4
|
+
* @param includeExtensions List of file extensions on which the editorconfig should apply (applied to every touched file per default)
|
|
5
|
+
*/
|
|
6
|
+
export declare const applyEditorConfig: (includeExtensions?: string[]) => Rule;
|
|
7
|
+
//# sourceMappingURL=editor-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editor-config.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/editor-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,oBAAoB,MAAM,EAAE,KAAG,IAuChE,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ConfigWithOverrides } from 'tiny-editorconfig';
|
|
2
|
+
/**
|
|
3
|
+
* Wrapper to tiny-editorconfig {@link Parse} function to allow jest mocking
|
|
4
|
+
* @see parse
|
|
5
|
+
* @param input configuration file content
|
|
6
|
+
*/
|
|
7
|
+
export declare const editorConfigParse: (input: string) => Promise<ConfigWithOverrides | undefined>;
|
|
8
|
+
/**
|
|
9
|
+
* Wrapper to tiny-editorconfig {@link resolve} function to allow jest mocking
|
|
10
|
+
* @see resolve
|
|
11
|
+
* @param configs EditorConfig configurations
|
|
12
|
+
* @param filePath Path to the file to lint
|
|
13
|
+
*/
|
|
14
|
+
export declare const editorConfigResolve: (configs: ConfigWithOverrides[], filePath: string) => Promise<import("tiny-editorconfig").Config | undefined>;
|
|
15
|
+
//# sourceMappingURL=editor-config.helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editor-config.helpers.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/editor-config.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAE3B;;;;GAIG;AAEH,eAAO,MAAM,iBAAiB,GAAU,OAAO,MAAM,6CAOpD,CAAC;AAEF;;;;;GAKG;AAEH,eAAO,MAAM,mBAAmB,GAAU,SAAS,mBAAmB,EAAE,EAAE,UAAU,MAAM,4DAOzF,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.editorConfigResolve = exports.editorConfigParse = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Wrapper to tiny-editorconfig {@link Parse} function to allow jest mocking
|
|
6
|
+
* @see parse
|
|
7
|
+
* @param input configuration file content
|
|
8
|
+
*/
|
|
9
|
+
// istanbul ignore next -- tiny-editorconfig wrapper function to handle Jest testing CJS requirement issue
|
|
10
|
+
const editorConfigParse = async (input) => {
|
|
11
|
+
try {
|
|
12
|
+
const { parse } = await Promise.resolve().then(() => require('tiny-editorconfig'));
|
|
13
|
+
return parse(input);
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
exports.editorConfigParse = editorConfigParse;
|
|
20
|
+
/**
|
|
21
|
+
* Wrapper to tiny-editorconfig {@link resolve} function to allow jest mocking
|
|
22
|
+
* @see resolve
|
|
23
|
+
* @param configs EditorConfig configurations
|
|
24
|
+
* @param filePath Path to the file to lint
|
|
25
|
+
*/
|
|
26
|
+
// istanbul ignore next -- tiny-editorconfig wrapper function to handle Jest testing CJS requirement issue
|
|
27
|
+
const editorConfigResolve = async (configs, filePath) => {
|
|
28
|
+
try {
|
|
29
|
+
const { resolve } = await Promise.resolve().then(() => require('tiny-editorconfig'));
|
|
30
|
+
return resolve(configs, filePath);
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
exports.editorConfigResolve = editorConfigResolve;
|
|
37
|
+
//# sourceMappingURL=editor-config.helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editor-config.helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/editor-config.helpers.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,0GAA0G;AACnG,MAAM,iBAAiB,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IACvD,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,2CAAa,mBAAmB,EAAC,CAAC;QACpD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B;AAEF;;;;;GAKG;AACH,0GAA0G;AACnG,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAA8B,EAAE,QAAgB,EAAE,EAAE;IAC5F,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,2CAAa,mBAAmB,EAAC,CAAC;QACtD,OAAO,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyEditorConfig = void 0;
|
|
4
|
+
const editor_config_helpers_1 = require("./editor-config.helpers");
|
|
5
|
+
/**
|
|
6
|
+
* Apply the rule of the editor-config to the file listed by the patterns
|
|
7
|
+
* @param includeExtensions List of file extensions on which the editorconfig should apply (applied to every touched file per default)
|
|
8
|
+
*/
|
|
9
|
+
const applyEditorConfig = (includeExtensions) => {
|
|
10
|
+
return async (tree, context) => {
|
|
11
|
+
if (!tree.exists('.editorconfig')) {
|
|
12
|
+
context.logger.warn('No config found, the editor-config process will not be run');
|
|
13
|
+
return tree;
|
|
14
|
+
}
|
|
15
|
+
const parsedConfig = await (0, editor_config_helpers_1.editorConfigParse)(tree.readText('.editorconfig'));
|
|
16
|
+
// istanbul ignore next -- code to handle Jest testing CJS requirement issue
|
|
17
|
+
if (!parsedConfig) {
|
|
18
|
+
context.logger.warn('tiny-editorconfig is not loaded correctly, the editorConfig linter process will be skipped.');
|
|
19
|
+
return tree;
|
|
20
|
+
}
|
|
21
|
+
const configs = [parsedConfig];
|
|
22
|
+
const extensionsRegExp = includeExtensions?.map((ext) => new RegExp(`\\.${ext.replace(/^\./, '')}$`));
|
|
23
|
+
tree.actions
|
|
24
|
+
.filter((action) => !extensionsRegExp || extensionsRegExp.some((reg) => reg.test(action.path)))
|
|
25
|
+
.forEach(async ({ path }) => {
|
|
26
|
+
const config = (await (0, editor_config_helpers_1.editorConfigResolve)(configs, path));
|
|
27
|
+
const initialContent = tree.readText(path);
|
|
28
|
+
let content = initialContent;
|
|
29
|
+
const endOfLine = config.endOfLine?.startsWith('cr') ? '\r\n' : '\n';
|
|
30
|
+
if (config.trimTrailingWhitespace) {
|
|
31
|
+
content = content.replaceAll(/[\s]+$/mg, '');
|
|
32
|
+
}
|
|
33
|
+
if (config.insertFinalNewline !== undefined && !content.endsWith(endOfLine)) {
|
|
34
|
+
content = content + endOfLine;
|
|
35
|
+
}
|
|
36
|
+
if (config.endOfLine !== undefined) {
|
|
37
|
+
content = content.replace(/\r?\n/g, endOfLine);
|
|
38
|
+
}
|
|
39
|
+
if (initialContent !== content) {
|
|
40
|
+
context.logger.debug(`Update ${path} based on EditorConfig rules`);
|
|
41
|
+
tree.overwrite(path, content);
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
};
|
|
46
|
+
exports.applyEditorConfig = applyEditorConfig;
|
|
47
|
+
//# sourceMappingURL=editor-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editor-config.js","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/editor-config.ts"],"names":[],"mappings":";;;AAGA,mEAGiC;AAEjC;;;GAGG;AACI,MAAM,iBAAiB,GAAG,CAAC,iBAA4B,EAAQ,EAAE;IACtE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAClF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAA,yCAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;QAC7E,4EAA4E;QAC5E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6FAA6F,CAAC,CAAC;YACnH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,gBAAgB,GAAG,iBAAiB,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtG,IAAI,CAAC,OAAO;aACT,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;aAC9F,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1B,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,2CAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAE,CAAC;YAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,OAAO,GAAG,cAAc,CAAC;YAE7B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;YACrE,IAAI,MAAM,CAAC,sBAAsB,EAAE,CAAC;gBAClC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC/C,CAAC;YACD,IAAI,MAAM,CAAC,kBAAkB,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5E,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;YAChC,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACnC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;gBAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,8BAA8B,CAAC,CAAC;gBACnE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,iBAAiB,qBAuC5B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/editor-config/index.ts"],"names":[],"mappings":";;;AAAA,0DAAgC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './add-imports/index';
|
|
2
2
|
export * from './check-packages-peers/index';
|
|
3
3
|
export * from './dev-tools/index';
|
|
4
|
+
export * from './editor-config/index';
|
|
4
5
|
export * from './eslint-fix/index';
|
|
5
6
|
export * from './get-test-frameworks/index';
|
|
6
7
|
export * from './ng-add/index';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
|
|
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
tslib_1.__exportStar(require("./add-imports/index"), exports);
|
|
5
5
|
tslib_1.__exportStar(require("./check-packages-peers/index"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./dev-tools/index"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./editor-config/index"), exports);
|
|
7
8
|
tslib_1.__exportStar(require("./eslint-fix/index"), exports);
|
|
8
9
|
tslib_1.__exportStar(require("./get-test-frameworks/index"), exports);
|
|
9
10
|
tslib_1.__exportStar(require("./ng-add/index"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,uEAA6C;AAC7C,4DAAkC;AAClC,6DAAmC;AACnC,sEAA4C;AAC5C,yDAA+B;AAC/B,0DAAgC;AAChC,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,uEAA6C;AAC7C,4DAAkC;AAClC,gEAAsC;AACtC,6DAAmC;AACnC,sEAA4C;AAC5C,yDAA+B;AAC/B,0DAAgC;AAChC,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EAEJ,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EAEJ,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,eAAe,CAAC;AAavB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iDAAiD;IACjD,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,uDAAuD;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,0DAA0D;IAC1D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACjC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,sCAAsC;IACtC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,SAAS,gBAAgB,KAAG,OAAO,IAAI,gBAAgB,GAAG;IAAE,iBAAiB,EAAE,uBAAuB,CAAA;CAEzI,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,GAAI,iBAAiB,MAAM,EAAE,MAAM,IAAI,EAAE,cAAc,MAAM,EAAE,oBAAoB,OAAO,EAAE,kBAAkB,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAiBzL,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,uBAE/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,wBAAwB,KAAG,IAyIrE,CAAC"}
|
|
@@ -9,6 +9,7 @@ const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
|
9
9
|
const semver = require("semver");
|
|
10
10
|
const loaders_1 = require("../../utility/loaders");
|
|
11
11
|
const package_manager_runner_1 = require("../../utility/package-manager-runner");
|
|
12
|
+
const editor_config_1 = require("../editor-config");
|
|
12
13
|
/**
|
|
13
14
|
* Determine if the context has information regarding the setup dependencies process
|
|
14
15
|
* @param context Schematic context
|
|
@@ -118,7 +119,6 @@ const setupDependencies = (options) => {
|
|
|
118
119
|
});
|
|
119
120
|
const content = JSON.stringify(packageJsonContent, null, 2);
|
|
120
121
|
tree.overwrite(packageJsonPath, content);
|
|
121
|
-
return tree;
|
|
122
122
|
};
|
|
123
123
|
};
|
|
124
124
|
const addDependencies = (tree) => {
|
|
@@ -182,7 +182,8 @@ const setupDependencies = (options) => {
|
|
|
182
182
|
};
|
|
183
183
|
return (0, schematics_1.chain)([
|
|
184
184
|
addDependencies,
|
|
185
|
-
runNgAddSchematics
|
|
185
|
+
runNgAddSchematics,
|
|
186
|
+
(0, editor_config_1.applyEditorConfig)(['json'])
|
|
186
187
|
]);
|
|
187
188
|
};
|
|
188
189
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAClC,2DAOoC;AACpC,4DAG0C;AAC1C,2EAEkD;AAClD,iCAAiC;AAOjC,mDAG+B;AAC/B,iFAG8C;
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"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"}
|