@o3r/core 12.3.7 → 12.3.8
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 +5 -5
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +3 -2
- package/schematics/ng-add/index.js.map +1 -1
- package/schematics/rule-factories/additional-modules/index.d.ts.map +1 -1
- package/schematics/rule-factories/additional-modules/index.js +16 -18
- package/schematics/rule-factories/additional-modules/index.js.map +1 -1
- package/schematics/rule-factories/store/index.d.ts.map +1 -1
- package/schematics/rule-factories/store/index.js +12 -8
- package/schematics/rule-factories/store/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/core",
|
|
3
|
-
"version": "12.3.
|
|
3
|
+
"version": "12.3.8",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -39,13 +39,13 @@
|
|
|
39
39
|
"@ngrx/entity": "^19.0.0",
|
|
40
40
|
"@ngrx/store": "^19.0.0",
|
|
41
41
|
"@nx/angular": "~20.8.0",
|
|
42
|
-
"@o3r/telemetry": "^12.3.
|
|
42
|
+
"@o3r/telemetry": "^12.3.8",
|
|
43
43
|
"@schematics/angular": "^19.0.0",
|
|
44
44
|
"chokidar": "^4.0.3",
|
|
45
45
|
"globby": "^11.1.0",
|
|
46
46
|
"rxjs": "^7.8.1",
|
|
47
47
|
"ts-node": "~10.9.2",
|
|
48
|
-
"type-fest": "^4.
|
|
48
|
+
"type-fest": "^4.30.1",
|
|
49
49
|
"typescript": "^5.5.4"
|
|
50
50
|
},
|
|
51
51
|
"peerDependenciesMeta": {
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
}
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"@o3r/schematics": "^12.3.
|
|
81
|
+
"@o3r/schematics": "^12.3.8",
|
|
82
82
|
"tslib": "^2.6.2",
|
|
83
83
|
"uuid": "^11.0.5"
|
|
84
84
|
},
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@ngrx/store": "~19.1.0",
|
|
92
92
|
"@ngrx/store-devtools": "~19.1.0",
|
|
93
93
|
"@nx/eslint-plugin": "~20.8.0",
|
|
94
|
-
"@o3r/store-sync": "^12.3.
|
|
94
|
+
"@o3r/store-sync": "^12.3.8",
|
|
95
95
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
96
96
|
"@types/jest": "~29.5.2",
|
|
97
97
|
"@typescript-eslint/eslint-plugin": "~8.32.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAwGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
|
|
@@ -52,8 +52,10 @@ function ngAddFn(options) {
|
|
|
52
52
|
return (0, schematics_1.chain)([
|
|
53
53
|
(0, schematics_2.setupSchematicsParamsForProject)({ '*:ng-add': { registerDevtool: options.withDevtool } }, options.projectName),
|
|
54
54
|
options.exactO3rVersion ? (0, schematics_2.setupSchematicsParamsForProject)({ '*:*': { exactO3rVersion: true } }, options.projectName) : (0, schematics_1.noop)(),
|
|
55
|
+
// Warning: this should always be executed before the setup dependencies as it modifies the options.dependencies
|
|
55
56
|
options.projectName ? (0, index_1.prepareProject)(options, dependenciesSetupConfig) : (0, schematics_1.noop)(),
|
|
56
57
|
(0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
|
|
58
|
+
(0, schematics_3.setupDependencies)(dependenciesSetupConfig),
|
|
57
59
|
async (t, c) => {
|
|
58
60
|
const { preset, externalPresets, ...forwardOptions } = options;
|
|
59
61
|
const presetOptions = { projectName: forwardOptions.projectName, exactO3rVersion: forwardOptions.exactO3rVersion, forwardOptions, isUsingEslintLegacy: (0, utils_1.isUsingLegacyConfig)(t) };
|
|
@@ -71,8 +73,7 @@ function ngAddFn(options) {
|
|
|
71
73
|
externalPresetRunner?.rule || (0, schematics_1.noop)()
|
|
72
74
|
])(t, c);
|
|
73
75
|
},
|
|
74
|
-
options.projectName ? (0, schematics_2.displayModuleListRule)({ packageName: options.projectName }) : (0, schematics_1.noop)()
|
|
75
|
-
(0, schematics_3.setupDependencies)(dependenciesSetupConfig)
|
|
76
|
+
options.projectName ? (0, schematics_2.displayModuleListRule)({ packageName: options.projectName }) : (0, schematics_1.noop)()
|
|
76
77
|
]);
|
|
77
78
|
};
|
|
78
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAmBzB;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,uBAAuB,EAAE,wBAAwB,GAAG,IAAI,CA6MrL"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateAdditionalModules = updateAdditionalModules;
|
|
4
|
-
const fs = require("node:fs");
|
|
5
4
|
const path = require("node:path");
|
|
6
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
6
|
const schematics_2 = require("@o3r/schematics");
|
|
8
7
|
const utility_1 = require("@schematics/angular/utility");
|
|
9
8
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
10
9
|
const change_1 = require("@schematics/angular/utility/change");
|
|
11
|
-
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
12
10
|
const ts = require("typescript");
|
|
13
|
-
const
|
|
14
|
-
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
11
|
+
const o3rPackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
|
|
15
12
|
const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';
|
|
16
13
|
/**
|
|
17
14
|
* Add additional modules for dev only
|
|
@@ -24,21 +21,22 @@ function updateAdditionalModules(options, dependenciesSetupConfig) {
|
|
|
24
21
|
/**
|
|
25
22
|
* Update package.json to add additional modules dependencies
|
|
26
23
|
* @param tree
|
|
24
|
+
* @param context
|
|
27
25
|
*/
|
|
28
|
-
const updatePackageJson = (tree) => {
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
26
|
+
const updatePackageJson = (tree, context) => {
|
|
27
|
+
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
28
|
+
const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
|
|
29
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
30
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
31
|
+
dependenciesSetupConfig.dependencies = {
|
|
32
|
+
...dependenciesSetupConfig.dependencies,
|
|
33
|
+
...(0, schematics_2.getExternalDependenciesInfo)({
|
|
34
|
+
dependenciesToInstall: [ngrxStoreDevtoolsDep],
|
|
35
|
+
devDependenciesToInstall: ['chokidar'],
|
|
36
|
+
o3rPackageJsonPath,
|
|
37
|
+
projectType: workspaceProject?.projectType,
|
|
38
|
+
projectPackageJson
|
|
39
|
+
}, context.logger)
|
|
42
40
|
};
|
|
43
41
|
return tree;
|
|
44
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAuBzB;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAuIrD"}
|
|
@@ -48,17 +48,21 @@ function updateStore(options, projectType) {
|
|
|
48
48
|
const updatePackageJson = (tree, context) => {
|
|
49
49
|
const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
|
|
50
50
|
const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
|
|
51
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
52
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
51
53
|
const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep];
|
|
52
54
|
const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
|
|
53
55
|
const dependenciesList = projectType === 'application' ? [...corePeerDeps, ...appDeps] : [...corePeerDeps];
|
|
54
|
-
|
|
55
|
-
options.dependenciesSetupConfig.dependencies
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
56
|
+
options.dependenciesSetupConfig.dependencies = {
|
|
57
|
+
...options.dependenciesSetupConfig.dependencies,
|
|
58
|
+
...(0, schematics_2.getExternalDependenciesInfo)({
|
|
59
|
+
dependenciesToInstall: dependenciesList,
|
|
60
|
+
devDependenciesToInstall: [],
|
|
61
|
+
o3rPackageJsonPath: corePackageJsonPath,
|
|
62
|
+
projectType,
|
|
63
|
+
projectPackageJson
|
|
64
|
+
}, context.logger)
|
|
65
|
+
};
|
|
62
66
|
};
|
|
63
67
|
/**
|
|
64
68
|
* Edit main module with the translation required configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"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"}
|