@o3r/core 10.1.0-prerelease.25 → 10.1.0-prerelease.27

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.
Files changed (15) hide show
  1. package/package.json +4 -4
  2. package/schematics/ng-add/index.d.ts.map +1 -1
  3. package/schematics/ng-add/index.js +7 -4
  4. package/schematics/ng-add/project-setup/index.d.ts.map +1 -1
  5. package/schematics/ng-add/project-setup/index.js +3 -2
  6. package/schematics/ng-add/schema.d.ts +2 -0
  7. package/schematics/ng-add/schema.d.ts.map +1 -1
  8. package/schematics/ng-add/schema.json +5 -0
  9. package/schematics/rule-factories/store/index.d.ts +1 -0
  10. package/schematics/rule-factories/store/index.d.ts.map +1 -1
  11. package/schematics/rule-factories/store/index.js +3 -2
  12. package/schematics/shared/presets/helpers.d.ts.map +1 -1
  13. package/schematics/shared/presets/helpers.js +3 -2
  14. package/schematics/shared/presets/preset.interface.d.ts +2 -0
  15. package/schematics/shared/presets/preset.interface.d.ts.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/core",
3
- "version": "10.1.0-prerelease.25",
3
+ "version": "10.1.0-prerelease.27",
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.0.2",
28
28
  "@nx/angular": "~18.0.2",
29
- "@o3r/telemetry": "^10.1.0-prerelease.25",
29
+ "@o3r/telemetry": "^10.1.0-prerelease.27",
30
30
  "@schematics/angular": "~17.2.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.1.0-prerelease.25",
67
+ "@o3r/schematics": "^10.1.0-prerelease.27",
68
68
  "tslib": "^2.5.3",
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.1.0-prerelease.25",
77
+ "@o3r/store-sync": "^10.1.0-prerelease.27",
78
78
  "@types/jest": "~29.5.2",
79
79
  "nx": "~18.0.2",
80
80
  "@typescript-eslint/parser": "^7.0.1",
package/schematics/ng-add/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6EjD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAgFjD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
package/schematics/ng-add/index.js CHANGED
@@ -21,15 +21,17 @@ const o3rDevDependencies = [
21
21
  function ngAddFn(options) {
22
22
  const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
23
23
  const o3rCoreVersion = corePackageJsonContent.version;
24
+ const o3rVersionRange = options.exactO3rVersion ? o3rCoreVersion : `~${o3rCoreVersion}`;
24
25
  return () => {
25
26
  const dependenciesSetupConfig = {
26
27
  projectName: options.projectName,
27
28
  dependencies: o3rDevDependencies.reduce((acc, dep) => {
28
29
  acc[dep] = {
29
30
  inManifest: [{
30
- range: `~${o3rCoreVersion}`,
31
+ range: o3rVersionRange,
31
32
  types: [dependencies_1.NodeDependencyType.Dev]
32
- }]
33
+ }],
34
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
33
35
  };
34
36
  return acc;
35
37
  }, {}),
@@ -39,9 +41,10 @@ function ngAddFn(options) {
39
41
  dependenciesSetupConfig.dependencies[workspacePackageName] = {
40
42
  toWorkspaceOnly: true,
41
43
  inManifest: [{
42
- range: `~${o3rCoreVersion}`,
44
+ range: o3rVersionRange,
43
45
  types: [dependencies_1.NodeDependencyType.Default]
44
- }]
46
+ }],
47
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
45
48
  };
46
49
  (dependenciesSetupConfig.ngAddToRun ||= []).push(workspacePackageName);
47
50
  }
package/schematics/ng-add/project-setup/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAUpE,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMvD;;;;;GAKG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,2BAA2B,wBAAwB,KAAG,IA8ClH,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAUpE,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMvD;;;;;GAKG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,2BAA2B,wBAAwB,KAAG,IA+ClH,CAAC"}
package/schematics/ng-add/project-setup/index.js CHANGED
@@ -40,9 +40,10 @@ const prepareProject = (options, dependenciesSetupConfig) => async (tree, contex
40
40
  .forEach((dep) => {
41
41
  dependenciesSetupConfig.dependencies[dep] = {
42
42
  inManifest: [{
43
- range: `~${o3rCoreVersion}`,
43
+ range: `${options.exactO3rVersion ? '' : '~'}${o3rCoreVersion}`,
44
44
  types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
45
- }]
45
+ }],
46
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
46
47
  };
47
48
  });
