@o3r/workspace 10.2.0-prerelease.44 → 10.2.0-prerelease.46

package/migration.json

@@ -1,6 +1,10 @@
 {
   "$schema": "https://raw.githubusercontent.com/angular/angular-cli/master/packages/angular_devkit/schematics/collection-schema.json",
   "schematics": {
-
+    "migration-v10_0": {
+      "version": "10.1.0-alpha.0",
+      "description": "Updates of @o3r/workspace to v10.1.*",
+      "factory": "./schematics/ng-update/index#updateV10_1"
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/workspace",
-  "version": "10.2.0-prerelease.44",
+  "version": "10.2.0-prerelease.46",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^10.2.0-prerelease.44",
+    "@o3r/schematics": "^10.2.0-prerelease.46",
     "commander": "^12.0.0",
     "globby": "^11.1.0",
     "semver": "^7.5.2",
@@ -69,11 +69,11 @@
     "@nx/eslint-plugin": "~18.1.0",
     "@nx/jest": "~18.1.0",
     "@nx/js": "~18.1.0",
-    "@o3r/build-helpers": "^10.2.0-prerelease.44",
-    "@o3r/core": "^10.2.0-prerelease.44",
-    "@o3r/eslint-plugin": "^10.2.0-prerelease.44",
-    "@o3r/schematics": "^10.2.0-prerelease.44",
-    "@o3r/test-helpers": "^10.2.0-prerelease.44",
+    "@o3r/build-helpers": "^10.2.0-prerelease.46",
+    "@o3r/core": "^10.2.0-prerelease.46",
+    "@o3r/eslint-plugin": "^10.2.0-prerelease.46",
+    "@o3r/schematics": "^10.2.0-prerelease.46",
+    "@o3r/test-helpers": "^10.2.0-prerelease.46",
     "@schematics/angular": "~17.3.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",

package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template

@@ -2,15 +2,13 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
-    "group:allNonMajor",
-    "group:monorepos",
-    "group:recommended",
-    "group:test"
+    "github>AmadeusITGroup/otter//tools/renovate/base",
+    "github>AmadeusITGroup/otter//tools/renovate/otter-project"
   ],
   "prConcurrentLimit": 0,
   "prHourlyLimit": 0,
   "baseBranches": [
-    "master"
+    "main"
   ],
   "platform": "azure",
   "enabledManagers": [
@@ -28,34 +26,9 @@
   "packageRules": [
     {
       "matchPackageNames": [
-        "@o3r/core"
+        "@o3r/*"
       ],
-      "postUpgradeTasks": {
-        "commands": [
-          "npm install",
-          "npm run ng update {{{depName}}} --from={{{currentVersion}}} --to={{{newVersion}}} --migrate-only --allow-dirty --force"
-        ],
-        "fileFilters": [
-          "**"
-        ],
-        "executionMode": "branch"
-      }
-    },
-    {
-      "matchPackagePrefixes": [
-        "@otter",
-        "@o3r",
-        "@ama-sdk",
-        "@ama-terasu"
-      ],
-      "groupName": "Otter dependencies",
-      "groupSlug": "otter-dependencies"
-    },
-    {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "rangeStrategy": "replace"
+      "automergeType": "patch"
     }
   ]
 }

package/schematics/ng-update/index.d.ts

@@ -1,2 +1,6 @@
-export type {};
+import { type Rule } from '@angular-devkit/schematics';
+/**
+ * Update of Otter Workspace V10.1
+ */
+export declare const updateV10_1: (options: unknown) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc9D;;GAEG;AACH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}

package/schematics/ng-update/index.js

@@ -1,3 +1,22 @@
 "use strict";
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable camelcase */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateV10_1 = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
+const add_presets_renovate_1 = require("./v10.1/add-presets-renovate");
+/**
+ * Update of Otter Workspace V10.1
+ */
+function updateV10_1Fn() {
+    const updateRules = [
+        (0, add_presets_renovate_1.addPresetsRenovate)()
+    ];
+    return (0, schematics_1.chain)(updateRules);
+}
+/**
+ * Update of Otter Workspace V10.1
+ */
+exports.updateV10_1 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV10_1Fn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-update/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAA8D;AAC9D,gDAAwE;AACxE,uEAAkE;AAElE;;GAEG;AACH,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,kDAAqC,EAAC,aAAa,CAAC,CAAC"}

package/schematics/ng-update/v10.1/add-presets-renovate.d.ts

@@ -0,0 +1,3 @@
+import type { Rule } from '@angular-devkit/schematics';
+export declare const addPresetsRenovate: () => Rule;
+//# sourceMappingURL=add-presets-renovate.d.ts.map

package/schematics/ng-update/v10.1/add-presets-renovate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-presets-renovate.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.1/add-presets-renovate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAOvD,eAAO,MAAM,kBAAkB,QAAO,IAarC,CAAC"}

package/schematics/ng-update/v10.1/add-presets-renovate.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPresetsRenovate = void 0;
+const renovatePresets = [
+    'github>AmadeusITGroup/otter//tools/renovate/base',
+    'github>AmadeusITGroup/otter//tools/renovate/otter-project'
+];
+const addPresetsRenovate = () => {
+    return (tree, context) => {
+        if (tree.exists('.renovaterc.json')) {
+            const renovateConfig = tree.readJson('.renovaterc.json');
+            renovateConfig.extends ||= [];
+            renovatePresets
+                .filter((preset) => !renovateConfig.extends.includes(preset))
+                .forEach((preset) => renovateConfig.extends.push(preset));
+            tree.overwrite('renovate.json', JSON.stringify(renovateConfig, null, 2));
+        }
+        else {
+            context.logger.info('renovate.json not found, skipping preset addition');
+        }
+    };
+};
+exports.addPresetsRenovate = addPresetsRenovate;
+//# sourceMappingURL=add-presets-renovate.js.map

package/schematics/ng-update/v10.1/add-presets-renovate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-presets-renovate.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.1/add-presets-renovate.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG;IACtB,kDAAkD;IAClD,2DAA2D;CAC5D,CAAC;AAEK,MAAM,kBAAkB,GAAG,GAAS,EAAE;IAC3C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAQ,CAAC;YAChE,cAAc,CAAC,OAAO,KAAK,EAAE,CAAC;YAC9B,eAAe;iBACZ,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBAC5D,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}