@o3r/workspace 12.1.0-prerelease.77 → 12.1.0-prerelease.78

package/migration.json

@@ -5,6 +5,11 @@
       "version": "10.1.0-alpha.0",
       "description": "Updates of @o3r/workspace to v10.1.*",
       "factory": "./schematics/ng-update/index#updateV10_1"
+    },
+    "migration-v12_1": {
+      "version": "12.1.0-prerelease.0",
+      "description": "Updates of @o3r/workspace to v12.1.*",
+      "factory": "./schematics/ng-update/index#updateV12_1"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/workspace",
-  "version": "12.1.0-prerelease.77",
+  "version": "12.1.0-prerelease.78",
   "publishConfig": {
     "access": "public"
   },
@@ -42,7 +42,7 @@
     "@angular/common": "^19.0.0",
     "@angular/compiler-cli": "^19.0.0",
     "@angular/core": "^19.0.0",
-    "@o3r/telemetry": "^12.1.0-prerelease.77",
+    "@o3r/telemetry": "^12.1.0-prerelease.78",
     "@schematics/angular": "^19.0.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.10.2",
@@ -60,7 +60,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.1.0-prerelease.77",
+    "@o3r/schematics": "^12.1.0-prerelease.78",
     "commander": "^13.0.0",
     "globby": "^11.1.0",
     "semver": "^7.5.2",
@@ -93,12 +93,12 @@
     "@nx/jest": "~20.4.0",
     "@nx/js": "~20.4.0",
     "@nx/workspace": "~20.4.0",
-    "@o3r/build-helpers": "^12.1.0-prerelease.77",
-    "@o3r/core": "^12.1.0-prerelease.77",
-    "@o3r/eslint-plugin": "^12.1.0-prerelease.77",
-    "@o3r/schematics": "^12.1.0-prerelease.77",
-    "@o3r/telemetry": "^12.1.0-prerelease.77",
-    "@o3r/test-helpers": "^12.1.0-prerelease.77",
+    "@o3r/build-helpers": "^12.1.0-prerelease.78",
+    "@o3r/core": "^12.1.0-prerelease.78",
+    "@o3r/eslint-plugin": "^12.1.0-prerelease.78",
+    "@o3r/schematics": "^12.1.0-prerelease.78",
+    "@o3r/telemetry": "^12.1.0-prerelease.78",
+    "@o3r/test-helpers": "^12.1.0-prerelease.78",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",

package/schematics/ng-add/helpers/renovate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAMpC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAgB7D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmB7D"}

package/schematics/ng-add/helpers/renovate/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRenovateConfig = generateRenovateConfig;
+const fs = require("node:fs");
+const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 /**
@@ -8,6 +10,7 @@ const schematics_2 = require("@o3r/schematics");
  * @param rootPath @see RuleFactory.rootPath
  */
 function generateRenovateConfig(rootPath) {
+    const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', '..', 'package.json'), { encoding: 'utf8' }));
     return (tree, context) => {
         if (tree.exists('.renovaterc.json')) {
             return tree;
@@ -15,6 +18,7 @@ function generateRenovateConfig(rootPath) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
             (0, schematics_1.template)({
                 dot: '.',
+                version: ownPackageJsonContent.version,
                 packageManager: (0, schematics_2.getPackageManager)()
             }),
             (0, schematics_1.renameTemplateFiles)()

package/schematics/ng-add/helpers/renovate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAoBA,wDAgBC;AApCD,2DAUoC;AACpC,gDAGyB;AAEzB;;;GAGG;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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/renovate/index.ts"],"names":[],"mappings":";;AAyBA,wDAmBC;AA5CD,8BAA8B;AAC9B,kCAAkC;AAClC,2DAUoC;AACpC,gDAGyB;AAKzB;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,QAAgB;IACrD,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;IAEhK,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,OAAO,EAAE,qBAAqB,CAAC,OAAO;gBACtC,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

@@ -1,10 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "github>AmadeusITGroup/otter//tools/renovate/base",<% if (packageManager == 'yarn') { %>
-    "github>AmadeusITGroup/otter//tools/renovate/otter-project"<% } else { %>
-    "github>AmadeusITGroup/otter//tools/renovate/group/otter",
-    "github>AmadeusITGroup/otter//tools/renovate/tasks/base",
-    "github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update(npm)"<% } %>
+    "github>AmadeusITGroup/otter//tools/renovate/base#<%= version %>",<% if (packageManager == 'yarn') { %>
+    "github>AmadeusITGroup/otter//tools/renovate/otter-project#<%= version %>"<% } else { %>
+    "github>AmadeusITGroup/otter//tools/renovate/group/otter#<%= version %>",
+    "github>AmadeusITGroup/otter//tools/renovate/tasks/base#<%= version %>",
+    "github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update(npm)#<%= version %>"<% } %>
   ]
 }

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

@@ -3,4 +3,8 @@ import { type Rule } from '@angular-devkit/schematics';
  * Update of Otter Workspace V10.1
  */
 export declare const updateV10_1: (options: any) => Rule;
+/**
+ * Update of Otter Workspace V12.1
+ */
+export declare const updateV12_1: (options: any) => 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,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAmBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAsBpC;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC;AAa/D;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}

package/schematics/ng-update/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateV10_1 = void 0;
+exports.updateV12_1 = 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");
+const renovate_version_1 = require("./v12.1/renovate-version");
 /**
  * Update of Otter Workspace V10.1
  */
@@ -19,4 +20,19 @@ function updateV10_1Fn() {
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
 exports.updateV10_1 = (0, schematics_2.createOtterSchematic)(updateV10_1Fn);
+/**
+ * Update of Otter Workspace V12.1
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
+function updateV12_1Fn() {
+    const updateRules = [
+        (0, renovate_version_1.updateRenovateVersion)()
+    ];
+    return (0, schematics_1.chain)(updateRules);
+}
+/**
+ * Update of Otter Workspace V12.1
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version number
+exports.updateV12_1 = (0, schematics_2.createOtterSchematic)(updateV12_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":";;;AAAA,2DAGoC;AACpC,gDAEyB;AACzB,uEAEsC;AAEtC;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,gDAEyB;AACzB,uEAEsC;AACtC,+DAEkC;AAElC;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC;AAE/D;;GAEG;AACH,6GAA6G;AAC7G,SAAS,aAAa;IACpB,MAAM,WAAW,GAAW;QAC1B,IAAA,wCAAqB,GAAE;KACxB,CAAC;IACF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,6GAA6G;AAChG,QAAA,WAAW,GAAG,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC"}

package/schematics/ng-update/v12.1/renovate-version.d.ts

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

package/schematics/ng-update/v12.1/renovate-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renovate-version.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,eAAO,MAAM,qBAAqB,QAAO,IAsBxC,CAAC"}

package/schematics/ng-update/v12.1/renovate-version.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateRenovateVersion = void 0;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const otterRenovatePathPrefix = 'github>AmadeusITGroup/otter//';
+const withVersionPattern = /#[0-9.]+(?:-.+)?$/;
+const supportedRenovateFiles = ['.renovaterc.json', 'renovaterc.json', 'renovate.json'];
+const updateRenovateVersion = () => {
+    const version = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf8' })).version;
+    return (tree, context) => {
+        if (!version) {
+            context.logger.warn('No Otter version detected');
+            return tree;
+        }
+        supportedRenovateFiles
+            .filter((renovateFile) => tree.exists(renovateFile))
+            .forEach((renovateFile) => {
+            const renovateConfig = tree.readJson(renovateFile);
+            renovateConfig.extends = renovateConfig.extends?.map((extensionPath) => {
+                if (!extensionPath.startsWith(otterRenovatePathPrefix) || withVersionPattern.test(extensionPath)) {
+                    return extensionPath;
+                }
+                return `${extensionPath}#${version}`;
+            });
+            tree.overwrite(renovateFile, JSON.stringify(renovateConfig, null, 2));
+        });
+        return tree;
+    };
+};
+exports.updateRenovateVersion = updateRenovateVersion;
+//# sourceMappingURL=renovate-version.js.map

package/schematics/ng-update/v12.1/renovate-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renovate-version.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,yCAEmB;AAKnB,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAChE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAC/C,MAAM,sBAAsB,GAAG,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAEjF,MAAM,qBAAqB,GAAG,GAAS,EAAE;IAC9C,MAAM,OAAO,GAAuB,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACjJ,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,sBAAsB;aACnB,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACnD,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACxB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAQ,CAAC;YAC1D,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,aAAqB,EAAE,EAAE;gBAC7E,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjG,OAAO,aAAa,CAAC;gBACvB,CAAC;gBAED,OAAO,GAAG,aAAa,IAAI,OAAO,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,qBAAqB,yBAsBhC"}