Merge upstream/25_1 and resolve pnpm-lock.yaml conflict

Author: aleksei-semikozov

.github/actions/run-qunit-tests/action.yml

@@ -39,16 +39,6 @@ runs:
         echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE"
         echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE" >> $GITHUB_ENV
 
-    # - name: Setup Chrome
-    #   uses: ./.github/actions/setup-chrome-headless-shell
-    #   with:
-    #     chrome-version: '145.0.7632.67'
-
-    # - name: Use Node.js
-    #   uses: actions/setup-node@v4
-    #   with:
-    #     node-version: '20'
-
     - name: Download artifacts
       uses: actions/download-artifact@v4
       with:
@@ -84,7 +74,7 @@ runs:
 
     - name: Install dependencies
       shell: bash
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Run QUnit tests
       working-directory: ./packages/devextreme

.github/actions/setup-chrome-headless-shell/action.yml

@@ -46,7 +46,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run:  pnpm install
+        run:  pnpm install --frozen-lockfile
 
       - name: Build npm packages
         run: pnpm run all:build
@@ -64,22 +64,30 @@ jobs:
     needs: build
 
     steps:
+      - name: Get sources
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
       - name: Download npm packages
         uses: actions/download-artifact@v4
         with:
           name: devextreme-npm-packages
           path: npm
 
       - name: Move devextreme package
-        run: mv ./npm/devextreme-2*.tgz ./devextreme.tgz
+        run: mv ./npm/devextreme-2*.tgz ./e2e/devextreme-bundler/devextreme.tgz
 
       - name: Setup deps
+        working-directory: ./e2e/devextreme-bundler
         run: |
-          npm init -y
-          npm i webpack terser-webpack-plugin
-          npm i ./devextreme.tgz
+          pnpm install --filter devextreme-bundler-test --frozen-lockfile
+          pnpm add --filter devextreme-bundler-test ./devextreme.tgz
 
       - name: Build bundle
+        working-directory: ./e2e/devextreme-bundler
         run: |
-          npx --no-install devextreme-bundler-init custom-bundle
-          npx --no-install devextreme-bundler custom-bundle
+          pnpm exec devextreme-bundler-init custom-bundle
+          pnpm exec devextreme-bundler custom-bundle

.github/workflows/build_all.yml

@@ -42,7 +42,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       # - name: Build npm packages
       #   run: pnpm run all:build

.github/workflows/codeql.yml

@@ -51,7 +51,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Run targets
       run: >

.github/workflows/default_workflow.yml

@@ -64,7 +64,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Run unit tests
         working-directory: apps/demos

.github/workflows/demos_unit_tests.yml

@@ -139,7 +139,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: DevExtreme - Build
         if: needs.determine-framework-tests-scope.outputs.framework-tests-scope == 'none'
@@ -240,12 +240,6 @@ jobs:
         working-directory: apps/demos
         run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
 
-#    - name: Build wrappers
-#      run: pnpm exec nx run-many -t pack -p devextreme-angular devextreme-react devetreme-vue
-
-#    - name: Link wrappers packages
-#      run: pnpm install
-
       - name: Prepare bundles
         working-directory: apps/demos
         run: pnpm exec nx prepare-bundles
@@ -550,25 +544,40 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
+
+    - name: Set Roboto font directory
+      if: contains(matrix.THEME, 'material')
+      run: echo "ROBOTO_FONT_DIR=${HOME}/.local/share/fonts/roboto" >> $GITHUB_ENV
 
     - name: Cache Roboto font
       if: contains(matrix.THEME, 'material')
       id: cache-roboto
       uses: actions/cache@v4
       with:
-        path: /usr/share/fonts/truetype/roboto
-        key: roboto-font-${{ runner.os }}
+        path: ${{ env.ROBOTO_FONT_DIR }}
+        key: roboto-font-${{ runner.os }}-8b0a1d0f5983c89bc2b93f1b5fb55f9e252744b5
 
     - name: Install Roboto font for Material theme
       if: contains(matrix.THEME, 'material') && steps.cache-roboto.outputs.cache-hit != 'true'
