Merge remote-tracking branch 'origin/23_2' into 23_2

# Conflicts:
#	package-lock.json

.github/actions/pin-browsers/action.yml

@@ -1,19 +1,33 @@
 name: "Pin Browsers"
 description: "Install and setup Chrome and Firefox"
 
+# List of browser versions
+# Chrome:  https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
+# Firefox: https://www.ubuntuupdates.org/package/ubuntu_mozilla_security/focal/main/base/firefox
+
 inputs:
   chrome-version:
     description: "Chrome version to install"
-    default: "115.0.5790.102-1"
+    default: "116.0.5845.110-1"
   firefox-version:
     description: "Firefox version to install"
     default: "latest"
 
 runs:
   using: composite
   steps:
-    - name: "Setup Chrome"
+    - name: "Setup latest Chrome"
+      if: ${{ inputs.chrome-version == 'latest' }}
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: ${{ inputs.chrome-version }}
+    - name: "Print latest Chrome version"
+      shell: bash
+      if: ${{ inputs.chrome-version == 'latest' }}
+      run: google-chrome-stable --version
+    - name: "Setup Chrome with specific version"
       shell: bash
+      if: ${{ inputs.chrome-version != 'latest' }}
       env:
         CHROME_VERSION: ${{ inputs.chrome-version }}
       run: |
@@ -25,16 +39,8 @@ runs:
         else
           echo "Skip Chrome upgrade"
         fi
-    - shell: bash
-      run: |
-        echo Installed chromium version: ${{ inputs.chrome-version }}
-        google-chrome-stable --version
     - name: "Setup Firefox"
       id: setup-firefox
       uses: browser-actions/setup-firefox@v1
       with:
         firefox-version: ${{ inputs.firefox-version }}
-    - shell: bash
-      run: |
-        echo Installed firefox versions: ${{ steps.setup-firefox.outputs.firefox-version }}
-        firefox --version

.github/renovate.json

@@ -5,8 +5,8 @@
     "prConcurrentLimit": 2,
     "semanticCommits": "enabled",
     "baseBranches": [
-        "23_1",
-        "23_2"
+        "23_2",
+        "23_1"
     ],
     "labels": [
         "dependencies"
@@ -51,9 +51,6 @@
             "dependencyDashboardApproval": true
         }
     ],
-    "ignorePaths": [
-        ".github"
-    ],
     "constraints": {
         "node": "^16.3.0"
     }

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
 

.github/workflows/devextreme_angular_tests.yml

@@ -0,0 +1,80 @@
+name: DevExtreme Angular Tests
+
+on:
+  pull_request:
+  push:
+    branches: [23_2]
+
+env:
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+    - name: Get sources
+      uses: actions/checkout@v4
+
+    - name: Use Node.js 18
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.16.1'
+
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      shell: bash
+      run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
+
+    - name: Restore npm cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ github.workflow }}-${{ hashFiles('**/package-lock.json') }}
+
+    - name: Install npm packages
+      run: npm i --no-audit --no-fund
+
+      # m.b. move to lint.yml?
+    - name: Run lint
+      working-directory: ./packages/devextreme-angular
+      run: npm run lint
+
+    - name: Build devextreme package
+      working-directory: ./packages/devextreme
+      run: npm run build
+
+    - name: Generate wrappers
+      run: npm run angular:regenerate
+
+    - name: Check generated code
+      shell: bash
+      run: |
+        git add . -N
+        changes=$(git diff --name-status HEAD -- packages/devextreme-angular/src)
+        if [ -n "$changes" ]; then
+          echo "Generated code is outdated. The following files have uncommitted changes:"
+          echo "$changes";
+          echo "To update generated code, use "npm run regenerate-all" and commit changes."
+          exit 1
+        fi
+
+    - name: Build wrappers
+      working-directory: ./packages/devextreme-angular
+      run: npm run build
+
+    - name: Run tests
+      working-directory: ./packages/devextreme-angular
+      run: npm run test:dev
+
+    - name: Check packing
+      working-directory: ./packages/devextreme-angular
+      run: npm run pack
+
+    - name: Archive internal-tools artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: internal-tools-artifacts
+        path: artifacts/internal-tools/
+        retention-days: 7

.github/workflows/devextreme_npm_tests.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Get sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js
       uses: actions/setup-node@v3
@@ -60,87 +60,6 @@ jobs:
           devextreme-dist-installer.tgz
         retention-days: 1
 
