Merge pull request #473 from ForgeRock/develop

release 4.5

Author: ryanbas21

.changeset/config.json

@@ -1,24 +1 @@
-# Core Variables (required for all samples)
-AM_URL=$AM_URL
-REALM_PATH=$REALM_PATH
-SCOPE=$SCOPE
-TIMEOUT=$TIMEOUT
-WEB_OAUTH_CLIENT=$WEB_OAUTH_CLIENT
-
-# Additional for Central & Embedded Login
-REDIRECT_URI=$REDIRECT_URI
-CENTRAL_LOGIN_CLIENT=$CENTRAL_LOGIN_CLIENT
-
-# Embedded Login Only
-TREE=$TREE                          
-
-# Additional for Angular & React Samples
-# APP_URL=$APP_URL # not using this for preview-environment instead, we can use window.location.href
-API_URL=$API_URL
-DEBUGGER_OFF=true
-DEVELOPMENT=$DEVELOPMENT
-JOURNEY_LOGIN=$JOURNEY_LOGIN
-JOURNEY_REGISTER=$JOURNEY_REGISTER
-PORT=$PORT
-REST_OAUTH_CLIENT=$REST_OAUTH_CLIENT
-REST_OAUTH_SECRET=$REST_OAUTH_SECRET
+NX_ADD_PLUGINS=false

.devcontainer/Dockerfile

@@ -71,18 +71,31 @@
     {
       "files": ["*.ts", "*.tsx", "!*.spec.ts", "!*.test*.ts"],
       "extends": ["plugin:@nx/typescript"],
-
       "rules": {
         "@typescript-eslint/no-unused-vars": [
           "error",
-          { "ignoreRestSiblings": true }
-        ]
+          {
+            "ignoreRestSiblings": true
+          }
+        ],
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "quotes": [
+          "error",
+          "single",
+          {
+            "allowTemplateLiterals": true
+          }
+        ],
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": "*.json",

.devcontainer/devcontainer.json

@@ -7,96 +7,31 @@ env:
   NX_CLOUD_DISTRIBUTED_EXECUTION: true
 jobs:
   pr:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+      - uses: actions/setup-node@v4
         id: cache
         with:
-          node-version: '18.12.1'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-      - name: Setup custom host for sdkapp.example.com
-        run: |
-          sudo echo "127.0.0.1 localhost sdkapp.example.com auth.example.com api.example.com user.example.com" | sudo tee -a /etc/hosts
-          sudo echo "::1 ip6-localhost ip6-loopback" | sudo tee -a /etc/hosts
+          node-version: '20.10.0'
+          cache: 'pnpm'
 
-      - name: npm install
-        # if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci
-        env:
-          DEBUG: pw:install
-          # PLAYWRIGHT_BROWSERS_PATH: 0
-          PLAYWRIGHT_SKIP_BROWSERS_DOWNLOAD: 1
-      - run: npx playwright install chromium firefox webkit
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          main-branch-name: 'develop'
-      - run: npm install @nrwl/nx-cloud
-      - run: npx nx-cloud start-ci-run
+      - run: pnpm install --frozen-lockfile
 
-      - run: npx nx affected --t build --parallel --max-parallel=3
-      - run: npx nx affected --t lint --parallel --max-parallel=3
-      - run: npx nx affected --t test --parallel --max-parallel=3
-      - run: npx nx affected --t test --configuration=integration
-      - run: npx nx affected -t e2e --exclude=token-vault-suites
-      # It's important that we always run this step, otherwise in the case of any failures in preceding non-Nx steps, the agents will keep running and waste billable minutes
-      - name: Stop All Agents
-        if: ${{ always() }}
-        run: npx nx-cloud stop-all-agents
+      # This line enables distribution
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
+      - run: pnpm dlx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci" --verbose
 
-      - name: 'Artifacts'
-        uses: actions/upload-artifact@v3
-        with:
-          retention-days: 5
-          if-no-files-found: ignore
-          path: |
-            ${{ github.workspace }}/e2e/autoscript-suites/test-results
-      - name: Slack Notify
-        id: slack
-        uses: slackapi/slack-github-action@v1.18.0
-        with:
-          payload: |
-            {
-              "title": "${{ github.event.pull_request.title }}",
-              "author": "${{ github.event.pull_request.user.login }}",
-              "pr_number": "${{ github.event.pull_request.number}}",
-              "url": "${{ github.event.pull_request.html_url }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-  agents:
-    runs-on: macos-latest
-    name: Agent Mac
-    strategy:
-      matrix:
-        agent: [1, 2, 3]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-          fetch-depth: 0
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.13.1'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-      - run: npm ci
-        if: steps.cache.outputs.cache-hit != 'true'
-        env:
-          # PLAYWRIGHT_BROWSERS_PATH: 0
-          PLAYWRIGHT_SKIP_BROWSERS_DOWNLOAD: 1
-      - run: npm install @nrwl/nx-cloud
-      - name: Setup custom host for sdkapp.example.com
-        run: |
-          sudo echo "127.0.0.1 sdkapp.example.com auth.example.com api.example.com user.example.com" | sudo tee -a /etc/hosts
-          sudo echo "::1 ip6-localhost ip6-loopback" | sudo tee -a /etc/hosts
-      - run: npx playwright install chromium firefox webkit
-      - name: Start Nx Agent ${{ matrix.agent }}
-        run: npx nx-cloud start-agent
+      - run: pnpm exec playwright install
+
+      - uses: nrwl/nx-set-shas@v4
+      # This line is needed for nx affected to work when CI is running on a PR
+      - run: git branch --track develop origin/develop
+
+      - run: pnpm exec nx-cloud record -- nx format:check --verbose
+      - run: pnpm exec nx affected -t build lint test e2e-ci --verbose