Sync with upstream/master – Merge Conflicts

.github/workflows/_build-and-publish.yml

@@ -0,0 +1,83 @@
+name: Build and Publish Fluent UI
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node 20.19.2
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.19.2
+          registry-url: https://npm.pkg.github.com/
+          scope: '@nbs-sandbox'
+
+      - name: Install Yarn v1
+        run: npm install -g yarn@1
+
+      - name: Install root dependencies
+        run: yarn install
+
+      - name: Install web-components dependencies
+        working-directory: packages/web-components
+        run: yarn install
+
+      - name: Build Fluent UI web-components
+        working-directory: packages/web-components
+        run: yarn nx build
+
+      - name: Checkout custom-styles repo
+        uses: actions/checkout@v4
+        with:
+          repository: NBS-Sandbox/npds-fluentui-custom-files
+          token: ${{ secrets.CUSTOM_FILES_PAT }}
+          path: packages/web-components/.temp-custom-files
+          ref: main
+
+      - name: Apply Custom NPDS Styling
+        working-directory: packages/web-components
+        run: npm run overlay-styles
+
+      - name: Determine package version
+        id: get_version
+        run: |
+          VERSION=$(node -p "require('./packages/web-components/package.json').version")
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Bump version for stable line
+        if: startsWith(steps.get_version.outputs.VERSION, '2.')
+        working-directory: packages/web-components
+        run: npm run bump-patch stable
+
+      - name: Bump version for beta line
+        if: startsWith(steps.get_version.outputs.VERSION, '3.')
+        working-directory: packages/web-components
+        run: npm run bump-patch
+
+      - name: Publish to GitHub Packages
+        working-directory: packages/web-components
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [[ "${{ steps.get_version.outputs.VERSION }}" == 2.* ]]; then
+            echo "Publishing v${{ steps.get_version.outputs.VERSION }} → latest"
+            npm publish
+          else
+            echo "Publishing v${{ steps.get_version.outputs.VERSION }} → beta"
+            npm publish --tag beta
+          fi

.github/workflows/_sync-fork-upstream.yml

@@ -0,0 +1,108 @@
+name: Sync Fork with Upstream
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    env:
+      DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+    outputs:
+      changes_made: ${{ steps.check-changes.outputs.changes_made }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.FLUENTUI_ACTION }}
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+
+      - name: Add upstream remote
+        run: |
+          git remote add upstream https://github.com/microsoft/fluentui.git
+          git fetch upstream master
+          git fetch origin $DEFAULT_BRANCH
+
+      - name: Ensure on default branch
+        run: git checkout $DEFAULT_BRANCH
+
+      - name: Check for conflicts
+        id: check-conflicts
+        run: |
+          git checkout -b temp-merge-branch $DEFAULT_BRANCH
+          if git merge upstream/master --no-commit --no-ff; then
+            echo "has_conflicts=false" >> $GITHUB_OUTPUT
+          else
+            echo "has_conflicts=true" >> $GITHUB_OUTPUT
+          fi
+          git merge --abort || true
+          git checkout $DEFAULT_BRANCH
+          git branch -D temp-merge-branch
+
+      - name: Set date
+        id: date
+        run: echo "date=$(date +%Y%m%d)" >> $GITHUB_OUTPUT
+
+      - name: Check if there are changes to merge
+        id: check-changes
+        run: |
+          if git diff --quiet $DEFAULT_BRANCH upstream/master; then
+            echo "changes_made=false" >> $GITHUB_OUTPUT
+          else
+            echo "changes_made=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Merge upstream if no conflicts
+        if: steps.check-conflicts.outputs.has_conflicts == 'false' && steps.check-changes.outputs.changes_made == 'true'
+        run: git merge upstream/master --no-edit
+
+      - name: Push merged changes
+        if: steps.check-conflicts.outputs.has_conflicts == 'false' && steps.check-changes.outputs.changes_made == 'true'
+        env:
+          GH_PAT: ${{ secrets.FLUENTUI_ACTION }}
+        run: git push https://[email protected]/${{ github.repository }}.git $DEFAULT_BRANCH
+
+      - name: Create conflict PR branch
+        if: steps.check-conflicts.outputs.has_conflicts == 'true'
+        env:
+          GH_PAT: ${{ secrets.FLUENTUI_ACTION }}
+        run: |
+          BRANCH=upstream-sync-${{ steps.date.outputs.date }}
+          git checkout -b $BRANCH
+          git merge upstream/master || true
+          git commit -am "Merge upstream/master with conflicts"
+          git push https://[email protected]/${{ github.repository }}.git $BRANCH
+
+      - name: Create Pull Request
+        if: steps.check-conflicts.outputs.has_conflicts == 'true'
+        uses: repo-sync/pull-request@v2
+        with:
+          source_branch: 'upstream-sync-${{ steps.date.outputs.date }}'
+          destination_branch: ${{ env.DEFAULT_BRANCH }}
+          pr_title: 'Sync with upstream/master – Merge Conflicts'
+          pr_body: |
+            This PR was automatically created by the GitHub Actions workflow to sync with upstream.
+            **Merge conflicts detected**
+            Please resolve the conflicts manually and merge this PR.
+          github_token: ${{ secrets.FLUENTUI_ACTION }}
+
+      - name: Trigger Build & Publish Workflow
+        if: steps.check-conflicts.outputs.has_conflicts == 'false' && steps.check-changes.outputs.changes_made == 'true'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: "_build-and-publish.yml",
+              ref: process.env.DEFAULT_BRANCH
+            });

