@o3r/pipeline 12.3.0-prerelease.7 → 12.3.0-prerelease.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/pipeline",
-  "version": "12.3.0-prerelease.7",
+  "version": "12.3.0-prerelease.71",
   "publishConfig": {
     "access": "public"
   },
@@ -33,13 +33,14 @@
     }
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.71",
     "js-yaml": "^4.1.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/schematics": "^12.3.0-prerelease.7",
-    "@o3r/telemetry": "^12.3.0-prerelease.7",
+    "@o3r/schematics": "^12.3.0-prerelease.71",
+    "@o3r/telemetry": "^12.3.0-prerelease.71",
     "type-fest": "^4.10.2"
   },
   "peerDependenciesMeta": {
@@ -62,26 +63,25 @@
     "@angular-devkit/schematics": "~19.2.0",
     "@compodoc/compodoc": "^1.1.19",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint-plugin": "~20.7.0",
-    "@nx/jest": "~20.7.0",
-    "@nx/js": "~20.7.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.7",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.7",
-    "@o3r/schematics": "^12.3.0-prerelease.7",
-    "@o3r/telemetry": "^12.3.0-prerelease.7",
-    "@o3r/test-helpers": "^12.3.0-prerelease.7",
+    "@nx/eslint-plugin": "~20.8.0",
+    "@nx/jest": "~20.8.0",
+    "@nx/js": "~20.8.0",
+    "@o3r/build-helpers": "^12.3.0-prerelease.71",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.71",
+    "@o3r/telemetry": "^12.3.0-prerelease.71",
+    "@o3r/test-helpers": "^12.3.0-prerelease.71",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@stylistic/eslint-plugin-ts": "~3.1.0",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^20.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.29.0",
-    "@typescript-eslint/parser": "~8.29.0",
-    "@typescript-eslint/utils": "~8.29.0",
-    "angular-eslint": "~19.3.0",
+    "@typescript-eslint/eslint-plugin": "~8.32.0",
+    "@typescript-eslint/parser": "~8.32.0",
+    "@typescript-eslint/utils": "~8.32.0",
+    "angular-eslint": "~19.4.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.23.0",
+    "eslint": "~9.26.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",
@@ -95,14 +95,14 @@
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~20.7.0",
+    "nx": "~20.8.0",
     "pid-from-port": "^1.1.3",
     "rxjs": "^7.8.1",
     "ts-jest": "~29.3.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.29.0"
+    "typescript-eslint": "~8.32.0"
   },
   "engines": {
     "node": "^20.11.1 || >=22.0.0"
@@ -114,11 +114,6 @@
   "ng-add": {
     "save": "devDependencies"
   },
-  "config": {
-    "o3r": {
-      "commitHash": "6187e8a81ef9d7bc0ed22ffa88f4021fc416635e"
-    }
-  },
   "contributors": [
     {
       "name": "Yannick Adam",
@@ -187,5 +182,10 @@
     "url": "git+https://github.com/AmadeusITGroup/otter.git"
   },
   "license": "BSD-3-Clause",
-  "homepage": "https://amadeusitgroup.github.io/otter/"
+  "homepage": "https://amadeusitgroup.github.io/otter/",
+  "config": {
+    "o3r": {
+      "commitHash": "2519721243027ede580d91d45fb2d26522449193"
+    }
+  }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoFlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAQtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAkFlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,6 +4,7 @@ exports.ngAdd = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const js_yaml_1 = require("js-yaml");
 /**
  * Determines if the Yarn version is 2 or higher based on the contents of the .yarnrc.yml file.
@@ -22,7 +23,7 @@ function isYarn2(tree) {
  * @param options
  */
 function ngAddFn(options) {
-    return async (tree, context) => {
+    return (tree, context) => {
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
         const commitHash = ownPackageJson.config?.o3r?.commitHash;
@@ -30,8 +31,7 @@ function ngAddFn(options) {
         const actionVersionString = commitHash ? `${commitHash} # v${ownVersion}` : `v${ownVersion}`;
         let packageManager = 'npm';
         try {
-            const schematics = await Promise.resolve().then(() => require('@o3r/schematics'));
-            packageManager = schematics.getPackageManager({ workspaceConfig: schematics.getWorkspaceConfig(tree) });
+            packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig: (0, schematics_2.getWorkspaceConfig)(tree) });
         }
         catch {
             packageManager = tree.exists('/yarn.lock') ? 'yarn' : 'npm';
@@ -90,11 +90,6 @@ function ngAddFn(options) {
  * Add an Otter CI pipeline to an Angular project
  * @param options
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    return await Promise.resolve().then(() => require('@o3r/schematics')).catch(() => {
-        logger.warn(`You are trying to add '@o3r/pipeline' on a project that does not have '@o3r/schematics' as a dependency.
-        Please run 'ng add @o3r/schematics' before for a more robust setup. Trying to guess the package manager.`);
-    }).then((schematics) => schematics ? schematics.createOtterSchematic(ngAddFn)(options) : ngAddFn(options));
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/templates/github/__dot__github/actions/setup/action.yml

@@ -4,7 +4,7 @@ description: Sets up Node.js and installs dependencies
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+    - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
       with:
         node-version: 22<% if (packageManager !== 'yarn') { %>
         cache: <%= packageManager %><% } %>