@o3r/pipeline 11.5.0-prerelease.32 → 11.5.0-prerelease.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/pipeline",
-  "version": "11.5.0-prerelease.32",
+  "version": "11.5.0-prerelease.34",
   "publishConfig": {
     "access": "public"
   },
@@ -40,8 +40,8 @@
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "~18.2.0",
-    "@o3r/schematics": "^11.5.0-prerelease.32",
-    "@o3r/telemetry": "^11.5.0-prerelease.32",
+    "@o3r/schematics": "^11.5.0-prerelease.34",
+    "@o3r/telemetry": "^11.5.0-prerelease.34",
     "type-fest": "^4.10.2"
   },
   "peerDependenciesMeta": {
@@ -67,11 +67,11 @@
     "@nx/eslint-plugin": "~19.5.0",
     "@nx/jest": "~19.5.0",
     "@nx/js": "~19.5.0",
-    "@o3r/build-helpers": "^11.5.0-prerelease.32",
-    "@o3r/eslint-plugin": "^11.5.0-prerelease.32",
-    "@o3r/schematics": "^11.5.0-prerelease.32",
-    "@o3r/telemetry": "^11.5.0-prerelease.32",
-    "@o3r/test-helpers": "^11.5.0-prerelease.32",
+    "@o3r/build-helpers": "^11.5.0-prerelease.34",
+    "@o3r/eslint-plugin": "^11.5.0-prerelease.34",
+    "@o3r/schematics": "^11.5.0-prerelease.34",
+    "@o3r/telemetry": "^11.5.0-prerelease.34",
+    "@o3r/test-helpers": "^11.5.0-prerelease.34",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin-ts": "~2.4.0",
     "@types/jest": "~29.5.2",

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":"AAAA,OAAO,EAAgD,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAC/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6EtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAQtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,IAAI,EAA4B,MAAM,4BAA4B,CAAC;AAK1H,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqFtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAQtD,CAAC"}

package/schematics/ng-add/index.js

@@ -3,8 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const js_yaml_1 = require("js-yaml");
-const path = require("node:path");
 const fs = require("node:fs");
+const path = require("node:path");
+/**
+ * Determines if the Yarn version is 2 or higher based on the contents of the .yarnrc.yml file.
+ * @param tree tree
+ */
+function isYarn2(tree) {
+    const yarnrcPath = '/.yarnrc.yml';
+    if (tree.exists(yarnrcPath)) {
+        const { yarnPath } = ((0, js_yaml_1.load)(tree.readText(yarnrcPath)) || {});
+        return !yarnPath || !/yarn-1\./.test(yarnPath);
+    }
+    return false;
+}
 /**
  * Add an Otter CI pipeline to an Angular Project
  * @param options
@@ -26,12 +38,14 @@ function ngAddFn(options) {
         }
         context.logger.info(`Setting up pipeline for package manager: "${packageManager}" `);
         const setupCommand = packageManager === 'yarn' ? 'yarn install --immutable' : 'npm ci';
+        const yarn2 = packageManager === 'yarn' && isYarn2(tree);
         const baseTemplateSource = (0, schematics_1.apply)((0, schematics_1.url)(`./templates/${options.toolchain}`), [
             (0, schematics_1.template)({
                 ...options,
                 packageManager,
                 setupCommand,
                 actionVersionString,
+                yarn2,
                 dot: '.'
             }),
             (0, schematics_1.move)(tree.root.path)
@@ -40,18 +54,14 @@ function ngAddFn(options) {
             if (!options.npmRegistry) {
                 return tree;
             }
-            if (packageManager === 'yarn') {
+            if (yarn2) {
                 const yarnrcPath = '/.yarnrc.yml';
-                if (!tree.exists(yarnrcPath)) {
-                    tree.create(yarnrcPath, (0, js_yaml_1.dump)({ 'npmRegistryServer': options.npmRegistry }, { indent: 2 }));
-                }
-                else {
-                    const yarnrcContent = (0, js_yaml_1.load)(tree.readText(yarnrcPath));
-                    yarnrcContent.npmRegistryServer = options.npmRegistry;
-                    tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrcContent, { indent: 2 }));
-                }
+                const yarnrcContent = (0, js_yaml_1.load)(tree.readText(yarnrcPath));
+                yarnrcContent.npmRegistryServer = options.npmRegistry;
+                tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrcContent, { indent: 2 }));
             }
-            else if (packageManager === 'npm') {
+            else {
+                // both npm and yarn 1 use .npmrc for the registry
                 const npmrcPath = '/.npmrc';
                 if (!tree.exists(npmrcPath)) {
                     tree.create(npmrcPath, `registry=${options.npmRegistry}`);

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

@@ -6,16 +6,30 @@ runs:
   steps:
     - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
       with:
-        node-version: 20
-        cache: <%= packageManager %>
+        node-version: 20<% if (packageManager !== 'yarn') { %>
+        cache: <%= packageManager %><% } %>
     - name: Enable Corepack
       shell: bash
-      run: corepack enable
-    - name: Install
-<% if (npmRegistry) { %>
+      run: corepack enable<% if (packageManager === 'yarn') { %>
+    - name: Get yarn cache directory path
+      shell: bash
+      id: yarn-cache-dir-path
+      run: echo "dir=$(<% if (yarn2) { %>yarn config get cacheFolder<% } else { %>yarn cache dir<% } %>)" >> $GITHUB_OUTPUT
+    - name: Cache dependencies
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      with:
+        path: |
+          ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          <% if (yarn2) { %>.yarn/unplugged
+          .pnp.cjs
+          .pnp.loader.mjs<% } %>
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn
+          ${{ runner.os }}<% } %>
+    - name: Install<% if (npmRegistry) { %>
       env:
         COREPACK_NPM_REGISTRY: <%= npmRegistry %>
-        COREPACK_INTEGRITY_KEYS: ""
-<% } %>
+        COREPACK_INTEGRITY_KEYS: ""<% } %>
       shell: bash
       run: <%= setupCommand %>