48
49
  (dependenciesSetupConfig.ngAddToRun ||= []).push(...internalPackagesToInstallWithNgAdd);
package/schematics/ng-add/schema.d.ts CHANGED
@@ -22,5 +22,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
22
22
  withDevtool: boolean;
23
23
  /** Force package installation (in case of unmet peer dependencies) */
24
24
  forceInstall: boolean;
25
+ /** Use a pinned version for otter packages */
26
+ exactO3rVersion?: boolean;
25
27
  }
26
28
  //# sourceMappingURL=schema.d.ts.map
package/schematics/ng-add/schema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,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,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;CACvB"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,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,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IAEtB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
package/schematics/ng-add/schema.json CHANGED
@@ -53,6 +53,11 @@
53
53
  "description": "Force package installation (in case of unmet peer dependencies)",
54
54
  "type": "boolean",
55
55
  "default": true
56
+ },
57
+ "exactO3rVersion": {
58
+ "type": "boolean",
59
+ "description": "Use a pinned version for otter packages",
60
+ "default": false
56
61
  }
57
62
  },
58
63
  "additionalProperties": true,
package/schematics/rule-factories/store/index.d.ts CHANGED
@@ -15,5 +15,6 @@ export declare function updateStore(options: {
15
15
  projectName?: string | undefined;
16
16
  workingDirector?: string | undefined;
17
17
  dependenciesSetupConfig: SetupDependenciesOptions;
18
+ exactO3rVersion?: boolean;
18
19
  }, projectType?: WorkspaceProject['projectType']): Rule;
19
20
  //# sourceMappingURL=index.d.ts.map
package/schematics/rule-factories/store/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBnD;;;;;;;;;GASG;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,CAAA;CAAE,EACtI,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAkIrD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBnD;;;;;;;;;GASG;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,CAmIrD"}
package/schematics/rule-factories/store/index.js CHANGED
@@ -34,9 +34,10 @@ function updateStore(options, projectType) {
34
34
  const storeSyncPackageName = '@o3r/store-sync';
35
35
  options.dependenciesSetupConfig.dependencies[storeSyncPackageName] = {
36
36
  inManifest: [{
37
- range: `~${o3rCoreVersion}`,
37
+ range: `${options.exactO3rVersion ? '' : '~'}${o3rCoreVersion}`,
38
38
  types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
39
- }]
39
+ }],
40
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
40
41
  };
41
42
  (options.dependenciesSetupConfig.ngAddToRun ||= []).push(storeSyncPackageName);
42
43
  };
package/schematics/shared/presets/helpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAK3D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,IAAI,CAgCrG"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAK3D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,IAAI,CAiCrG"}
package/schematics/shared/presets/helpers.js CHANGED
@@ -20,9 +20,10 @@ function defaultPresetRuleFactory(moduleToInstall, options = {}) {
20
20
  const dependencies = moduleToInstall.reduce((acc, dep) => {
21
21
  acc[dep] = {
22
22
  inManifest: [{
23
- range: `~${corePackageJsonContent.version}`,
23
+ range: `${options.exactO3rVersion ? '' : '~'}${corePackageJsonContent.version}`,
24
24
  types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
25
- }]
25
+ }],
26
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
26
27
  };
27
28
  return acc;
28
29
  }, {});
package/schematics/shared/presets/preset.interface.d.ts CHANGED
@@ -9,6 +9,8 @@ export interface PresetOptions {
9
9
  forwardOptions?: SchematicOptionObject;
10
10
  /** Option to provide to the dependency setup helper */
11
11
  dependenciesSetupConfig?: SetupDependenciesOptions;
12
+ /** Use a pinned version for otter packages */
13
+ exactO3rVersion?: boolean;
12
14
  }
13
15
  /** Definition of the modules preset */
14
16
  export interface Preset {
package/schematics/shared/presets/preset.interface.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEvF,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;CACpD;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}
1
+ {"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEvF,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;IAEnD,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}