-  test_angular_wrappers:
-    name: Angular wrapper tests
-    needs: build
-    runs-on: devextreme-shr2
-    timeout-minutes: 30
-
-    steps:
-    - name: Use Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18.16.1'
-
-    - name: Get sources
-      uses: actions/checkout@v3
-      with:
-        path: ./devextreme
-
-    - name: Pin browsers
-      uses: ./devextreme/.github/actions/pin-browsers
-
-    - name: Restore npm cache
-      uses: actions/cache@v3
-      with:
-        path: './devextreme/**/node_modules'
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: ${{ runner.os }}-node-modules
-
-    - name: Install packages in devextreme repo
-      working-directory: ./devextreme
-      run: npm install --no-audit --no-fund
-
-    - name: Discover declarations in devextreme repo
-      working-directory: ./devextreme
-      run: npx nx discover-declarations devextreme-main
-
-    - name: Clone devextreme-angular repo from PR author fork
-      continue-on-error: true
-      if: github.event_name == 'pull_request'
-      run: |
-        REMOTE_URL=https://github.com/${{github.event.pull_request.user.login}}/devextreme-angular
-        REMOTE_BRANCH=${{github.event.pull_request.head.ref}}
-
-        if [ "$(git ls-remote --heads $REMOTE_URL $REMOTE_BRANCH | wc -l)" == "1" ]; then
-          git clone -b $REMOTE_BRANCH $REMOTE_URL ./devextreme-angular-repo
-        fi
-
-    - name: Clone devextreme-angular repo
-      run: |
-        test -d ./devextreme-angular-repo || git clone -b master https://github.com/devexpress/devextreme-angular ./devextreme-angular-repo
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: devextreme-npm
-        path: ./devextreme-angular-repo/devextreme-setup
-
-    - name: Install packages for devextreme-angular
-      working-directory: ./devextreme-angular-repo
-      run: npm install --no-audit --no-fund
-
-    - name: Install devextreme package
-      working-directory: ./devextreme-angular-repo
-      run: |
-        pushd devextreme-setup
-        installerName=$(realpath .)/devextreme-installer.tgz
-        popd
-        cd ./packages/devextreme-angular
-        npm install --save-dev --legacy-peer-deps $installerName
-        cd ../sandbox
-        npm install --save-dev --legacy-peer-deps $installerName
-        cd ../../
-        npm install --save-dev --legacy-peer-deps $installerName
-
-    - name: Build with Angular 12
-      working-directory: ./devextreme-angular-repo
-      run: npm run build
-
-    - name: Run tests with Angular 12
-      working-directory: ./devextreme-angular-repo/packages/devextreme-angular
-      run: npm run test:dev
-
   test_bundlers:
     name: Bundlers tests
     needs: build
@@ -149,7 +68,7 @@ jobs:
 
     steps:
     - name: Get sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js
       uses: actions/setup-node@v3
@@ -211,7 +130,7 @@ jobs:
 
     steps:
     - name: Get sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - uses: ./.github/actions/pin-browsers
 
@@ -291,13 +210,12 @@ jobs:
     name: Send notifications
     needs:
       - build
-      - test_angular_wrappers
       - test_bundlers
       - test_demos
     if: always() && contains(needs.*.result, 'failure')
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DevExpress/github-actions/send-teams-notification@main
         with:
           hook_url: ${{secrets.TEAMS_ALERT}}

.github/workflows/devextreme_react_tests.yml

@@ -15,19 +15,18 @@ jobs:
 
     steps:
     - name: Get sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Use Node.js 18
       uses: actions/setup-node@v3
       with:
-        node-version: '18'
+        node-version: '18.16.1'
 
     - name: Restore npm cache
       uses: actions/cache@v3
       with:
         path: '**/node_modules'
         key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: ${{ runner.os }}-node-modules
 
     - name: Run npm install
       run: npm i --no-audit --no-fund
@@ -37,15 +36,8 @@ jobs:
       working-directory: ./packages/devextreme-react
       run: npm run lint
 
-    - name: Generate metadata
-      run: npm run react:discover-metadata
-
-    - name: Build generator
-      run: npm run react:build-generator
-
     - name: Generate wrappers
-      working-directory: ./packages/devextreme-react
-      run: npm run generate
+      run: npm run react:regenerate
 
     - name: Check generated code
       shell: bash
@@ -55,7 +47,7 @@ jobs:
         if [ -n "$changes" ]; then
           echo "Generated code is outdated. The following files have uncommitted changes:"
           echo "$changes";
-          echo "To update generated code, use "npm run react:generate" and commit changes."
+          echo "To update generated code, use "npm run regenerate-all" and commit changes."
           exit 1
         fi
 

.github/workflows/devextreme_vue_tests.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Get sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js 18
       uses: actions/setup-node@v3
@@ -41,25 +41,22 @@ jobs:
       working-directory: ./packages/devextreme-vue
       run: npm run lint
 
-    - name: Generate metadata
-      run: npm run vue:discover-metadata
-
-    - name: Build generator
-      run: npm run vue:build-generator
+    - name: Build devextreme package
+      run: |
+        npx nx build devextreme-main
 
     - name: Generate wrappers
-      working-directory: ./packages/devextreme-vue
-      run: npm run generate
+      run: npm run vue:regenerate
 
     - name: Check generated code
       shell: bash
       run: |
         git add . -N
-        changes=$(git diff --name-status HEAD -- packages/devextreme-vue/src packages/vue2-strategy/src)
+        changes=$(git diff --name-status HEAD -- packages/devextreme-vue/src)
         if [ -n "$changes" ]; then
           echo "Generated code is outdated. The following files have uncommitted changes:"
           echo "$changes";
-          echo "To update generated code, use "npm run vue:generate" and commit changes."
+          echo "To update generated code, use "npm run regenerate-all" and commit changes."
           exit 1
         fi
 
@@ -71,14 +68,10 @@ jobs:
         path: ./artifacts/internal-tools/
         retention-days: 7
 
-    - name: Build devextreme package
-      run: |
-        npx nx build devextreme-main
-
     - name: Run tests with Vue
       working-directory: packages/devextreme-vue
       run: npm run test
 
     - name: Check packing
-      run: npx nx run-many -t pack -p devextreme-vue devextreme-vue2-strategy
+      run: npx nx run-many -t pack -p devextreme-vue