@o3r/workspace 11.3.0-prerelease.9 → 11.3.0-rc.0

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 (9) hide show
  1. package/package.json +7 -7
  2. package/schematics/ng-add/helpers/npm-workspace.js +1 -1
  3. package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
  4. package/schematics/ng-add/helpers/renovate/index.d.ts.map +1 -1
  5. package/schematics/ng-add/helpers/renovate/index.js +2 -1
  6. package/schematics/ng-add/helpers/renovate/index.js.map +1 -1
  7. package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +5 -26
  8. package/schematics/ng-add/project-setup.js +1 -1
  9. package/schematics/ng-add/project-setup.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "11.3.0-prerelease.9",
3
+ "version": "11.3.0-rc.0",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -38,7 +38,7 @@
38
38
  }
39
39
  },
40
40
  "dependencies": {
41
- "@o3r/schematics": "^11.3.0-prerelease.9",
41
+ "@o3r/schematics": "^11.3.0-rc.0",
42
42
  "commander": "^12.0.0",
43
43
  "globby": "^11.1.0",
44
44
  "semver": "^7.5.2",
@@ -71,11 +71,11 @@
71
71
  "@nx/jest": "~19.5.0",
72
72
  "@nx/js": "~19.5.0",
73
73
  "@nx/workspace": "~19.5.0",
74
- "@o3r/build-helpers": "^11.3.0-prerelease.9",
75
- "@o3r/core": "^11.3.0-prerelease.9",
76
- "@o3r/eslint-plugin": "^11.3.0-prerelease.9",
77
- "@o3r/schematics": "^11.3.0-prerelease.9",
78
- "@o3r/test-helpers": "^11.3.0-prerelease.9",
74
+ "@o3r/build-helpers": "^11.3.0-rc.0",
75
+ "@o3r/core": "^11.3.0-rc.0",
76
+ "@o3r/eslint-plugin": "^11.3.0-rc.0",
77
+ "@o3r/schematics": "^11.3.0-rc.0",
78
+ "@o3r/test-helpers": "^11.3.0-rc.0",
79
79
  "@schematics/angular": "~18.2.0",
80
80
  "@stylistic/eslint-plugin-ts": "~2.4.0",
81
81
  "@types/jest": "~29.5.2",
package/schematics/ng-add/helpers/npm-workspace.js CHANGED
@@ -70,7 +70,7 @@ function filterPackageJsonScripts(tree, _context) {
70
70
  */
71
71
  function addMonorepoManager(o3rWorkspacePackageJson, manager) {
72
72
  return (tree, _context) => {
73
- if (manager === 'lerna') {
73
+ if (manager === 'lerna' && !tree.exists('/lerna.json')) {
74
74
  const rootPackageJsonPath = '/package.json';
75
75
  if (!tree.exists(rootPackageJsonPath)) {
76
76
  throw new schematics_2.SchematicsException('Root package.json does not exist');
package/schematics/ng-add/helpers/npm-workspace.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
package/schematics/ng-add/helpers/renovate/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAG/I;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAe7D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAG/I;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAgB7D"}
package/schematics/ng-add/helpers/renovate/index.js CHANGED
@@ -15,7 +15,8 @@ function generateRenovateConfig(rootPath) {
15
15
  }
16
16
  const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
17
17
  (0, schematics_1.template)({
18
- dot: '.'
18
+ dot: '.',
19
+ packageManager: (0, schematics_2.getPackageManager)()
19
20
  }),
20
21
  (0, schematics_1.renameTemplateFiles)()
21
22
  ]);
package/schematics/ng-add/helpers/renovate/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAQA,wDAeC;AAvBD,2DAA+I;AAC/I,gDAAoD;AAEpD;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE;YACxE,IAAA,qBAAQ,EAAC;gBACP,GAAG,EAAE,GAAG;aACT,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAQA,wDAgBC;AAxBD,2DAA+I;AAC/I,gDAAuE;AAEvE;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE;YACxE,IAAA,qBAAQ,EAAC;gBACP,GAAG,EAAE,GAAG;gBACR,cAAc,EAAE,IAAA,8BAAiB,GAAE;aACpC,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template CHANGED
@@ -1,31 +1,10 @@
1
1
  {
2
2
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
3
3
  "extends": [
4
- "config:base",
5
- "github>AmadeusITGroup/otter//tools/renovate/base",
6
- "github>AmadeusITGroup/otter//tools/renovate/otter-project"
7
- ],
8
- "prConcurrentLimit": 0,
9
- "prHourlyLimit": 0,
10
- "baseBranches": [
11
- "main"
12
- ],
13
- "platform": "azure",
14
- "enabledManagers": [
15
- "npm"
16
- ],
17
- "labels": [
18
- "upgrade"
19
- ],
20
- "updateInternalDeps": true,
21
- "automerge": true,
22
- "platformAutomerge": true,
23
- "packageRules": [
24
- {
25
- "matchPackageNames": [
26
- "@o3r/*"
27
- ],
28
- "automergeType": "patch"
29
- }
4
+ "github>AmadeusITGroup/otter//tools/renovate/base",<% if (packageManager == 'yarn') { %>
5
+ "github>AmadeusITGroup/otter//tools/renovate/otter-project"<% } else { %>
6
+ "github>AmadeusITGroup/otter//tools/renovate/group/otter",
7
+ "github>AmadeusITGroup/otter//tools/renovate/tasks/base",
8
+ "github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update(npm)"<% } %>
30
9
  ]
31
10
  }
package/schematics/ng-add/project-setup.js CHANGED
@@ -53,7 +53,7 @@ const prepareProject = (options) => {
53
53
  }
54
54
  const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
55
55
  return () => (0, schematics_1.chain)([
56
- (0, renovate_1.generateRenovateConfig)(ownSchematicsFolder),
56
+ (0, renovate_1.generateRenovateConfig)(__dirname),
57
57
  (0, schematics_2.addVsCodeRecommendations)(vsCodeExtensions),
58
58
  (0, gitignore_update_1.updateGitIgnore)(workspaceConfig),
59
59
  npm_workspace_1.filterPackageJsonScripts,
package/schematics/ng-add/project-setup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}