Merge branch 'release/11.2' into cascading/11.1.0-11.2.0

.eslintrc.js

@@ -26,6 +26,24 @@ module.exports = {
       }
     },
 
+    {
+      'files': [
+        '*.spec.ts'
+      ],
+      'rules': {
+        '@typescript-eslint/no-require-imports': 'off' // required by Jest to mock the imports
+      }
+    },
+
+    {
+      'files': [
+        '*{.,-}jasmine.ts'
+      ],
+      'rules': {
+        'jest/no-jasmine-globals': 'off'
+      }
+    },
+
     {
       'parser': require.resolve('jsonc-eslint-parser'),
       'files': [

.github/actions/setup-java/action.yml

@@ -19,7 +19,7 @@ runs:
       with:
         maven-version: ${{ inputs.mvn-version }}
     - name: Set up JDK 17
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       if: inputs.install-jdk == 'true'
       with:
         java-version: '17'

.github/workflows/codeql.yml

@@ -50,15 +50,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/documentation.yml

@@ -46,7 +46,7 @@ jobs:
         run: yarn update-package ${{ inputs.docFolder }}/package.json --name ${{ inputs.packageName }} --version ${{ inputs.version }}
       - run: zip -q -r ${{ inputs.artifactName }}.zip "${{ inputs.docFolder }}" -x "*/node_modules/*" ".cache/*"
         shell: bash
-      - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: ${{ inputs.artifactName }}
           path: ${{ inputs.artifactName }}.zip

.github/workflows/first-pr.yml

@@ -7,7 +7,7 @@ on:
 
 permissions:
   contents: read
-  issues: read
+  issues: write
   pull-requests: write
 
 jobs:

.github/workflows/it-tests.yml

@@ -40,7 +40,7 @@ jobs:
         run: zip -r verdaccio.zip ./.verdaccio
         shell: bash
       - name: Publish verdaccio storage
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: verdaccio
           path: verdaccio.zip
@@ -119,7 +119,7 @@ jobs:
         shell: bash
       - name: Publish generated tests environment on failure
         if: failure() && steps.it-tests.conclusion == 'failure'
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: it-tests-${{ matrix.os }}-${{ matrix.packageManager }}
           path: it-tests.zip

.github/workflows/pr-labels.yml

@@ -9,9 +9,11 @@ jobs:
   setup-label:
     runs-on: ubuntu-latest
     env:
+      SKIP_ON_LABELS: '["cascading"]'
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
     permissions:
       pull-requests: write
+      issues: write
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -28,9 +30,24 @@ jobs:
         with:
           script: |
             const [owner, repo] = '${{ github.repository }}'.split('/');
-            github.rest.issues.addLabels({
+            const pLabels = github.rest.issues.listLabelsOnIssue({
               owner,
               repo,
-              issue_number: context.issue.number,
-              labels: ${{ env.LABELS }}
-            })
+              issue_number: context.issue.number
+            });
+
+            return pLabels.then((labels) => {
+              const skipLabelUpdate = labels.data.some(({ name }) => ${{ env.SKIP_ON_LABELS }}.includes(name));
+
+              if (skipLabelUpdate) {
+                github.log.info('Skip label setting for this Pull Request.');
+                return ;
+              }
+
+              return github.rest.issues.addLabels({
+                owner,
+                repo,
+                issue_number: context.issue.number,
+                labels: ${{ env.LABELS }}
+              });
+            });

.github/workflows/publish.yml

@@ -141,7 +141,7 @@ jobs:
           CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
       - name: Expose Chrome extension artifact
         if: (success() || failure()) && !inputs.prerelease
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: chrome-extension
           path: apps/chrome-devtools/chrome-extension.zip

.github/workflows/scorecards.yml

@@ -58,14 +58,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
         with:
           sarif_file: results.sarif

.prettierignore

@@ -0,0 +1,2 @@
+# Disable prettier for the whole repository
+**/*

.renovaterc.json5

@@ -13,7 +13,9 @@
   "enabledManagers": [
     "npm",
     "github-actions",
-    "gradle"
+    "gradle",
+    "maven",
+    "regex"
   ],
   "labels": [
     "dependencies"
@@ -95,6 +97,43 @@
         ".*markdown-link-check"
       ],
       "enabled": false
+    },
+
+    // OpenAPI updates
+    {
+      "matchManagers": ["maven"],
+      "groupName": "Open API updates",
+      "groupSlug": "openapi",
+      "includePaths": [
+        "packages/@ama-sdk/schematics"
+      ]
+    },
+    {
+      "matchDepNames": [
+        "org.openapitools:openapi-generator"
+      ],
+      "groupName": "Open API updates",
+      "groupSlug": "openapi"
+    },
+    {
+      // We don't want to update this dep as we are still targeting a fork
+      "matchPackageNames": [
+        "io.swagger:swagger-codegen-cli"
+      ],
+      "enabled": false
+    }
+  ],
+  customManagers: [
+    {
+      "customType": "regex",
+      "datasourceTemplate": "maven",
+      "depNameTemplate": "org.openapitools:openapi-generator",
+      "fileMatch": [
+        "packages/@ama-sdk/schematics/package\\.json"
+      ],
+      "matchStrings": [
+        "\"openApiSupportedVersion\": \"~(?<currentValue>[^\"]+)\""
+      ]
     }
   ]
 }

.vscode/settings.json

@@ -65,6 +65,8 @@
     "json",
     "yaml"
   ],
+  "eslint.format.enable": true,
+  "eslint.codeActionsOnSave.mode": "all",
   "nxConsole.generatorAllowlist": [
     "@o3r/core:*"
   ],