@o3r/workspace 9.5.0-alpha.35 → 9.5.0-alpha.38

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 (7) hide show
  1. package/package.json +9 -9
  2. package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
  3. package/schematics/sdk/rules/clean-standalone.rule.js +6 -2
  4. package/schematics/sdk/rules/clean-standalone.rule.js.map +1 -1
  5. package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map +1 -1
  6. package/schematics/sdk/rules/update-ts-paths.rule.js +3 -0
  7. package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "9.5.0-alpha.35",
3
+ "version": "9.5.0-alpha.38",
4
4
  "description": "Workspace tooling of the Otter Framework",
5
5
  "keywords": [
6
6
  "workspace",
@@ -35,7 +35,7 @@
35
35
  }
36
36
  },
37
37
  "dependencies": {
38
- "@o3r/schematics": "^9.5.0-alpha.35",
38
+ "@o3r/schematics": "^9.5.0-alpha.38",
39
39
  "commander": "^11.0.0",
40
40
  "globby": "^11.1.0",
41
41
  "semver": "^7.5.2",
@@ -44,7 +44,7 @@
44
44
  "winston": "^3.8.2"
45
45
  },
46
46
  "devDependencies": {
47
- "@ama-sdk/schematics": "^9.5.0-alpha.35",
47
+ "@ama-sdk/schematics": "^9.5.0-alpha.38",
48
48
  "@angular-devkit/architect": "~0.1602.0",
49
49
  "@angular-devkit/build-angular": "~16.2.0",
50
50
  "@angular-devkit/core": "~16.2.0",
@@ -66,12 +66,12 @@
66
66
  "@nx/jest": "~16.10.0",
67
67
  "@nx/js": "~16.10.0",
68
68
  "@nx/linter": "~16.10.0",
69
- "@o3r/build-helpers": "^9.5.0-alpha.35",
70
- "@o3r/core": "^9.5.0-alpha.35",
71
- "@o3r/dev-tools": "^9.5.0-alpha.35",
72
- "@o3r/eslint-plugin": "^9.5.0-alpha.35",
73
- "@o3r/schematics": "^9.5.0-alpha.35",
74
- "@o3r/test-helpers": "^9.5.0-alpha.35",
69
+ "@o3r/build-helpers": "^9.5.0-alpha.38",
70
+ "@o3r/core": "^9.5.0-alpha.38",
71
+ "@o3r/dev-tools": "^9.5.0-alpha.38",
72
+ "@o3r/eslint-plugin": "^9.5.0-alpha.38",
73
+ "@o3r/schematics": "^9.5.0-alpha.38",
74
+ "@o3r/test-helpers": "^9.5.0-alpha.38",
75
75
  "@schematics/angular": "~16.2.0",
76
76
  "@types/jest": "~29.5.2",
77
77
  "@types/minimist": "^1.2.2",
package/schematics/sdk/rules/clean-standalone.rule.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIvD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAkB7D"}
1
+ {"version":3,"file":"clean-standalone.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIvD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAwB7D"}
package/schematics/sdk/rules/clean-standalone.rule.js CHANGED
@@ -17,8 +17,12 @@ function cleanStandaloneFiles(targetPath) {
17
17
  tree.delete(node_path_1.posix.join(targetPath, '.husky', 'commit-msg'));
18
18
  tree.delete(node_path_1.posix.join(targetPath, '.husky', 'pre-commit'));
19
19
  const packageJson = tree.readJson(node_path_1.posix.join(targetPath, 'package.json'));
20
- if (packageJson.scripts?.postinstall) {
21
- delete packageJson.scripts.postinstall;
20
+ if (packageJson.scripts) {
21
+ const excludedScripts = ['postinstall', 'set:version'];
22
+ packageJson.scripts = Object.fromEntries(Object.entries(packageJson.scripts).filter(([scriptName]) => !excludedScripts.includes(scriptName)));
23
+ }
24
+ if (packageJson.devDependencies) {
25
+ packageJson.devDependencies = Object.fromEntries(Object.entries(packageJson.devDependencies).filter(([depName, _]) => depName !== '@o3r/workspace'));
22
26
  }
23
27
  tree.overwrite(node_path_1.posix.join(targetPath, 'package.json'), JSON.stringify(packageJson, null, 2));
24
28
  return tree;
package/schematics/sdk/rules/clean-standalone.rule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;;AACA,yCAAkC;AAGlC;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,UAAkB;IACrD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAE5D,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAgB,CAAC;QACzF,IAAI,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE;YACpC,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC;SACxC;QACD,IAAI,CAAC,SAAS,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7F,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAlBD,oDAkBC"}
1
+ {"version":3,"file":"clean-standalone.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/clean-standalone.rule.ts"],"names":[],"mappings":";;;AACA,yCAAkC;AAGlC;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,UAAkB;IACrD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAE5D,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAgB,CAAC;QACzF,IAAI,WAAW,CAAC,OAAO,EAAE;YACvB,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACvD,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CACpG,CAAC;SACH;QACD,IAAI,WAAW,CAAC,eAAe,EAAE;YAC/B,WAAW,CAAC,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,gBAAgB,CAAC,CAAC,CAAC;SACtJ;QACD,IAAI,CAAC,SAAS,CAAC,iBAAK,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7F,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAxBD,oDAwBC"}
package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAkC3F"}
1
+ {"version":3,"file":"update-ts-paths.rule.d.ts","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAqC3F"}
package/schematics/sdk/rules/update-ts-paths.rule.js CHANGED
@@ -31,6 +31,9 @@ function updateTsConfig(targetPath, projectName, scope) {
31
31
  `${relativeTargetPath}/dist`,
32
32
  `${relativeTargetPath}/src/index`
33
33
  ];
34
+ configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/fixtures`] = [
35
+ `${relativeTargetPath}/src/fixtures/jest`
36
+ ];
34
37
  configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}/*`] = [
35
38
  `${relativeTargetPath}/dist/*`,
36
39
  `${relativeTargetPath}/src/*`
package/schematics/sdk/rules/update-ts-paths.rule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;SACb;QAED,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,kBAAkB,OAAO;YAC5B,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,kBAAkB,SAAS;YAC9B,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAlCD,wCAkCC"}
1
+ {"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;SACb;QAED,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,kBAAkB,OAAO;YAC5B,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,WAAW,CAAC,GAAG;YACpG,GAAG,kBAAkB,oBAAoB;SAC1C,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,kBAAkB,SAAS;YAC9B,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AArCD,wCAqCC"}