@o3r/configuration 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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/configuration",
3
- "version": "12.3.7",
3
+ "version": "12.3.8",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -48,16 +48,16 @@
48
48
  "@angular/platform-browser-dynamic": "^19.0.0",
49
49
  "@ngrx/entity": "^19.0.0",
50
50
  "@ngrx/store": "^19.0.0",
51
- "@o3r/core": "^12.3.7",
52
- "@o3r/logger": "^12.3.7",
53
- "@o3r/schematics": "^12.3.7",
54
- "@o3r/testing": "^12.3.7",
51
+ "@o3r/core": "^12.3.8",
52
+ "@o3r/logger": "^12.3.8",
53
+ "@o3r/schematics": "^12.3.8",
55
54
  "@schematics/angular": "^19.0.0",
56
55
  "cheerio": "^1.0.0-rc.10",
57
56
  "express-interceptor": "^1.2.0",
58
57
  "jasmine": "^5.0.0",
59
58
  "rxjs": "^7.8.1",
60
59
  "ts-node": "~10.9.2",
60
+ "type-fest": "^4.30.1",
61
61
  "typescript": "^5.5.4"
62
62
  },
63
63
  "peerDependenciesMeta": {
@@ -79,12 +79,15 @@
79
79
  "jasmine": {
80
80
  "optional": true
81
81
  },
82
+ "type-fest": {
83
+ "optional": true
84
+ },
82
85
  "typescript": {
83
86
  "optional": true
84
87
  }
85
88
  },
86
89
  "dependencies": {
87
- "@o3r/schematics": "^12.3.7",
90
+ "@o3r/schematics": "^12.3.8",
88
91
  "tslib": "^2.6.2"
89
92
  },
90
93
  "engines": {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8ElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -6,6 +6,22 @@ const path = require("node:path");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_2 = require("@o3r/schematics");
8
8
  const devtools_registration_1 = require("./helpers/devtools-registration");
9
+ /**
10
+ * List of external dependencies to be added to the project as peer dependencies
11
+ */
12
+ const dependenciesToInstall = [
13
+ '@angular/core',
14
+ '@angular/platform-browser-dynamic',
15
+ '@ngrx/entity',
16
+ '@ngrx/store',
17
+ 'rxjs'
18
+ ];
19
+ /**
20
+ * List of external dependencies to be added to the project as dev dependencies
21
+ */
22
+ const devDependenciesToInstall = [
23
+ 'rxjs'
24
+ ];
9
25
  /**
10
26
  * Add Otter configuration to an Angular Project
11
27
  * @param options The options to pass to ng-add execution
@@ -30,6 +46,15 @@ function ngAddFn(options) {
30
46
  context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
31
47
  context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/configuration/OVERVIEW.md#Runtime-debugging');
32
48
  const schematicsDefaultOptions = { useOtterConfig: undefined };
49
+ const projectDirectory = workspaceProject?.root || '.';
50
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
51
+ const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
52
+ devDependenciesToInstall,
53
+ dependenciesToInstall,
54
+ o3rPackageJsonPath: packageJsonPath,
55
+ projectType: workspaceProject?.projectType,
56
+ projectPackageJson
57
+ }, context.logger);
33
58
  return () => (0, schematics_1.chain)([
34
59
  (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
35
60
  (0, schematics_2.setupSchematicsParamsForProject)({
@@ -39,7 +64,10 @@ function ngAddFn(options) {
39
64
  }, options.projectName),
40
65
  (0, schematics_2.setupDependencies)({
41
66
  projectName: options.projectName,
42
- dependencies,
67
+ dependencies: {
68
+ ...dependencies,
69
+ ...externalDependenciesInfo
70
+ },
43
71
  ngAddToRun: depsInfo.o3rPeerDeps
44
72
  }),
45
73
  () => (0, devtools_registration_1.registerDevtools)(options)
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAKoC;AACpC,gDASyB;AACzB,2EAEyC;AAKzC;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,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,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,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,QAAQ,CAAC,cAAc,EAAE;wBACxE,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,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1G,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,WAAqB,+BAA+B,CAAC,CAAC;QAClG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gJAAgJ,CAAC,CAAC;QACtK,MAAM,wBAAwB,GAAG,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;QAC/D,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,IAAA,gDAAmC,EAAC,WAAW,CAAC;YAChD,IAAA,4CAA+B,EAAC;gBAC9B,qBAAqB,EAAE,wBAAwB;gBAC/C,+BAA+B,EAAE,wBAAwB;gBACzD,+BAA+B,EAAE,wBAAwB;aAC1D,EAAE,OAAO,CAAC,WAAW,CAAC;YACvB,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YACF,GAAG,EAAE,CAAC,IAAA,wCAAgB,EAAC,OAAO,CAAC;SAChC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}