+      env:
+        GOOGLE_FONTS_COMMIT: 8b0a1d0f5983c89bc2b93f1b5fb55f9e252744b5
+        ROBOTO_SHA256: d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134
       run: |
-        echo "Installing Roboto font..."
-        sudo apt-get update -qq
-        sudo apt-get install -y -qq fonts-roboto fonts-roboto-unhinted
-        sudo fc-cache -f -v > /dev/null 2>&1 || true
+        echo "Installing Roboto font from google/fonts (pinned commit)..."
+        mkdir -p "$ROBOTO_FONT_DIR"
+        BASE_URL="https://raw.githubusercontent.com/google/fonts/${GOOGLE_FONTS_COMMIT}/ofl/roboto"
+
+        curl -fsSL "${BASE_URL}/Roboto%5Bwdth%2Cwght%5D.ttf" -o /tmp/Roboto.ttf
+        echo "${ROBOTO_SHA256}  /tmp/Roboto.ttf" | sha256sum -c -
+
+        mv /tmp/Roboto.ttf "$ROBOTO_FONT_DIR/"
         echo "Roboto font installed"
 
+    - name: Refresh font cache
+      if: contains(matrix.THEME, 'material')
+      run: fc-cache -f > /dev/null 2>&1
+
     - name: Run Web Server
       run: python -m http.server 8080 &
 

.github/workflows/demos_visual_tests.yml

@@ -49,7 +49,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Build
       working-directory: ./packages/devextreme
@@ -106,7 +106,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Build
       working-directory: ./packages/devextreme
@@ -151,60 +151,12 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Check texts
       working-directory: ./packages/devextreme
       run: pnpm exec nx lint-texts
 
-  pnpm_lock:
-    runs-on: devextreme-shr2
-    timeout-minutes: 10
-    steps:
-    - name: Get sources
-      uses: actions/checkout@v4
-
-    - name: Use Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '20'
-
-    - uses: pnpm/action-setup@v3
-      with:
-        version: 9
-        run_install: false
-
-    - name: Get pnpm store directory
-      shell: bash
-      run: |
-        echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-    - uses: actions/cache@v4
-      name: Setup pnpm cache
-      with:
-        path: |
-          ${{ env.STORE_PATH }}
-          .nx/cache
-        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-store
-
-    - name: Update lock-file
-      run: |
-        node -v
-        pnpm -v
-        pnpm install
-
-    - name: Upload lock-file
-      uses: actions/upload-artifact@v4
-      with:
-        name: package-lock.json
-        path: ./package-lock.json
-        retention-days: 1
-
-    - name: Check lock-file
-      run: git diff --exit-code pnpm-lock.yaml
-
   component_exports:
     runs-on: devextreme-shr2
     timeout-minutes: 10
@@ -238,7 +190,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Check generated component reexports
       working-directory: ./packages/devextreme
@@ -288,15 +240,15 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Lint wrappers
       run: pnpm exec nx run-many -t lint -p devextreme-angular devextreme-react devextreme-vue
 
   notify:
     runs-on: devextreme-shr2
     name: Send notifications
-    needs: [TS, JS, texts, pnpm_lock, component_exports]
+    needs: [TS, JS, texts, component_exports]
     if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
 
     steps:

.github/workflows/lint.yml

@@ -64,7 +64,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Set timestamp version
         if: ${{ env.SET_TIMESTAMP_VERSION == 'true' }}
@@ -150,7 +150,7 @@ jobs:
             ${{ runner.os }}-pnpm-store
 
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Change package scope
         id: scopedPackage

.github/workflows/packages_publishing.yml

@@ -54,7 +54,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Build
       working-directory: ./packages/devextreme
@@ -130,7 +130,7 @@ jobs:
           ${{ runner.os }}-pnpm-store
 
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
 
     - name: Build
       working-directory: ./packages/devextreme-${{ matrix.ARGS.platform }}