@o3r/core 12.0.1 → 12.0.2

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": "12.0.1",
3
+ "version": "12.0.2",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -25,7 +25,7 @@
25
25
  "@ngrx/entity": "^19.0.0",
26
26
  "@ngrx/store": "^19.0.0",
27
27
  "@nx/angular": "~20.2.0",
28
- "@o3r/telemetry": "^12.0.1",
28
+ "@o3r/telemetry": "^12.0.2",
29
29
  "@schematics/angular": "^19.0.0",
30
30
  "chokidar": "^4.0.3",
31
31
  "globby": "^11.1.0",
@@ -64,7 +64,7 @@
64
64
  }
65
65
  },
66
66
  "dependencies": {
67
- "@o3r/schematics": "^12.0.1",
67
+ "@o3r/schematics": "^12.0.2",
68
68
  "tslib": "^2.6.2",
69
69
  "uuid": "^11.0.5"
70
70
  },
@@ -77,7 +77,7 @@
77
77
  "@ngrx/store": "~19.0.0",
78
78
  "@ngrx/store-devtools": "~19.0.0",
79
79
  "@nx/eslint-plugin": "~20.2.0",
80
- "@o3r/store-sync": "^12.0.1",
80
+ "@o3r/store-sync": "^12.0.2",
81
81
  "@stylistic/eslint-plugin": "~3.0.0",
82
82
  "@types/jest": "~29.5.2",
83
83
  "@typescript-eslint/eslint-plugin": "~8.23.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;AAkGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,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;AAmGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
@@ -55,8 +55,9 @@ function ngAddFn(options) {
55
55
  (0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
56
56
  async (t, c) => {
57
57
  const { preset, externalPresets, ...forwardOptions } = options;
58
- const presetRunner = await presets_1.presets[preset]({ projectName: forwardOptions.projectName, forwardOptions });
59
- const externalPresetRunner = externalPresets ? await (0, presets_1.getExternalPreset)(externalPresets, t, c)({ projectName: forwardOptions.projectName, forwardOptions }) : undefined;
58
+ const presetOptions = { projectName: forwardOptions.projectName, exactO3rVersion: forwardOptions.exactO3rVersion, forwardOptions };
59
+ const presetRunner = await presets_1.presets[preset](presetOptions);
60
+ const externalPresetRunner = externalPresets ? await (0, presets_1.getExternalPreset)(externalPresets, t, c)(presetOptions) : undefined;
60
61
  const modules = [...new Set([...(presetRunner.modules || []), ...(externalPresetRunner?.modules || [])])];
61
62
  if (modules.length > 0) {
62
63
  c.logger.info(`The following modules will be installed: ${modules.join(', ')}`);
@@ -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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"}
@@ -23,7 +23,7 @@ function defaultPresetRuleFactory(moduleToInstall, options = {}) {
23
23
  range: `${options.exactO3rVersion ? '' : '~'}${corePackageJsonContent.version}`,
24
24
  types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
25
25
  }],
26
- ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
26
+ ngAddOptions: { ...options.forwardOptions, exactO3rVersion: options.exactO3rVersion }
27
27
  };
28
28
  return acc;
29
29
  }, {});
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":";;AAwBA,4DAkCC;AA1DD,8BAA8B;AAC9B,kCAAkC;AAClC,2DAGoC;AACpC,gDAKyB;AAQzB;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,eAAyB,EAAE,UAAyB,EAAE;IAC7F,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAC3J,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACvD,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,sBAAsB,CAAC,OAAO,EAAE;wBAC/E,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAE1C,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;YACpC,OAAO,CAAC,uBAAuB,CAAC,YAAY,GAAG;gBAC7C,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY;gBAC/C,GAAG,YAAY;aAChB,CAAC;QACJ,CAAC;QAED,OAAO,OAAO,CAAC,uBAAuB;YACpC,CAAC,CAAC,iBAAI;YACN,CAAC,CAAC,IAAA,8BAAiB,EAAC;gBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,eAAe;aAC5B,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":";;AAwBA,4DAkCC;AA1DD,8BAA8B;AAC9B,kCAAkC;AAClC,2DAGoC;AACpC,gDAKyB;AAQzB;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,eAAyB,EAAE,UAAyB,EAAE;IAC7F,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;QAC3J,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACvD,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,sBAAsB,CAAC,OAAO,EAAE;wBAC/E,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aACtF,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAqC,CAAC,CAAC;QAE1C,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;YACpC,OAAO,CAAC,uBAAuB,CAAC,YAAY,GAAG;gBAC7C,GAAG,OAAO,CAAC,uBAAuB,CAAC,YAAY;gBAC/C,GAAG,YAAY;aAChB,CAAC;QACJ,CAAC;QAED,OAAO,OAAO,CAAC,uBAAuB;YACpC,CAAC,CAAC,iBAAI;YACN,CAAC,CAAC,IAAA,8BAAiB,EAAC;gBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,eAAe;aAC5B,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC"}