@o3r/core 11.0.0-prerelease.3 → 11.0.0-prerelease.31

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 (4) hide show
  1. package/package.json +7 -8
  2. package/schematics/rule-factories/otter-environment/index.d.ts +0 -1
  3. package/schematics/rule-factories/otter-environment/index.d.ts.map +1 -1
  4. package/schematics/rule-factories/otter-environment/index.js +5 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/core",
3
- "version": "11.0.0-prerelease.3",
3
+ "version": "11.0.0-prerelease.31",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -26,12 +26,11 @@
26
26
  "@ngrx/store": "~17.2.0",
27
27
  "@nrwl/devkit": "~18.3.0",
28
28
  "@nx/angular": "~18.3.0",
29
- "@o3r/telemetry": "^11.0.0-prerelease.3",
29
+ "@o3r/telemetry": "^11.0.0-prerelease.31",
30
30
  "@schematics/angular": "~17.3.0",
31
31
  "chokidar": "^3.5.2",
32
32
  "globby": "^11.1.0",
33
33
  "rxjs": "^7.8.1",
34
- "semver": "^7.5.2",
35
34
  "typescript": "~5.4.2"
36
35
  },
37
36
  "peerDependenciesMeta": {
@@ -53,18 +52,18 @@
53
52
  "@o3r/telemetry": {
54
53
  "optional": true
55
54
  },
56
- "chokidar": {
55
+ "@schematics/angular": {
57
56
  "optional": true
58
57
  },
59
- "globby": {
58
+ "chokidar": {
60
59
  "optional": true
61
60
  },
62
- "semver": {
61
+ "globby": {
63
62
  "optional": true
64
63
  }
65
64
  },
66
65
  "dependencies": {
67
- "@o3r/schematics": "^11.0.0-prerelease.3",
66
+ "@o3r/schematics": "^11.0.0-prerelease.31",
68
67
  "tslib": "^2.6.2",
69
68
  "uuid": "^9.0.0"
70
69
  },
@@ -74,7 +73,7 @@
74
73
  "@ngrx/router-store": "~17.2.0",
75
74
  "@ngrx/effects": "~17.2.0",
76
75
  "@ngrx/store-devtools": "~17.2.0",
77
- "@o3r/store-sync": "^11.0.0-prerelease.3",
76
+ "@o3r/store-sync": "^11.0.0-prerelease.31",
78
77
  "@types/jest": "~29.5.2",
79
78
  "nx": "~18.3.0",
80
79
  "@typescript-eslint/parser": "^7.2.0",
package/schematics/rule-factories/otter-environment/index.d.ts CHANGED
@@ -5,7 +5,6 @@ import { Rule } from '@angular-devkit/schematics';
5
5
  * @param rootPath @see RuleFactory.rootPath
6
6
  * @param options.projectName
7
7
  * @param options.enableStorybook
8
- * @param options.enablePlaywright
9
8
  * @param options.enableStyling
10
9
  * @param options.enableAnalytics
11
10
  * @param options.workingDirectory
package/schematics/rule-factories/otter-environment/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAmJN"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CA8IN"}
package/schematics/rule-factories/otter-environment/index.js CHANGED
@@ -12,7 +12,6 @@ const node_path_1 = require("node:path");
12
12
  * @param rootPath @see RuleFactory.rootPath
13
13
  * @param options.projectName
14
14
  * @param options.enableStorybook
15
- * @param options.enablePlaywright
16
15
  * @param options.enableStyling
17
16
  * @param options.enableAnalytics
18
17
  * @param options.workingDirectory
@@ -32,13 +31,9 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
32
31
  context.logger.error('No application detected, the Otter environment will not be setup');
33
32
  return tree;
34
33
  }
35
- const packageJson = (0, schematics_2.readPackageJson)(tree, workspaceProject);
36
- const scope = packageJson.name.split('/')[0];
37
34
  workspace.cli = workspace.cli || {};
35
+ workspaceProject.schematics ||= {};
38
36
  if (workspaceProject.projectType === 'application') {
39
- if (!workspaceProject.schematics) {
40
- workspaceProject.schematics = {};
41
- }
42
37
  schematics_2.OTTER_ITEM_TYPES.forEach((item) => {
43
38
  const path = schematics_2.TYPES_DEFAULT_FOLDER[item].app;
44
39
  if (path) {
@@ -64,11 +59,11 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
64
59
  else {
65
60
  workspace.cli.packageManager ||= (0, schematics_2.getPackageManager)();
66
61
  schematics_2.OTTER_ITEM_TYPES.forEach((item) => {
67
- const path = schematics_2.TYPES_DEFAULT_FOLDER[item].lib ? `modules/${scope}/${schematics_2.TYPES_DEFAULT_FOLDER[item].lib}` : null;
62
+ const path = schematics_2.TYPES_DEFAULT_FOLDER[item].lib;
68
63
  if (path) {
69
- workspace.schematics[`${item}*`] = {
70
- path,
71
- ...(workspace.schematics[item] || {})
64
+ workspaceProject.schematics[item] = {
65
+ path: node_path_1.posix.join(workspaceProject.root, path),
66
+ ...(workspaceProject.schematics[item] || {})
72
67
  };
73
68
  }
74
69
  });