.github/workflows/npds-patch.yml

@@ -0,0 +1,86 @@
+name: "NPDS Patch After Sync"
+on:
+  workflow_call:
+  workflow_dispatch:
+jobs:
+  apply-npds:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout FluentUI code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Clone NPDS repo from Azure DevOps
+        env:
+          AZURE_DEVOPS_PAT: ${{ secrets.AZURE_DEVOPS_PAT }}
+        run: |
+          git clone https://:[email protected]/nbsdev/NBS%20Product%20Design/_git/DesignSystem npds-repo
+
+      - name: Verify files exist before copying
+        run: |
+          echo "Checking NPDS file exists..."
+          if [ ! -f "npds-repo/packages/npds-components/src/components/button/button.styles.ts" ]; then
+            echo "NPDS button styles not found!"
+            echo "Available files in npds-repo:"
+            find npds-repo -name "*.styles.ts" | head -10
+            exit 1
+          fi
+
+          echo "Checking FluentUI target file exists..."
+          if [ ! -f "packages/web-components/src/button/button.styles.ts" ]; then
+            echo "FluentUI button styles not found!"
+            exit 1
+          fi
+
+          echo "Both files found, proceeding with copy..."
+
+      - name: Copy NPDS styles and patch Fluent button
+        run: |
+          TARGET_DIR="packages/web-components/src/button"
+          NPDS_SRC="npds-repo/packages/npds-components/src/components/button/button.styles.ts"
+          FLUENT_FILE="$TARGET_DIR/button.styles.ts"
+          NPDS_TARGET="$TARGET_DIR/npds-button-styles.ts"
+
+          # Skip if override already exists
+          if grep -q "NPDS OVERRIDE LAYER" "$FLUENT_FILE"; then
+            echo "NPDS override already present. Skipping patch step."
+            exit 0
+          fi
+
+          # Copy the NPDS button styles to the button folder
+          cp "$NPDS_SRC" "$NPDS_TARGET"
+
+          # Patch Fluent's button.styles.ts
+          sed -i '1iimport { buttonStyles as npdsButtonStyles } from "./npds-button-styles";' "$FLUENT_FILE"
+          sed -i 's/export const styles = css/export const originalButtonStyles = css/' "$FLUENT_FILE"
+          cat << 'EOF' >> "$FLUENT_FILE"
+          // ── NPDS OVERRIDE LAYER ──
+          export const styles = css`
+            ${originalButtonStyles}
+            ${npdsButtonStyles}
+          `;
+          // ────────────────────────
+          EOF
+
+          # Clean up
+          rm -rf npds-repo
+
+      - name: Commit and push NPDS patch
+        env:
+          GH_PAT: ${{ secrets.FLUENTUI_ACTION }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if ! git diff --quiet -- packages/web-components/src/button/button.styles.ts; then
+            git add packages/web-components/src/button/button.styles.ts packages/web-components/src/button/npds-button-styles.ts
+            git commit -m "chore: layer NPDS button styles"
+            git push https://[email protected]/${GITHUB_REPOSITORY}.git main
+          else
+            echo "No NPDS changes needed."
+          fi

.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: Publish Fluent UI Custom
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (e.g., 1.0.1)'
+        required: true
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js and authentication
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://npm.pkg.github.com'
+          scope: '@NBS-Sandbox'
+
+      - name: Set version from tag (if tag push)
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          npm version $VERSION --no-git-tag-version
+
+      - name: Set version from input (if manual)
+        if: github.event_name == 'workflow_dispatch'
+        run: npm version ${{ github.event.inputs.version }} --no-git-tag-version
+
+      - name: Install dependencies & build
+        run: npm install -force
+
+      - name: Publish to GitHub Packages
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}