@o3r/third-party 12.3.7 → 12.3.9

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/third-party",
3
- "version": "12.3.7",
3
+ "version": "12.3.9",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -12,16 +12,17 @@
12
12
  "otter-module"
13
13
  ],
14
14
  "dependencies": {
15
- "@o3r/schematics": "^12.3.7",
15
+ "@o3r/schematics": "^12.3.9",
16
16
  "tslib": "^2.6.2",
17
17
  "uuid": "^11.0.5"
18
18
  },
19
19
  "peerDependencies": {
20
20
  "@angular-devkit/schematics": "^19.0.0",
21
- "@o3r/core": "^12.3.7",
22
- "@o3r/schematics": "^12.3.7",
21
+ "@o3r/core": "^12.3.9",
22
+ "@o3r/schematics": "^12.3.9",
23
23
  "@schematics/angular": "^19.0.0",
24
24
  "rxjs": "^7.8.1",
25
+ "type-fest": "^4.30.1",
25
26
  "typescript": "^5.5.4"
26
27
  },
27
28
  "peerDependenciesMeta": {
@@ -37,6 +38,9 @@
37
38
  "@schematics/angular": {
38
39
  "optional": true
39
40
  },
41
+ "type-fest": {
42
+ "optional": true
43
+ },
40
44
  "typescript": {
41
45
  "optional": true
42
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoBlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAEtD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgDlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAEtD,CAAC"}
@@ -5,19 +5,42 @@ const fs = require("node:fs");
5
5
  const path = require("node:path");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_2 = require("@o3r/schematics");
8
+ /**
9
+ * List of external dependencies to be added to the project as peer dependencies
10
+ */
11
+ const dependenciesToInstall = [
12
+ 'rxjs'
13
+ ];
14
+ /**
15
+ * List of external dependencies to be added to the project as dev dependencies
16
+ */
17
+ const devDependenciesToInstall = [];
8
18
  /**
9
19
  * Add Otter third-party to an Angular Project
10
20
  * @param options
11
21
  */
12
22
  function ngAddFn(options) {
13
- return (tree) => {
23
+ return (tree, context) => {
14
24
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
25
+ const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
15
26
  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
27
+ const projectDirectory = workspaceProject?.root || '.';
28
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
29
+ const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
30
+ devDependenciesToInstall,
31
+ dependenciesToInstall,
32
+ projectType: workspaceProject?.projectType,
33
+ projectPackageJson,
34
+ o3rPackageJsonPath: packageJsonPath
35
+ }, context.logger);
16
36
  return (0, schematics_1.chain)([
17
37
  (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
18
38
  (0, schematics_2.setupDependencies)({
19
39
  projectName: options.projectName,
20
- dependencies: (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion)
40
+ dependencies: {
41
+ ...(0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion),
42
+ ...externalDependenciesInfo
43
+ }
21
44
  })
22
45
  ]);
23
46
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAGoC;AACpC,gDAKyB;AAKzB;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,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,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,gDAAmC,EAAC,WAAW,CAAC;YAChD,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;aACpH,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,GAAG,EAAE;IAClE,OAAO,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC,CAAC;AAFW,QAAA,KAAK,SAEhB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAGoC;AACpC,gDAOyB;AAQzB;;GAEG;AACH,MAAM,qBAAqB,GAAG;IAC5B,MAAM;CACP,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAa,EAC1C,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,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,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAC3G,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;YAC3D,wBAAwB;YACxB,qBAAqB;YACrB,WAAW,EAAE,gBAAgB,EAAE,WAAW;YAC1C,kBAAkB;YAClB,kBAAkB,EAAE,eAAe;SACpC,EACD,OAAO,CAAC,MAAM,CACb,CAAC;QACF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,gDAAmC,EAAC,WAAW,CAAC;YAChD,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;oBACxG,GAAG,wBAAwB;iBAC5B;aACF,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,GAAG,EAAE;IAClE,OAAO,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC,CAAC;AAFW,QAAA,KAAK,SAEhB"}