@o3r/core 10.2.0-rc.3 → 10.2.0-rc.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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/core",
|
|
3
|
-
"version": "10.2.0-rc.
|
|
3
|
+
"version": "10.2.0-rc.5",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@ngrx/store": "~17.1.0",
|
|
27
27
|
"@nrwl/devkit": "~18.2.0",
|
|
28
28
|
"@nx/angular": "~18.2.0",
|
|
29
|
-
"@o3r/telemetry": "^10.2.0-rc.
|
|
29
|
+
"@o3r/telemetry": "^10.2.0-rc.5",
|
|
30
30
|
"@schematics/angular": "~17.3.0",
|
|
31
31
|
"chokidar": "^3.5.2",
|
|
32
32
|
"globby": "^11.1.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@o3r/schematics": "^10.2.0-rc.
|
|
67
|
+
"@o3r/schematics": "^10.2.0-rc.5",
|
|
68
68
|
"tslib": "^2.6.2",
|
|
69
69
|
"uuid": "^9.0.0"
|
|
70
70
|
},
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@ngrx/router-store": "~17.1.0",
|
|
75
75
|
"@ngrx/effects": "~17.1.0",
|
|
76
76
|
"@ngrx/store-devtools": "~17.1.0",
|
|
77
|
-
"@o3r/store-sync": "^10.2.0-rc.
|
|
77
|
+
"@o3r/store-sync": "^10.2.0-rc.5",
|
|
78
78
|
"@types/jest": "~29.5.2",
|
|
79
79
|
"nx": "~18.2.0",
|
|
80
80
|
"@typescript-eslint/parser": "^7.2.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AA0BhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AA0BhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAmQ5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,iEAAwE,CAAC"}
|
|
@@ -143,14 +143,17 @@ function ngGenerateComponentContainerFn(options) {
|
|
|
143
143
|
let specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);
|
|
144
144
|
const recorder = tree.beginUpdate(o3rSpecPath);
|
|
145
145
|
const lastImport = [...specSourceFile.statements].reverse().find((statement) => ts.isImportDeclaration(statement));
|
|
146
|
-
const changes = [
|
|
146
|
+
const changes = [
|
|
147
|
+
(0, ast_utils_1.insertImport)(specSourceFile, o3rSpecPath, 'Component', '@angular/core'),
|
|
148
|
+
new change_1.InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
|
|
147
149
|
@Component({
|
|
148
150
|
template: '',
|
|
149
151
|
selector: '${properties.presenterComponentSelector}',
|
|
150
152
|
standalone: true
|
|
151
153
|
})
|
|
152
154
|
class Mock${properties.presenterComponentName} {}
|
|
153
|
-
`)
|
|
155
|
+
`)
|
|
156
|
+
];
|
|
154
157
|
(0, change_1.applyToUpdateRecorder)(recorder, changes);
|
|
155
158
|
tree.commitUpdate(recorder);
|
|
156
159
|
specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":";;;AAAA,2DAAgM;AAChM,gDAcyB;AACzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,12 @@ const shouldOtterLinterBeInstalled = async (context) => {
|
|
|
14
14
|
try {
|
|
15
15
|
require.resolve(`${linterPackageName}/package.json`);
|
|
16
16
|
if (context.interactive) {
|
|
17
|
-
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have eslint installed. Would you like to add otter config rules for eslint
|
|
17
|
+
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have eslint installed. Would you like to add otter config rules for eslint?
|
|
18
18
|
Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
catch {
|
|
22
|
-
context.logger.info(`eslint package not installed. Skipping otter linter phase
|
|
22
|
+
context.logger.info(`eslint package not installed. Skipping otter linter phase!
|
|
23
23
|
You can add otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
|
|
24
24
|
}
|
|
25
25
|
return useOtterLinter;
|