Merge remote-tracking branch 'origin/main' into dynamic-page

.github/actions/release.js

@@ -20,7 +20,7 @@ const OTP = options.otp;
 
 const run = async () => {
 	const { globby } = await import("globby");
-	let FILES = await globby(["packages/*/package.json", "!packages/playground/package.json"]);
+	let FILES = await globby(["packages/*/package.json", "!packages/playground/package.json", "!packages/website/package.json"]);
 
 	// Step 1: process package.json files
 	const pkgs = await Promise.all(FILES.map(processPackageJSON));

.github/workflows/ci-test-website.yaml

@@ -0,0 +1,23 @@
+name: CI - Website
+
+on:
+  pull_request:
+  push:
+    branches:
+      - 'main'
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/[email protected]
+      with:
+        node-version: 18
+        cache: 'yarn'
+
+    - name: Install and Build
+      run: |
+        export NODE_OPTIONS="--max_old_space_size=4096"
+        yarn install
+        yarn ci:deploy:nightly

.github/workflows/deploy-latest-playground-on-release.yaml → .github/workflows/deploy-storybook-on-release.yaml

@@ -1,4 +1,4 @@
-name: Deploy Latest Playground [on release]
+name: Deploy Storybook [on latest release]
 
 on:
   release:
@@ -31,5 +31,5 @@ jobs:
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: packages/playground/dist # The folder the action should deploy.
+        target-folder: storybook-latest
         clean: true
-        clean-exclude: nightly

.github/workflows/deploy-main-playground.yaml → .github/workflows/deploy-storybook.yaml

@@ -1,4 +1,4 @@
-name: Deploy Main Playground [manual]
+name: Deploy Storybook [manual]
 
 on:
   workflow_dispatch:
@@ -18,14 +18,12 @@ jobs:
       run: |
         export NODE_OPTIONS="--max_old_space_size=4096"
         yarn install
-        yarn build:playground
-    - name: Write version.md
-      run: git log -1 &> packages/playground/dist/main/version.md
+        yarn ci:deploybuild
 
     - name: Deploy
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.
         folder: packages/playground/dist # The folder the action should deploy.
-        target-folder: nightly
+        target-folder: storybook
         clean: true

.github/workflows/deploy-main-playground-on-push.yaml → .github/workflows/deploy-website-on-push.yaml

@@ -1,8 +1,9 @@
-name: Deploy Main Playground [on push]
+name: Deploy Website [on push]
 
 on:
   push:
     branches: [ main ]
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -18,14 +19,20 @@ jobs:
       run: |
         export NODE_OPTIONS="--max_old_space_size=4096"
         yarn install
-        yarn ci:deploybuild
-    - name: Write version.md
-      run: git log -1 &>> packages/playground/dist/version.md
+
+    - name: Update version.md
+      run: |
+        touch packages/website/static/version.md
+        git log -1 &>> packages/website/static/version.md
+  
+    - name: Build
+      run: |
+        yarn ci:deploy:nightly
 
     - name: Deploy
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.
-        folder: packages/playground/dist # The folder the action should deploy.
+        folder: packages/website/build # The folder the action should deploy.
         target-folder: nightly
-        clean: true
+        clean: true

.github/workflows/deploy-website-on-release.yaml

@@ -0,0 +1,40 @@
+name: Deploy Website [on latest release]
+
+on:
+  release:
+    types:
+      - 'released'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/[email protected]
+      with:
+        node-version: 18
+        cache: 'yarn'
+
+    - name: Install and Build
+      run: |
+        export NODE_OPTIONS="--max_old_space_size=4096"
+        yarn install
+
+    - name: Update version.md
+      run: |
+        touch packages/website/static/version.md
+        git log -1 &>> packages/website/static/version.md
+
+    - name: Build
+      run: |
+        yarn ci:deploy
+
+    - name: Deploy
+      uses: JamesIves/[email protected]
+      with:
+        branch: gh-pages # The branch the action should deploy to.
+        folder: packages/website/build # The folder the action should deploy.
+        clean: true
+        clean-exclude: nightly

.github/workflows/deploy-latest-playground-on-push.yaml → .github/workflows/deploy-website.yaml

@@ -1,8 +1,8 @@
-name: Deploy Latest Playground [on push]
+name: Deploy Website [manual]
 
 on:
-  push:
-    branches: [ latest-release-website ]
+  workflow_dispatch:
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -18,15 +18,20 @@ jobs:
       run: |
         export NODE_OPTIONS="--max_old_space_size=4096"
         yarn install
-        yarn ci:deploybuild
 
-    - name: Write version.md
-      run: git log -1 &> packages/playground/dist/version.md
+    - name: Update version.md
+      run: |
+        touch packages/website/static/version.md
+        git log -1 &>> packages/website/static/version.md
+
+    - name: Build
+      run: |
+        yarn ci:deploy:nightly
 
     - name: Deploy
       uses: JamesIves/[email protected]
       with:
         branch: gh-pages # The branch the action should deploy to.
-        folder: packages/playground/dist # The folder the action should deploy.
-        clean: true
-        clean-exclude: nightly
+        folder: packages/website/build # The folder the action should deploy.
+        target-folder: nightly
+        clean: true

.github/workflows/release-rc-auto.yaml

@@ -20,6 +20,18 @@ jobs:
     - name: Install
       run: yarn --frozen-lockfile
 
+    - name: Version Bump
+      env:
+        NPM_USERNAME: ${{ secrets.NPM_USER }}
+        NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
+        NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
+        GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
+      run: |
+          npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
+          git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
+          git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
+          yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github
+
     - name: Build
       run: yarn ci:releasebuild
 
@@ -29,9 +41,4 @@ jobs:
         NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
         NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
         GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
-      run: |
-        npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
-        git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
-        git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
-        yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github 
-        yarn lerna publish from-git --yes
+      run: yarn lerna publish from-git --yes

.github/workflows/release-rc.yaml

@@ -19,6 +19,18 @@ jobs:
     - name: Install
       run: yarn --frozen-lockfile
 
+    - name: Version Bump
+      env:
+        NPM_USERNAME: ${{ secrets.NPM_USER }}
+        NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
+        NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
+        GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
+      run: |
+          npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
+          git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
+          git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
+          yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github
+
     - name: Build
       run: yarn ci:releasebuild
 
@@ -28,9 +40,4 @@ jobs:
         NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
         NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
         GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
-      run: |
-        npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
-        git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
-        git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
-        yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github
-        yarn lerna publish from-git --yes
+      run: yarn lerna publish from-git --yes

.github/workflows/release-stable.yaml

@@ -29,10 +29,7 @@ jobs:
     - name: Install
       run: yarn --frozen-lockfile
 
-    - name: Release Build
-      run: yarn ci:releasebuild
-
-    - name: Publish
+    - name: Version Bump
       env:
         NPM_USERNAME: ${{ secrets.NPM_USER }}
         NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
@@ -45,4 +42,14 @@ jobs:
         yarn lerna version ${{ github.event.inputs.release_type }}\
             ${{ (github.event.inputs.prerelease == 'true' && '--conventional-prerelease') || '--conventional-graduate' }} \
             --force-publish --yes --exact --create-release github 
-        yarn lerna publish from-git --yes
+
+    - name: Build
+      run: yarn ci:releasebuild
+
+    - name: Publish
+      env:
+        NPM_USERNAME: ${{ secrets.NPM_USER }}
+        NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
+        NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
+        GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
+      run: yarn lerna publish from-git --yes

.gitignore

@@ -1,6 +1,7 @@
 # Ignore .gitignore, target, dist and tmp folders
 .gitignore
 !packages/create-package/template/.gitignore
+!packages/website/.gitignore
 tmp
 temp
 target
@@ -84,6 +85,8 @@ packages/playground/docs/FAQ.md
 # Ignore the generated storybook related files
 packages/playground/_stories/**/*/argTypes.ts
 packages/playground/_stories/**/*/*Overview.mdx
+packages/playground/_stories/**/Enums.mdx
+packages/playground/_stories/**/Interfaces.mdx
 packages/playground/.storybook/custom-elements.json
 packages/playground/docs/storybook/**/*
 packages/playground/docs/storybook-pages/**/*

.vscode/settings.json

@@ -4,5 +4,10 @@
         "./packages/localization",
         "./packages/main",
         "./packages/fiori",
-    ]
+    ],
+    "html.customData": [
+        "./packages/base/dist/vscode.html-custom-data.json",
+        "./packages/main/dist/vscode.html-custom-data.json",
+        "./packages/fiori/dist/vscode.html-custom-data.json"
+    ],
 }