@o3r/core 12.0.0-next.0 → 12.0.0-next.2

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.
@@ -9,7 +9,7 @@ const utils_1 = require("../utils");
9
9
  /** List of option dedicated to this build which should not be propagated to target build */
10
10
  const libBuildOptions = ['target', 'skipJasmineFixtureWorkaround'];
11
11
  exports.default = (0, architect_1.createBuilder)((0, utils_1.createBuilderWithMetricsIfInstalled)(async (options, context) => {
12
- const specifiedRoot = context.target?.project && (await context.getProjectMetadata(context.target.project)).root?.toString();
12
+ const specifiedRoot = context.target?.project && (await context.getProjectMetadata(context.target.project)).root;
13
13
  const ROOT_PATH = specifiedRoot ? path.resolve(context.workspaceRoot, specifiedRoot) : context.currentDirectory;
14
14
  const SRC_PATH = path.resolve(ROOT_PATH, 'src');
15
15
  const SRC_PACKAGE_JSON = path.resolve(SRC_PATH, 'package.json');
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../builders/lib-build/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../builders/lib-build/index.ts"],"names":[],"mappings":";;AAAA,qCAEiB;AACjB,kCAAkC;AAClC,yDAGmC;AACnC,mCAEgB;AAChB,iCAAiC;AACjC,oCAEkB;AAKlB,4FAA4F;AAC5F,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;AAEnE,kBAAe,IAAA,yBAAa,EAAuB,IAAA,2CAAmC,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAA0B,EAAE;IACxI,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAc,CAAC;IAC3H,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAChH,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAChE,MAAM,kBAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAErD,sBAAsB;IACtB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IAE3D,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACpD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACjD,GAAG,CAAgB,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;IAEvC;;OAEG;IACH,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;QACtC,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,QAAkB,IAAI,SAAS,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,YAAY,IAAI,EAAE,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9F,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,0BAA0B,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpI,MAAM,MAAM,GAAG,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,YAAY,IAAI,SAAS,sDAAsD,CAAC,CAAC;YACvH,OAAO;QACT,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAChB,IAAA,aAAU,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC;aAC3F,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;aAC3D,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC;YACpH,OAAO,kBAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CACL,CAAC;IACJ,CAAC,CAAC;IAEF,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,kBAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,4BAA4B,EAAE,CAAC;YAC1C,MAAM,oBAAoB,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK;QAClB,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,QAAQ,EAAE,CAAC;YACjB,OAAO,CAAC,WAAW,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC,CAAC"}
@@ -9,7 +9,7 @@ const utils_1 = require("../utils");
9
9
  exports.default = (0, architect_1.createBuilder)((0, utils_1.createBuilderWithMetricsIfInstalled)(async (options, context) => {
10
10
  context.reportRunning();
11
11
  context.reportProgress(1, 1, `Running ${options.script} !!!`);
12
- const specifiedRoot = context.target?.project && (await context.getProjectMetadata(context.target.project)).root?.toString();
12
+ const specifiedRoot = context.target?.project && (await context.getProjectMetadata(context.target.project)).root;
13
13
  const projectRoot = specifiedRoot ? (0, node_path_1.resolve)(context.workspaceRoot, specifiedRoot) : context.currentDirectory;
14
14
  const angularJsonPath = (0, node_path_1.join)(context.workspaceRoot, 'angular.json');
15
15
  const angularJson = fs.existsSync(angularJsonPath) ? JSON.parse(fs.readFileSync(angularJsonPath, { encoding: 'utf8' }).toString()) : undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../builders/run-script/index.ts"],"names":[],"mappings":";;AAAA,2DAE4B;AAC5B,8BAA8B;AAC9B,yCAGmB;AACnB,yDAGmC;AACnC,gDAEyB;AACzB,oCAEkB;AAKlB,kBAAe,IAAA,yBAAa,EAAyB,IAAA,2CAAmC,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAA0B,EAAE;IAC1I,OAAO,CAAC,aAAa,EAAE,CAAC;IACxB,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,OAAO,CAAC,MAAM,MAAM,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC7H,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAE7G,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/I,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,OAAO,CAAC,OAAO,CAAC,WAAW;iGACJ,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,GAAG,GAAG,IAAA,oCAAuB,EAAC,WAAW,CAAC,CAAC;IAEjD,IAAI,CAAC;QACH,IAAA,6BAAQ,EAAC,GAAG,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;YACnC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;YACxC,GAAG,EAAE,WAAW;YAChB,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;aACf;SACF,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../builders/run-script/index.ts"],"names":[],"mappings":";;AAAA,2DAE4B;AAC5B,8BAA8B;AAC9B,yCAGmB;AACnB,yDAGmC;AACnC,gDAEyB;AACzB,oCAEkB;AAKlB,kBAAe,IAAA,yBAAa,EAAyB,IAAA,2CAAmC,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAA0B,EAAE;IAC1I,OAAO,CAAC,aAAa,EAAE,CAAC;IACxB,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,OAAO,CAAC,MAAM,MAAM,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAc,CAAC;IAC3H,MAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAE7G,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/I,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,OAAO,CAAC,OAAO,CAAC,WAAW;iGACJ,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,GAAG,GAAG,IAAA,oCAAuB,EAAC,WAAW,CAAC,CAAC;IAEjD,IAAI,CAAC;QACH,IAAA,6BAAQ,EAAC,GAAG,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;YACnC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;YACxC,GAAG,EAAE,WAAW;YAChB,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;aACf;SACF,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/core",
3
- "version": "12.0.0-next.0",
3
+ "version": "12.0.0-next.2",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -25,14 +25,13 @@
25
25
  "@ngrx/entity": "^18.0.0",
26
26
  "@ngrx/store": "^18.0.0",
27
27
  "@nx/angular": "^19.8.0",
28
- "@o3r/telemetry": "^12.0.0-next.0",
28
+ "@o3r/telemetry": "^12.0.0-next.2",
29
29
  "@schematics/angular": "^18.2.0",
30
30
  "chokidar": "^3.5.2",
31
31
  "globby": "^11.1.0",
32
32
  "rxjs": "^7.8.1",
33
33
  "type-fest": "^4.10.2",
34
- "typescript": "^5.5.4",
35
- "ts-node": "~10.9.2"
34
+ "typescript": "^5.5.4"
36
35
  },
37
36
  "peerDependenciesMeta": {
38
37
  "@angular/cli": {
@@ -64,7 +63,7 @@
64
63
  }
65
64
  },
66
65
  "dependencies": {
67
- "@o3r/schematics": "^12.0.0-next.0",
66
+ "@o3r/schematics": "^12.0.0-next.2",
68
67
  "tslib": "^2.6.2",
69
68
  "uuid": "^10.0.0"
70
69
  },
@@ -75,14 +74,14 @@
75
74
  "@ngrx/router-store": "~18.0.0",
76
75
  "@ngrx/store-devtools": "~18.0.0",
77
76
  "@nx/eslint-plugin": "~19.8.0",
78
- "@o3r/store-sync": "^12.0.0-next.0",
77
+ "@o3r/store-sync": "^12.0.0-next.2",
79
78
  "@stylistic/eslint-plugin": "~2.7.0",
80
79
  "@types/jest": "~29.5.2",
81
- "@typescript-eslint/eslint-plugin": "~8.17.0",
82
- "@typescript-eslint/parser": "~8.17.0",
80
+ "@typescript-eslint/eslint-plugin": "~8.18.0",
81
+ "@typescript-eslint/parser": "~8.18.0",
83
82
  "angular-eslint": "~18.4.0",
84
83
  "cpy-cli": "^5.0.0",
85
- "eslint": "~9.14.0",
84
+ "eslint": "~9.17.0",
86
85
  "eslint-import-resolver-node": "^0.3.9",
87
86
  "eslint-import-resolver-typescript": "^3.6.3",
88
87
  "eslint-plugin-import": "^2.31.0",
@@ -98,7 +97,7 @@
98
97
  "jest-preset-angular": "~14.2.0",
99
98
  "jsonc-eslint-parser": "~2.4.0",
100
99
  "nx": "~19.8.0",
101
- "typescript-eslint": "~8.17.0",
100
+ "typescript-eslint": "~8.18.0",
102
101
  "zone.js": "~0.14.2"
103
102
  },
104
103
  "engines": {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAsBpC;;;;;;;;;GASG;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,CAqHN"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAsBpC;;;;;;;;;GASG;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,CAqHN"}
@@ -53,7 +53,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
53
53
  });
54
54
  // override angular's dist/webapp output path with apps/webapp/dist
55
55
  if (workspaceProject.architect?.build?.options?.outputPath) {
56
- workspaceProject.architect.build.options.outputPath = (0, node_path_1.join)(workspaceProject.root, 'dist');
56
+ workspaceProject.architect.build.options.outputPath = node_path_1.posix.join(workspaceProject.root, 'dist');
57
57
  }
58
58
  workspace.projects[options.projectName] = workspaceProject;
59
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"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"}