@o3r/mobile 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/mobile",
3
- "version": "12.3.7",
3
+ "version": "12.3.8",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -26,7 +26,7 @@
26
26
  "otter-module"
27
27
  ],
28
28
  "dependencies": {
29
- "@o3r/schematics": "^12.3.7",
29
+ "@o3r/schematics": "^12.3.8",
30
30
  "commander": "^13.0.0",
31
31
  "form-data": "^4.0.0",
32
32
  "node-fetch": "^3.0.0",
@@ -42,13 +42,14 @@
42
42
  "@capacitor/device": "^7.0.0",
43
43
  "@capacitor/preferences": "^7.0.0",
44
44
  "@ngrx/store": "^19.0.0",
45
- "@o3r/core": "^12.3.7",
46
- "@o3r/logger": "^12.3.7",
47
- "@o3r/schematics": "^12.3.7",
48
- "@o3r/store-sync": "^12.3.7",
45
+ "@o3r/core": "^12.3.8",
46
+ "@o3r/logger": "^12.3.8",
47
+ "@o3r/schematics": "^12.3.8",
48
+ "@o3r/store-sync": "^12.3.8",
49
49
  "@schematics/angular": "^19.0.0",
50
50
  "fast-deep-equal": "^3.1.3",
51
- "rxjs": "^7.8.1"
51
+ "rxjs": "^7.8.1",
52
+ "type-fest": "^4.30.1"
52
53
  },
53
54
  "peerDependenciesMeta": {
54
55
  "@angular-devkit/schematics": {
@@ -59,6 +60,9 @@
59
60
  },
60
61
  "@schematics/angular": {
61
62
  "optional": true
63
+ },
64
+ "type-fest": {
65
+ "optional": true
62
66
  }
63
67
  },
64
68
  "engines": {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAkClB;;;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":"AACA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -5,15 +5,35 @@ const path = require("node:path");
5
5
  const schematics_1 = require("@angular-devkit/schematics");
6
6
  const schematics_2 = require("@o3r/schematics");
7
7
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
8
+ /**
9
+ * List of external dependencies to be added to the project as peer dependencies
10
+ */
11
+ const dependenciesToInstall = [
12
+ '@angular/common',
13
+ '@angular/core',
14
+ '@capacitor/browser',
15
+ '@capacitor/core',
16
+ '@capacitor/device',
17
+ '@capacitor/preferences',
18
+ '@ngrx/store',
19
+ 'fast-deep-equal',
20
+ 'rxjs'
21
+ ];
22
+ /**
23
+ * List of external dependencies to be added to the project as dev dependencies
24
+ */
25
+ const devDependenciesToInstall = [];
8
26
  /**
9
27
  * Add Otter mobile to an Angular Project
10
28
  * @param options ng add options
11
29
  */
12
30
  function ngAddFn(options) {
13
31
  /* ng add rules */
14
- return (tree) => {
32
+ return (tree, context) => {
15
33
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'));
16
34
  const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
35
+ const projectDirectory = workspaceProject?.root || '.';
36
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
17
37
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
18
38
  acc[dep] = {
19
39
  inManifest: [{
@@ -24,11 +44,21 @@ function ngAddFn(options) {
24
44
  };
25
45
  return acc;
26
46
  }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
47
+ const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
48
+ devDependenciesToInstall,
49
+ dependenciesToInstall,
50
+ projectType: workspaceProject?.projectType,
51
+ projectPackageJson,
52
+ o3rPackageJsonPath: packageJsonPath
53
+ }, context.logger);
27
54
  return (0, schematics_1.chain)([
28
55
  (0, schematics_2.removePackages)(['@otter/mobile']),
29
56
  (0, schematics_2.setupDependencies)({
30
57
  projectName: options.projectName,
31
- dependencies,
58
+ dependencies: {
59
+ ...dependencies,
60
+ ...externalDependenciesInfo
61
+ },
32
62
  ngAddToRun: depsInfo.o3rPeerDeps
33
63
  })
34
64
  ]);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAGoC;AACpC,gDAQyB;AAKzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAE5E;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QACrF,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,IAAA,kBAAK,EAAC;YACX,IAAA,2BAAc,EAAC,CAAC,eAAe,CAAC,CAAC;YACjC,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,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":";;;AAAA,kCAAkC;AAClC,2DAGoC;AACpC,gDASyB;AAQzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5E;;GAEG;AACH,MAAM,qBAAqB,GAAG;IAC5B,iBAAiB;IACjB,eAAe;IACf,oBAAoB;IACpB,iBAAiB;IACjB,mBAAmB;IACnB,wBAAwB;IACxB,aAAa;IACb,iBAAiB;IACjB,MAAM;CACP,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAa,EAE0C,CAAC;AAEtF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QACrF,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,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;QAE3G,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;QAE1G,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;QAEF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,2BAAc,EAAC,CAAC,eAAe,CAAC,CAAC;YACjC,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,YAAY;oBACf,GAAG,wBAAwB;iBAC5B;gBACD,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,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"}