@o3r/workspace 10.3.0-prerelease.9 → 11.0.0-next.1
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 +17 -17
- package/schematics/application/index.js +3 -3
- package/schematics/application/index.js.map +1 -1
- package/schematics/library/index.js +1 -1
- package/schematics/library/index.js.map +1 -1
- package/schematics/library/rules/rules.ng.d.ts.map +1 -1
- package/schematics/library/rules/rules.ng.js +20 -31
- package/schematics/library/rules/rules.ng.js.map +1 -1
- package/schematics/ng-add/helpers/linter.js +3 -3
- package/schematics/rule-factories/project-configs.d.ts.map +1 -1
- package/schematics/rule-factories/project-configs.js +1 -0
- package/schematics/rule-factories/project-configs.js.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.js +32 -19
- 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 +1 -0
- package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
- package/schematics/library/templates/ng/.eslintrc.js.template +0 -19
- package/schematics/library/templates/ng/tsconfig.eslint.json.template +0 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0-next.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^
|
|
41
|
+
"@o3r/schematics": "^11.0.0-next.1",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -63,17 +63,17 @@
|
|
|
63
63
|
"@angular/router": "~17.3.0",
|
|
64
64
|
"@babel/core": "~7.24.0",
|
|
65
65
|
"@babel/preset-typescript": "~7.24.0",
|
|
66
|
-
"@ngrx/entity": "~17.
|
|
67
|
-
"@ngrx/store": "~17.
|
|
68
|
-
"@nx/eslint": "~18.
|
|
69
|
-
"@nx/eslint-plugin": "~18.
|
|
70
|
-
"@nx/jest": "~18.
|
|
71
|
-
"@nx/js": "~18.
|
|
72
|
-
"@o3r/build-helpers": "^
|
|
73
|
-
"@o3r/core": "^
|
|
74
|
-
"@o3r/eslint-plugin": "^
|
|
75
|
-
"@o3r/schematics": "^
|
|
76
|
-
"@o3r/test-helpers": "^
|
|
66
|
+
"@ngrx/entity": "~17.2.0",
|
|
67
|
+
"@ngrx/store": "~17.2.0",
|
|
68
|
+
"@nx/eslint": "~18.3.0",
|
|
69
|
+
"@nx/eslint-plugin": "~18.3.0",
|
|
70
|
+
"@nx/jest": "~18.3.0",
|
|
71
|
+
"@nx/js": "~18.3.0",
|
|
72
|
+
"@o3r/build-helpers": "^11.0.0-next.1",
|
|
73
|
+
"@o3r/core": "^11.0.0-next.1",
|
|
74
|
+
"@o3r/eslint-plugin": "^11.0.0-next.1",
|
|
75
|
+
"@o3r/schematics": "^11.0.0-next.1",
|
|
76
|
+
"@o3r/test-helpers": "^11.0.0-next.1",
|
|
77
77
|
"@schematics/angular": "~17.3.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"jest-junit": "~16.0.0",
|
|
97
97
|
"jest-preset-angular": "~14.0.3",
|
|
98
98
|
"minimist": "^1.2.6",
|
|
99
|
-
"nx": "~18.
|
|
99
|
+
"nx": "~18.3.0",
|
|
100
100
|
"pid-from-port": "^1.1.3",
|
|
101
101
|
"rxjs": "^7.8.1",
|
|
102
102
|
"ts-jest": "~29.1.2",
|
|
@@ -107,9 +107,9 @@
|
|
|
107
107
|
},
|
|
108
108
|
"generatorDependencies": {
|
|
109
109
|
"@angular/material": "~17.3.0",
|
|
110
|
-
"@ngrx/router-store": "~17.
|
|
111
|
-
"@ngrx/effects": "~17.
|
|
112
|
-
"@ngrx/store-devtools": "~17.
|
|
110
|
+
"@ngrx/router-store": "~17.2.0",
|
|
111
|
+
"@ngrx/effects": "~17.2.0",
|
|
112
|
+
"@ngrx/store-devtools": "~17.2.0"
|
|
113
113
|
},
|
|
114
114
|
"engines": {
|
|
115
115
|
"node": ">=18.0.0"
|
|
@@ -67,17 +67,17 @@ function generateApplicationFn(options) {
|
|
|
67
67
|
return (0, schematics_1.chain)([
|
|
68
68
|
(0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
|
|
69
69
|
...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
|
|
70
|
-
name:
|
|
70
|
+
name: cleanName,
|
|
71
71
|
projectRoot,
|
|
72
72
|
style: schema_1.Style.Scss
|
|
73
73
|
}),
|
|
74
74
|
addProjectSpecificFiles(targetPath, rootDependencies),
|
|
75
|
-
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json'),
|
|
75
|
+
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
|
|
76
76
|
(0, schematics_2.setupDependencies)({
|
|
77
77
|
dependencies,
|
|
78
78
|
skipInstall: options.skipInstall,
|
|
79
79
|
ngAddToRun: Object.keys(dependencies),
|
|
80
|
-
projectName:
|
|
80
|
+
projectName: cleanName
|
|
81
81
|
})
|
|
82
82
|
])(tree, context);
|
|
83
83
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ function generateModuleFn(options) {
|
|
|
33
33
|
inManifest: [
|
|
34
34
|
{
|
|
35
35
|
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
36
|
-
types: [dependencies_1.NodeDependencyType.
|
|
36
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
37
37
|
}
|
|
38
38
|
],
|
|
39
39
|
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":";;;AAAA,2DAAwE;AACxE,4DAAoE;AACpE,kCAAkC;AAClC,gDASyB;AAEzB,+CAAoD;AACpD,+CAAoD;AAEpD,2EAA8E;AAC9E,8BAA8B;AAE9B;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA+B;IAEvD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAgB,CAAC;QACrJ,MAAM,eAAe,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE3E,MAAM,IAAI,GAAG,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,wBAAW,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,sCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEhF,uDAAuD;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QACnF,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;QAEtG,MAAM,YAAY,GAAoC;YACpD,gEAAgE;YAChE,WAAW,EAAE;gBACX,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,qBAAqB,CAAC,OAAQ,EAAE;wBAC/E,KAAK,EAAE,CAAC,iCAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqFxH"}
|
|
@@ -26,11 +26,9 @@ function ngGenerateModule(options) {
|
|
|
26
26
|
const templateNg = (0, schematics_2.apply)((0, schematics_2.url)('./templates/ng'), [
|
|
27
27
|
(0, schematics_2.template)({
|
|
28
28
|
...options,
|
|
29
|
-
runner: process.env.npm_execpath && /[\\/][^\\/]yarn[^\\/]js$/.test(process.env.npm_execpath) ? 'yarn run' : 'npm run',
|
|
30
29
|
tsconfigSpecPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
31
30
|
tsconfigBasePath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
32
|
-
tsconfigBuildPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
33
|
-
eslintRcPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['.eslintrc.json', '.eslintrc.js'], options.targetPath)
|
|
31
|
+
tsconfigBuildPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
34
32
|
}),
|
|
35
33
|
(0, schematics_2.renameTemplateFiles)(),
|
|
36
34
|
(0, schematics_2.move)(options.targetPath)
|
|
@@ -43,6 +41,8 @@ function ngGenerateModule(options) {
|
|
|
43
41
|
const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
|
|
44
42
|
const packageJson = t.readJson(genPackageJsonPath);
|
|
45
43
|
packageJson.name = options.packageJsonName;
|
|
44
|
+
packageJson.scripts ||= {};
|
|
45
|
+
packageJson.scripts.ng = 'ng';
|
|
46
46
|
t.overwrite(genPackageJsonPath, JSON.stringify(packageJson, null, 2));
|
|
47
47
|
return t;
|
|
48
48
|
}
|
|
@@ -56,37 +56,26 @@ function ngGenerateModule(options) {
|
|
|
56
56
|
const updateTsConfigFiles = (tree, context) => {
|
|
57
57
|
const tsconfigBase = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
|
|
58
58
|
const tsconfigBuild = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
59
|
+
[tsconfigBase, tsconfigBuild].forEach(tsconfigPath => {
|
|
60
|
+
if (tsconfigPath) {
|
|
61
|
+
const configFile = tree.readJson(tsconfigPath);
|
|
62
|
+
if (configFile?.compilerOptions?.paths) {
|
|
63
|
+
configFile.compilerOptions.baseUrl = '.';
|
|
64
|
+
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
65
|
+
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
66
|
+
path.posix.join(relativeTargetPath, 'dist'),
|
|
67
|
+
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
68
|
+
];
|
|
69
|
+
tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
|
|
73
|
+
}
|
|
68
74
|
}
|
|
69
75
|
else {
|
|
70
|
-
context.logger.warn(
|
|
76
|
+
context.logger.warn(`No TsConfig file found at ${tsconfigPath}`);
|
|
71
77
|
}
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
context.logger.warn('No base TsConfig file found');
|
|
75
|
-
}
|
|
76
|
-
if (tsconfigBuild) {
|
|
77
|
-
const configFile = tree.readJson(tsconfigBuild);
|
|
78
|
-
if (configFile?.compilerOptions?.paths) {
|
|
79
|
-
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
80
|
-
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
81
|
-
path.posix.join(relativeTargetPath, 'dist'),
|
|
82
|
-
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
83
|
-
];
|
|
84
|
-
tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
context.logger.warn(`${tsconfigBuild} does not contain path mapping, the edition will be skipped`);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
78
|
+
});
|
|
90
79
|
};
|
|
91
80
|
const ngCliUpdate = (tree, context) => {
|
|
92
81
|
return (0, schematics_2.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":";;;AAEA,gDAA6D;AAC7D,2DAAuJ;AACvJ,kCAAkC;AAClC,qCAAuC;AACvC,qCAAoF;AACpF,sDAAmE;AAEnE;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAiF;IAEhH,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,MAAM,gBAAgB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC/C,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACzF,MAAM,kBAAkB,GAAqE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,13 +13,13 @@ const shouldOtterLinterBeInstalled = async (context) => {
|
|
|
13
13
|
try {
|
|
14
14
|
require.resolve(`${linterPackageName}/package.json`);
|
|
15
15
|
if (context.interactive) {
|
|
16
|
-
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have
|
|
16
|
+
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add Otter config rules for ESLint?
|
|
17
17
|
Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
catch {
|
|
21
|
-
context.logger.info(`
|
|
22
|
-
You can add
|
|
21
|
+
context.logger.info(`ESLint package not installed. Skipping otter linter phase!
|
|
22
|
+
You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
|
|
23
23
|
}
|
|
24
24
|
return useOtterLinter;
|
|
25
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-configs.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/project-configs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO;;CAA4B,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"project-configs.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/project-configs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO;;CAA4B,GAAG,IAAI,CA6BzH"}
|
|
@@ -27,6 +27,7 @@ function updateProjectTsConfig(targetPath, tsconfigName, options = { updateInput
|
|
|
27
27
|
}
|
|
28
28
|
if (options?.updateInputFiles) {
|
|
29
29
|
tsconfig.config = Object.fromEntries(Object.entries(tsconfig.config).filter(([propName, _]) => propName !== 'files'));
|
|
30
|
+
tsconfig.config.exclude = ['**/*.spec.ts', '**/fixture/', '**/*.fixture.ts', '**/fixtures.ts'];
|
|
30
31
|
tsconfig.config.include = ['./src/**/*.ts'];
|
|
31
32
|
}
|
|
32
33
|
const baseTsConfig = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-configs.js","sourceRoot":"","sources":["../../../schematics/rule-factories/project-configs.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,iCAAiC;AACjC,gDAA6D;AAG7D;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,YAAoB,EAAE,OAAO,GAAG,EAAC,gBAAgB,EAAE,KAAK,EAAC;IACjH,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,YAAY,gDAAgD,CAAC,CAAC;YAC9F,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,YAAY,kCAAkC,EAAE,QAAQ,EAAE,KAAY,CAAC,CAAC;YAC9G,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAC9B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC;YACtH,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,UAAU,CAAC,CAAC;QAC3G,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC;QACzC,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC;QACvC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;QAClD,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"project-configs.js","sourceRoot":"","sources":["../../../schematics/rule-factories/project-configs.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,iCAAiC;AACjC,gDAA6D;AAG7D;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,YAAoB,EAAE,OAAO,GAAG,EAAC,gBAAgB,EAAE,KAAK,EAAC;IACjH,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,YAAY,gDAAgD,CAAC,CAAC;YAC9F,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,YAAY,kCAAkC,EAAE,QAAQ,EAAE,KAAY,CAAC,CAAC;YAC9G,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAC9B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC;YACtH,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;YAC/F,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,uCAA0B,EAAC,IAAI,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,UAAU,CAAC,CAAC;QAC3G,IAAI,YAAY,EAAE,CAAC;YACjB,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC;QACzC,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC;QACvC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;QAClD,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AA7BD,sDA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc9D;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CA2B7D"}
|
|
@@ -1,32 +1,45 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cleanStandaloneFiles = void 0;
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
5
|
const node_path_1 = require("node:path");
|
|
6
|
+
const deleteIfExists = (paths) => (tree, context) => {
|
|
7
|
+
paths.forEach((path) => {
|
|
8
|
+
if (tree.exists(path)) {
|
|
9
|
+
tree.delete(path);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
context.logger.warn(`Tried to delete ${path} but file does not exist.`);
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
};
|
|
5
16
|
/**
|
|
6
17
|
* Clean files generated to standalone SDK
|
|
7
18
|
* @param targetPath Path where the SDK has been generated
|
|
8
19
|
*/
|
|
9
20
|
function cleanStandaloneFiles(targetPath) {
|
|
10
|
-
return (
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
return (0, schematics_1.chain)([
|
|
22
|
+
deleteIfExists([
|
|
23
|
+
node_path_1.posix.join(targetPath, '.renovaterc.json'),
|
|
24
|
+
node_path_1.posix.join(targetPath, '.vscode', 'settings.json'),
|
|
25
|
+
node_path_1.posix.join(targetPath, '.editorconfig'),
|
|
26
|
+
node_path_1.posix.join(targetPath, '.versionrc.json'),
|
|
27
|
+
node_path_1.posix.join(targetPath, '.commitlintrc.json'),
|
|
28
|
+
node_path_1.posix.join(targetPath, 'CONTRIBUTING.md')
|
|
29
|
+
]),
|
|
30
|
+
(tree) => {
|
|
31
|
+
const packageJson = tree.readJson(node_path_1.posix.join(targetPath, 'package.json'));
|
|
32
|
+
if (packageJson.scripts) {
|
|
33
|
+
const excludedScripts = ['postinstall', 'set:version'];
|
|
34
|
+
packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).filter(([scriptName]) => !excludedScripts.includes(scriptName)));
|
|
35
|
+
}
|
|
36
|
+
if (packageJson.devDependencies) {
|
|
37
|
+
packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).filter(([depName]) => depName !== '@o3r/workspace'));
|
|
38
|
+
}
|
|
39
|
+
tree.overwrite(node_path_1.posix.join(targetPath, 'package.json'), JSON.stringify(packageJson, null, 2));
|
|
40
|
+
return tree;
|
|
26
41
|
}
|
|
27
|
-
|
|
28
|
-
return tree;
|
|
29
|
-
};
|
|
42
|
+
]);
|
|
30
43
|
}
|
|
31
44
|
exports.cleanStandaloneFiles = cleanStandaloneFiles;
|
|
32
45
|
//# sourceMappingURL=clean-standalone.rule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAC9D,yCAAkC;AAGlC,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,CAAC,CAAC;gBACvD,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,IAAI,WAAW,CAAC,eAAe,EAAE,CAAC;gBAChC,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACpJ,CAAC;YACD,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;AA3BD,oDA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAsC3F"}
|
|
@@ -25,6 +25,7 @@ function updateTsConfig(targetPath, projectName, scope) {
|
|
|
25
25
|
context.logger.warn('No tsconfig found, the path mapping will not be updated');
|
|
26
26
|
return tree;
|
|
27
27
|
}
|
|
28
|
+
configWithPath.content.baseUrl ||= '.';
|
|
28
29
|
configWithPath.content.compilerOptions ||= {};
|
|
29
30
|
configWithPath.content.compilerOptions.paths ||= {};
|
|
30
31
|
configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}`] = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;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,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,kBAAkB,OAAO;YAC5B,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,kBAAkB,SAAS;YAC9B,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;
|
|
1
|
+
{"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;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,OAAO,KAAK,GAAG,CAAC;QACvC,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,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,kBAAkB,OAAO;YAC5B,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,kBAAkB,SAAS;YAC9B,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;AAtCD,wCAsCC"}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
/* eslint-disable @typescript-eslint/naming-convention */
|
|
2
|
-
/* eslint-disable quote-props */
|
|
3
|
-
|
|
4
|
-
module.exports = {
|
|
5
|
-
'root': true,
|
|
6
|
-
'parserOptions': {
|
|
7
|
-
'tsconfigRootDir': __dirname,
|
|
8
|
-
'project': [
|
|
9
|
-
'tsconfig.build.json',
|
|
10
|
-
'tsconfig.spec.json',
|
|
11
|
-
'tsconfig.builders.json',
|
|
12
|
-
'tsconfig.eslint.json'
|
|
13
|
-
],
|
|
14
|
-
'sourceType': 'module'
|
|
15
|
-
},
|
|
16
|
-
'extends': [
|
|
17
|
-
'<%= eslintRcPath %>'
|
|
18
|
-
]
|
|
19
|
-
};
|