@o3r/workspace 12.3.0-prerelease.4 → 12.3.0-prerelease.40
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 +10 -10
- package/schematics/application/schema.d.ts +1 -1
- package/schematics/application/schema.d.ts.map +1 -1
- package/schematics/application/schema.json +1 -1
- package/schematics/library/schema.d.ts +1 -1
- package/schematics/library/schema.d.ts.map +1 -1
- package/schematics/library/schema.json +1 -1
- package/schematics/library/templates/jest/jest.config.js.template +2 -2
- package/schematics/ng-add/helpers/editorconfig/index.d.ts +6 -0
- package/schematics/ng-add/helpers/editorconfig/index.d.ts.map +1 -0
- package/schematics/ng-add/helpers/editorconfig/index.js +26 -0
- package/schematics/ng-add/helpers/editorconfig/index.js.map +1 -0
- package/schematics/ng-add/helpers/editorconfig/templates/__dot__editorconfig.template +15 -0
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +4 -1
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/ng-add/schema.d.ts +3 -1
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/schematics/ng-add/schema.json +5 -1
- package/schematics/sdk/index.d.ts.map +1 -1
- package/schematics/sdk/index.js +49 -23
- package/schematics/sdk/index.js.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.js +4 -2
- package/schematics/sdk/rules/clean-standalone.rule.js.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.js +3 -2
- package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
- package/schematics/sdk/schema.d.ts +1 -1
- package/schematics/sdk/schema.d.ts.map +1 -1
- package/schematics/sdk/schema.json +1 -1
- package/schematics/sdk/templates/testing/setup-jest.ts.template +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "12.3.0-prerelease.
|
|
3
|
+
"version": "12.3.0-prerelease.40",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@angular/common": "^19.0.0",
|
|
42
42
|
"@angular/compiler-cli": "^19.0.0",
|
|
43
43
|
"@angular/core": "^19.0.0",
|
|
44
|
-
"@o3r/telemetry": "^12.3.0-prerelease.
|
|
44
|
+
"@o3r/telemetry": "^12.3.0-prerelease.40",
|
|
45
45
|
"@schematics/angular": "^19.0.0",
|
|
46
46
|
"ts-node": "~10.9.2",
|
|
47
47
|
"type-fest": "^4.10.2",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
}
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@o3r/schematics": "^12.3.0-prerelease.
|
|
62
|
+
"@o3r/schematics": "^12.3.0-prerelease.40",
|
|
63
63
|
"commander": "^13.0.0",
|
|
64
64
|
"globby": "^11.1.0",
|
|
65
65
|
"semver": "^7.5.2",
|
|
@@ -92,12 +92,12 @@
|
|
|
92
92
|
"@nx/jest": "~20.7.0",
|
|
93
93
|
"@nx/js": "~20.7.0",
|
|
94
94
|
"@nx/workspace": "~20.7.0",
|
|
95
|
-
"@o3r/build-helpers": "^12.3.0-prerelease.
|
|
96
|
-
"@o3r/core": "^12.3.0-prerelease.
|
|
97
|
-
"@o3r/eslint-plugin": "^12.3.0-prerelease.
|
|
98
|
-
"@o3r/schematics": "^12.3.0-prerelease.
|
|
99
|
-
"@o3r/telemetry": "^12.3.0-prerelease.
|
|
100
|
-
"@o3r/test-helpers": "^12.3.0-prerelease.
|
|
95
|
+
"@o3r/build-helpers": "^12.3.0-prerelease.40",
|
|
96
|
+
"@o3r/core": "^12.3.0-prerelease.40",
|
|
97
|
+
"@o3r/eslint-plugin": "^12.3.0-prerelease.40",
|
|
98
|
+
"@o3r/schematics": "^12.3.0-prerelease.40",
|
|
99
|
+
"@o3r/telemetry": "^12.3.0-prerelease.40",
|
|
100
|
+
"@o3r/test-helpers": "^12.3.0-prerelease.40",
|
|
101
101
|
"@schematics/angular": "~19.2.0",
|
|
102
102
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
103
103
|
"@types/jest": "~29.5.2",
|
|
@@ -109,7 +109,7 @@
|
|
|
109
109
|
"@typescript-eslint/parser": "~8.29.0",
|
|
110
110
|
"angular-eslint": "~19.3.0",
|
|
111
111
|
"cpy-cli": "^5.0.0",
|
|
112
|
-
"eslint": "~9.
|
|
112
|
+
"eslint": "~9.24.0",
|
|
113
113
|
"eslint-import-resolver-node": "~0.3.9",
|
|
114
114
|
"eslint-import-resolver-typescript": "~3.10.0",
|
|
115
115
|
"eslint-plugin-import": "~2.31.0",
|
|
@@ -6,7 +6,7 @@ export interface NgGenerateApplicationSchema extends SchematicOptionObject {
|
|
|
6
6
|
path?: string | undefined;
|
|
7
7
|
/** Description of the new application */
|
|
8
8
|
description?: string | undefined;
|
|
9
|
-
/** Skip the linter process */
|
|
9
|
+
/** Skip the linter process which includes the run of EsLint and EditorConfig rules */
|
|
10
10
|
skipLinter: boolean;
|
|
11
11
|
/** Do not install dependency packages. */
|
|
12
12
|
skipInstall: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -10,7 +10,7 @@ export interface NgGenerateModuleSchema extends SchematicOptionObject {
|
|
|
10
10
|
prefix?: string | undefined;
|
|
11
11
|
/** Name of the Nx Project (applied only in Nx Monorepo) */
|
|
12
12
|
projectName?: string | undefined;
|
|
13
|
-
/** Skip the linter process */
|
|
13
|
+
/** Skip the linter process which includes the run of EsLint and EditorConfig rules */
|
|
14
14
|
skipLinter: boolean;
|
|
15
15
|
/** Do not install dependency packages. */
|
|
16
16
|
skipInstall: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/library/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/library/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -13,7 +13,7 @@ module.exports = {
|
|
|
13
13
|
rootDir: __dirname,
|
|
14
14
|
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
|
|
15
15
|
testPathIgnorePatterns: [
|
|
16
|
-
'<rootDir>/dist'
|
|
16
|
+
'<rootDir>/dist'
|
|
17
17
|
],
|
|
18
18
|
reporters: [
|
|
19
19
|
'default',
|
|
@@ -33,6 +33,6 @@ module.exports = {
|
|
|
33
33
|
snapshotSerializers: [
|
|
34
34
|
'jest-preset-angular/build/serializers/no-ng-attributes',
|
|
35
35
|
'jest-preset-angular/build/serializers/ng-snapshot',
|
|
36
|
-
'jest-preset-angular/build/serializers/html-comment'
|
|
36
|
+
'jest-preset-angular/build/serializers/html-comment'
|
|
37
37
|
]
|
|
38
38
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/editorconfig/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAKpC;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAiB3C"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.generateEditorConfig = generateEditorConfig;
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const schematics_2 = require("@o3r/schematics");
|
|
6
|
+
/**
|
|
7
|
+
* Add editorconfig configuration to Otter project
|
|
8
|
+
*/
|
|
9
|
+
function generateEditorConfig() {
|
|
10
|
+
return (tree, context) => {
|
|
11
|
+
if (tree.exists('.editorconfig')) {
|
|
12
|
+
context.logger.info('A file .editorconfig already exist, a new one won\'t be generated.');
|
|
13
|
+
return tree;
|
|
14
|
+
}
|
|
15
|
+
const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./helpers/editorconfig/templates'), [
|
|
16
|
+
(0, schematics_1.template)({
|
|
17
|
+
dot: '.',
|
|
18
|
+
packageManager: (0, schematics_2.getPackageManager)()
|
|
19
|
+
}),
|
|
20
|
+
(0, schematics_1.renameTemplateFiles)()
|
|
21
|
+
]);
|
|
22
|
+
const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
|
|
23
|
+
return rule(tree, context);
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/editorconfig/index.ts"],"names":[],"mappings":";;AAkBA,oDAiBC;AAnCD,2DAUoC;AACpC,gDAEyB;AAEzB;;GAEG;AACH,SAAgB,oBAAoB;IAClC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YAC1F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,kCAAkC,CAAC,EAAE;YACpE,IAAA,qBAAQ,EAAC;gBACP,GAAG,EAAE,GAAG;gBACR,cAAc,EAAE,IAAA,8BAAiB,GAAE;aACpC,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
root = true
|
|
2
|
+
|
|
3
|
+
[*]
|
|
4
|
+
charset = utf-8
|
|
5
|
+
indent_style = space
|
|
6
|
+
indent_size = 2
|
|
7
|
+
end_of_line = lf
|
|
8
|
+
insert_final_newline = true
|
|
9
|
+
trim_trailing_whitespace = true
|
|
10
|
+
|
|
11
|
+
[**/node_modules/**]
|
|
12
|
+
insert_final_newline = unset
|
|
13
|
+
<% if (packageManager === 'yarn') { %>
|
|
14
|
+
[.yarn/**]
|
|
15
|
+
insert_final_newline = unset<% } %>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAelB;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,KAAG,IAkF/D,CAAC"}
|
|
@@ -7,6 +7,7 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
8
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
9
9
|
const commit_hooks_1 = require("./helpers/commit-hooks");
|
|
10
|
+
const editorconfig_1 = require("./helpers/editorconfig");
|
|
10
11
|
const gitignore_update_1 = require("./helpers/gitignore-update");
|
|
11
12
|
const npm_workspace_1 = require("./helpers/npm-workspace");
|
|
12
13
|
const renovate_1 = require("./helpers/renovate");
|
|
@@ -101,7 +102,9 @@ const prepareProject = (options) => {
|
|
|
101
102
|
}),
|
|
102
103
|
!options.skipLinter && hasEslint ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
|
|
103
104
|
(0, npm_workspace_1.addWorkspacesToProject)(),
|
|
104
|
-
(0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager)
|
|
105
|
+
(0, npm_workspace_1.addMonorepoManager)(ownPackageJsonContent, options.monorepoManager),
|
|
106
|
+
options.skipEditorConfigSetup ? (0, schematics_1.noop)() : (0, editorconfig_1.generateEditorConfig)(),
|
|
107
|
+
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
|
|
105
108
|
])(tree, context);
|
|
106
109
|
};
|
|
107
110
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { SchematicOptionObject } from '@o3r/schematics';
|
|
|
2
2
|
/** Monorepo manager to use */
|
|
3
3
|
export type MonorepoManager = 'lerna' | 'none';
|
|
4
4
|
export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
5
|
-
/** Skip the linter process */
|
|
5
|
+
/** Skip the linter process which includes the run of EsLint and EditorConfig rules */
|
|
6
6
|
skipLinter: boolean;
|
|
7
7
|
/** Skip the install process */
|
|
8
8
|
skipInstall?: boolean;
|
|
@@ -23,5 +23,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
|
23
23
|
skipVscodeTools?: boolean;
|
|
24
24
|
/** Skip adding Renovate config */
|
|
25
25
|
skipRenovate?: boolean;
|
|
26
|
+
/** Skip adding Editor config */
|
|
27
|
+
skipEditorConfigSetup?: boolean;
|
|
26
28
|
}
|
|
27
29
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,wFAAwF;IACxF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;IAEjC,+BAA+B;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,kCAAkC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,gCAAgC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"properties": {
|
|
7
7
|
"skipLinter": {
|
|
8
8
|
"type": "boolean",
|
|
9
|
-
"description": "Skip the linter process",
|
|
9
|
+
"description": "Skip the linter process which includes EsLint and EditorConfig rules applying",
|
|
10
10
|
"default": true
|
|
11
11
|
},
|
|
12
12
|
"skipInstall": {
|
|
@@ -70,6 +70,10 @@
|
|
|
70
70
|
"skipRenovate": {
|
|
71
71
|
"type": "boolean",
|
|
72
72
|
"description": "Skip adding Renovate config"
|
|
73
|
+
},
|
|
74
|
+
"skipEditorConfigSetup": {
|
|
75
|
+
"type": "boolean",
|
|
76
|
+
"description": "Skip adding Editor config"
|
|
73
77
|
}
|
|
74
78
|
},
|
|
75
79
|
"additionalProperties": true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAmJpC;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -6,6 +6,7 @@ const path = require("node:path");
|
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
8
|
const schematics_2 = require("@o3r/schematics");
|
|
9
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
9
10
|
const clean_standalone_rule_1 = require("./rules/clean-standalone.rule");
|
|
10
11
|
const rules_ng_1 = require("./rules/rules.ng");
|
|
11
12
|
const rules_nx_1 = require("./rules/rules.nx");
|
|
@@ -19,6 +20,25 @@ function generateSdkFn(options) {
|
|
|
19
20
|
const scope = schematics_1.strings.dasherize(splitName.length > 1 ? splitName[0].replace(/^@/, '') : options.name);
|
|
20
21
|
const projectName = splitName?.length === 2 ? schematics_1.strings.dasherize(splitName[1]) : 'sdk';
|
|
21
22
|
const cleanName = schematics_1.strings.dasherize(options.name).replace(/^@/, '').replaceAll(/\//g, '-');
|
|
23
|
+
const ownPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
|
|
24
|
+
const o3rDevPackageToInstall = [];
|
|
25
|
+
if ((0, schematics_2.isPackageInstalled)('@o3r/eslint-config')) {
|
|
26
|
+
o3rDevPackageToInstall.push('@o3r/eslint-config');
|
|
27
|
+
}
|
|
28
|
+
const dependencies = {
|
|
29
|
+
...o3rDevPackageToInstall.reduce((acc, dep) => {
|
|
30
|
+
acc[dep] = {
|
|
31
|
+
inManifest: [
|
|
32
|
+
{
|
|
33
|
+
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
34
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
35
|
+
}
|
|
36
|
+
],
|
|
37
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
38
|
+
};
|
|
39
|
+
return acc;
|
|
40
|
+
}, {})
|
|
41
|
+
};
|
|
22
42
|
return (tree, context) => {
|
|
23
43
|
const isNx = (0, schematics_2.isNxContext)(tree);
|
|
24
44
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
@@ -46,6 +66,28 @@ function generateSdkFn(options) {
|
|
|
46
66
|
}
|
|
47
67
|
}
|
|
48
68
|
const specPath = options.specPackageName ? `openapi${specExtension}` : options.specPath;
|
|
69
|
+
const specUpgradeTask = [];
|
|
70
|
+
const sdkGenerationTasks = [];
|
|
71
|
+
if (specPath) {
|
|
72
|
+
const installTask = context.addTask(new tasks_1.NodePackageInstallTask());
|
|
73
|
+
if (options.specPackageName) {
|
|
74
|
+
specUpgradeTask.push(context.addTask(new schematics_2.NpmExecTask('amasdk-update-spec-from-npm', [
|
|
75
|
+
options.specPackageName,
|
|
76
|
+
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
77
|
+
'--output', path.join(process.cwd(), targetPath, `openapi${specExtension}`)
|
|
78
|
+
], targetPath), [installTask]));
|
|
79
|
+
}
|
|
80
|
+
const generationTask = context.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
81
|
+
...options,
|
|
82
|
+
specPath,
|
|
83
|
+
directory: targetPath,
|
|
84
|
+
packageManager
|
|
85
|
+
}), [
|
|
86
|
+
installTask,
|
|
87
|
+
...specUpgradeTask
|
|
88
|
+
]);
|
|
89
|
+
sdkGenerationTasks.push(installTask, ...specUpgradeTask, generationTask);
|
|
90
|
+
}
|
|
49
91
|
return (0, schematics_1.chain)([
|
|
50
92
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
51
93
|
...options,
|
|
@@ -59,29 +101,13 @@ function generateSdkFn(options) {
|
|
|
59
101
|
(0, update_ts_paths_rule_1.updateTsConfig)(targetPath, projectName, scope),
|
|
60
102
|
(0, clean_standalone_rule_1.cleanStandaloneFiles)(targetPath),
|
|
61
103
|
addModuleSpecificFiles(),
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
70
|
-
'--output', path.join(process.cwd(), targetPath, `openapi${specExtension}`)
|
|
71
|
-
], targetPath), [installTask])
|
|
72
|
-
]
|
|
73
|
-
: [];
|
|
74
|
-
c.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
75
|
-
...options,
|
|
76
|
-
specPath,
|
|
77
|
-
directory: targetPath,
|
|
78
|
-
packageManager
|
|
79
|
-
}), [
|
|
80
|
-
installTask,
|
|
81
|
-
...specUpgradeTask
|
|
82
|
-
]);
|
|
83
|
-
}
|
|
84
|
-
: schematics_1.noop
|
|
104
|
+
(0, schematics_2.setupDependencies)({
|
|
105
|
+
dependencies,
|
|
106
|
+
skipInstall: options.skipInstall,
|
|
107
|
+
ngAddToRun: Object.keys(dependencies),
|
|
108
|
+
projectName: cleanName,
|
|
109
|
+
runAfterTasks: sdkGenerationTasks
|
|
110
|
+
})
|
|
85
111
|
])(tree, context);
|
|
86
112
|
};
|
|
87
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAepC;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAepC;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAgC7D"}
|
|
@@ -30,11 +30,13 @@ function cleanStandaloneFiles(targetPath) {
|
|
|
30
30
|
(tree) => {
|
|
31
31
|
const packageJson = tree.readJson(node_path_1.posix.join(targetPath, 'package.json'));
|
|
32
32
|
if (packageJson.scripts) {
|
|
33
|
-
const excludedScripts = ['postinstall', 'set:version'];
|
|
33
|
+
const excludedScripts = ['postinstall', 'set:version', 'tools:changelog', 'start'];
|
|
34
34
|
packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).filter(([scriptName]) => !excludedScripts.includes(scriptName)));
|
|
35
35
|
}
|
|
36
|
+
delete packageJson['lint-staged'];
|
|
36
37
|
if (packageJson.devDependencies) {
|
|
37
|
-
|
|
38
|
+
const dependenciesToRemove = ['@o3r/workspace', 'tsc-watch'];
|
|
39
|
+
packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).filter(([depName]) => !dependenciesToRemove.includes(depName)));
|
|
38
40
|
}
|
|
39
41
|
tree.overwrite(node_path_1.posix.join(targetPath, 'package.json'), JSON.stringify(packageJson, null, 2));
|
|
40
42
|
return tree;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;AAyBA,oDAgCC;AAzDD,yCAEmB;AACnB,2DAGoC;AAKpC,MAAM,cAAc,GAAG,CAAC,KAAe,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAClE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,2BAA2B,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,UAAkB;IACrD,OAAO,IAAA,kBAAK,EAAC;QACX,cAAc,CACZ;YACE,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC;YAC1C,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC;YAClD,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC;YACvC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC;YACzC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC;YAC5C,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC;SAC1C,CACF;QACD,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAgB,CAAC;YACzF,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACxB,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;gBACnF,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CACpG,CAAC;YACJ,CAAC;YACD,OAAO,WAAW,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;gBAChC,MAAM,oBAAoB,GAAG,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;gBAC7D,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAC9C,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAC3G,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7F,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAGpC;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAsC3F"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = updateTsConfig;
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
4
5
|
const ts = require("typescript");
|
|
5
6
|
/**
|
|
6
7
|
* Update workspace Tsconfig
|
|
@@ -28,14 +29,14 @@ function updateTsConfig(targetPath, projectName, scope) {
|
|
|
28
29
|
configWithPath.content.compilerOptions.baseUrl ||= '.';
|
|
29
30
|
configWithPath.content.compilerOptions.paths ||= {};
|
|
30
31
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}`] = [
|
|
31
|
-
`${relativeTargetPath}/dist
|
|
32
|
+
...((0, node_path_1.basename)(configWithPath.tsconfig) === 'tsconfig.build.json' ? [`${relativeTargetPath}/dist`] : []),
|
|
32
33
|
`${relativeTargetPath}/src/index`
|
|
33
34
|
];
|
|
34
35
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/fixtures`] = [
|
|
35
36
|
`${relativeTargetPath}/src/fixtures/jest`
|
|
36
37
|
];
|
|
37
38
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/*`] = [
|
|
38
|
-
`${relativeTargetPath}/dist
|
|
39
|
+
...((0, node_path_1.basename)(configWithPath.tsconfig) === 'tsconfig.build.json' ? [`${relativeTargetPath}/dist/*`] : []),
|
|
39
40
|
`${relativeTargetPath}/src/*`
|
|
40
41
|
];
|
|
41
42
|
tree.overwrite(configWithPath.tsconfig, JSON.stringify(configWithPath.content, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;AAcA,wCAsCC;AApDD,yCAEmB;AAInB,iCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC;QACvD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,CAAC,IAAA,oBAAQ,EAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtG,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,WAAW,CAAC,GAAG;YACpG,GAAG,kBAAkB,oBAAoB;SAC1C,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,CAAC,IAAA,oBAAQ,EAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,7 @@ export interface NgGenerateSdkSchema extends SchematicOptionObject {
|
|
|
6
6
|
path?: string | undefined;
|
|
7
7
|
/** Description of the new module */
|
|
8
8
|
description?: string | undefined;
|
|
9
|
-
/** Skip the linter process */
|
|
9
|
+
/** Skip the linter process which includes the run of EsLint and EditorConfig rules */
|
|
10
10
|
skipLinter: boolean;
|
|
11
11
|
/** Do not install dependency packages. */
|
|
12
12
|
skipInstall: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAChE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAChE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,+GAA+G;IAC/G,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B,8DAA8D;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,8DAA8D;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,0DAA0D;IAC1D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
|
|
File without changes
|