Merge branch 'main' into timeOut

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: [js-soft]
+# patreon: # Replace with a single Patreon username
+# open_collective: # Replace with a single Open Collective username
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# otechie: # Replace with a single Otechie username
+# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: help us squat that :bug:!
+about: "help us squat that \U0001FAB3!"
 title: ""
 labels: ""
 assignees: ""

.github/workflows/build-docker-standalone-images.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        node_version: [14, 16, 18, 19]
+        node_version: [18, 20]
 
     env:
       REGISTRY: ghcr.io

.github/workflows/codeql-analysis.yml

@@ -14,7 +14,7 @@ name: "CodeQL"
 on:
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [main, main-v2]
   schedule:
     - cron: "43 16 * * 4"
 
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/gh-release.yml

@@ -14,7 +14,7 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: "npm"
@@ -23,6 +23,6 @@ jobs:
       - run: npm run build
       - uses: ncipollo/release-action@v1
         with:
-          artifacts: "dist/**/*,client-side-js/**/*"
+          artifacts: "cjs/**/*,esm/**/*,client-side-js/**/*"
           bodyFile: "CHANGELOG.md"
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -8,18 +8,20 @@ on:
   push:
     branches:
       - main
+      - main-v2
   pull_request:
     branches:
       - main
+      - main-v2
 
 jobs:
   run-linters:
     name: Run linters
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: "npm"

.github/workflows/npm-publish.yml

@@ -25,13 +25,13 @@ jobs:
   build-and-publish:
     # only run on non-ci commits and
     # on filter docs-, deps-, deps-dev + ci-labeled commits
-    if: "!contains(github.event.head_commit.author.name, 'wdi5 bot') && !startsWith(github.event.head_commit.message, 'chore(deps') && !startsWith(github.event.head_commit.message, 'docs') && !startsWith(github.event.head_commit.message, 'ci')"
+    ### if: "!contains(github.event.head_commit.author.name, 'wdi5 bot') && !startsWith(github.event.head_commit.message, 'chore(deps') && !startsWith(github.event.head_commit.message, 'docs') && !startsWith(github.event.head_commit.message, 'ci')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           token: ${{secrets.ADMIN_WDI5}}
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: "npm"

.github/workflows/publish-btp.yml

@@ -6,16 +6,15 @@ on:
       - main
     paths:
       - "examples/ui5-ts-app/**"
-      - "!examples/ui5-js-app/**"
 
 jobs:
   build-sample-ts-app:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
           registry-url: https://registry.npmjs.org/
@@ -29,17 +28,22 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: mtar
-          path: |
-            examples/ui5-ts-app/mta_archives/ui5-approuter_1.0.0.mtar
+          path: examples/ui5-ts-app/mta_archives/ui5-approuter_1.0.0.mtar
 
   publish-sample-ts-app-to-btp:
+    needs: build-sample-ts-app
     runs-on: ubuntu-latest
-    container: ppiper/cf-cli
     steps:
       - name: get mtar
         uses: actions/download-artifact@v3
         with:
           name: mtar
-      - run: |
-          cf login -a https://api.cf.eu20.hana.ondemand.com -u ${{secrets.BTP_LOGIN}} -p ${{secrets.BTP_PASSWORD}} -o "${{secrets.BTP_ORG}}" -s ${{secrets.BTP_SPACE}}
-          cf deploy examples/ui5-ts-app/mta_archives/ui5-approuter_1.0.0.mtar -f
+      - name: deploy to BTP
+        uses: elliottpope/cloudfoundry-cli-action@v6
+        with:
+          CF_API: https://api.cf.eu20.hana.ondemand.com
+          USERNAME: ${{ secrets.BTP_LOGIN }}
+          PASSWORD: ${{ secrets.BTP_PASSWORD }}
+          ORG: ${{secrets.BTP_ORG}}
+          SPACE: ${{secrets.BTP_SPACE}}
+          COMMAND: deploy examples/ui5-ts-app/mta_archives/ui5-approuter_1.0.0.mtar -f

.github/workflows/wdi5-tests_auth.yml

@@ -1,8 +1,6 @@
 name: auth
 on:
-  pull_request:
-    branches:
-      - main
+  pull_request_target:
     paths:
       # relevant
       - "client-side-js/**"
@@ -24,43 +22,42 @@ env:
   wdi5_password: ${{secrets.BTP_PASSWORD}}
   wdi5_one_password: ${{secrets.BTP_PASSWORD}}
   wdi5_two_password: ${{secrets.BTP_PASSWORD}}
+  wdi5_wz_username: ${{secrets.WZ_USER}}
+  wdi5_wz_password: ${{secrets.WZ_PASSWORD}}
+  BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}
+  BROWSERSTACK_ACCESS_KEY: ${{secrets.BROWSERSTACK_ACCESS_KEY}}
+  SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}}
+  SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}}
 
 jobs:
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository && 'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+
   tests:
+    needs: authorize
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [14, 16, 18, 19]
+        node-version: [18]
 
     steps:
-      - name: update chrome
-        run: |
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-          sudo apt-get update
-          sudo apt-get --only-upgrade install google-chrome-stable
-          # check chrome version
-          google-chrome --version
-
       - name: check out repo
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
+          submodules: recursive
 
       - name: use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
 
-      # we need this for workspace mgmt
-      - name: check npm version >= 7
-        run: npm --version
-      - name: update npm
-        run: |
-          npm i -g npm@8
-          npm --version
-
       # install both module + sample app(s) deps
       - name: install packages (wdi5 + sample app(s))
         run: |
@@ -71,5 +68,17 @@ jobs:
       - name: build
         run: npm run build
 
-      - name: btp/sap cloud id, basic auth, office 365, custom auth
-        run: npm run test:auth
+      # this against the submodule cloned from https://github.com/SAP-samples/cap-bookshop-wdi5
+      - name: local CAP authentication
+        run: npm run test:capAuth
+
+      # this against deployed TS sample app on BTP
+      - name: (browserstack) btp/sap cloud id, basic auth, office 365, custom auth
+        run: BROWSERSTACK=true npm run test:auth
+
+      # these two run against the deployed CAP SFLIGHT sample app in BTP WorkZone
+      - name: test lib support for workzone
+        run: npm run test:wz:testlib
+
+      - name: regular support for workzone
+        run: npm run test:wz:regular

.github/workflows/wdi5-tests_core.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - main-v2
     paths:
       # relevant
       - "client-side-js/**"
@@ -23,36 +24,19 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14, 16, 18, 19]
+        node-version: [18, 20]
 
     steps:
-      - name: update chrome
-        run: |
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-          sudo apt-get update
-          sudo apt-get --only-upgrade install google-chrome-stable
-          # check chrome version
-          google-chrome --version
-
       - name: check out repo
         uses: actions/checkout@v3
 
       - name: use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
 
-      # we need this for workspace mgmt
-      - name: check npm version >= 7
-        run: npm --version
-      - name: update npm
-        run: |
-          npm i -g npm@8
-          npm --version
-
       # install both module + sample app(s) deps
       - name: install packages (wdi5 + sample app(s))
         run: |

.github/workflows/wdi5-tests_fe-app.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - main
+      - main-v2
     paths:
       # relevant
       - "client-side-js/**"
@@ -23,36 +24,31 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14, 16, 18, 19]
+        node-version: [18, 20]
 
     steps:
-      - name: update chrome
-        run: |
-          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-          sudo apt-get update
-          sudo apt-get --only-upgrade install google-chrome-stable
-          # check chrome version
-          google-chrome --version
+      ### no mas since wdio^8 allows for auto-download of matching chromedriver for the env
+      ### -> we save CI time!
+      ### yet leaving this as ref
+      # - name: update chrome
+      #   run: |
+      #     wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+      #     sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+      #     sudo apt-get update
+      #     sudo apt-get --only-upgrade install google-chrome-stable
+      #     # check chrome version
+      #     google-chrome --version
 
       - name: check out repo
         uses: actions/checkout@v3
 
       - name: use node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
 
-      # we need this for workspace mgmt
-      - name: check npm version >= 7
-        run: npm --version
-      - name: update npm
-        run: |
-          npm i -g npm@8
-          npm --version
-
       # install both module + sample app(s) deps
       - name: install packages (wdi5 + sample app(s))
         run: |