Merge branch '24_1' into 24_1-List-fix-alignment-in-demos

Signed-off-by: Nikki Gonzales <[email protected]>

.github/workflows/demos_unit_tests.yml

@@ -38,4 +38,4 @@ jobs:
 
       - name: Run unit tests
         working-directory: apps/demos
-        run: npm run test
+        run: npx nx test

.github/workflows/demos_visual_tests.yml

@@ -111,7 +111,7 @@ jobs:
         # DISABLE_DEMO_TEST_SETTINGS: ignore # Uncomment to ignore the `ignore` field
         # DISABLE_DEMO_TEST_SETTINGS: comparison-options # Uncomment to ignore the `comparison-options` field
         CI_ENV: true # The `ignore` field in the visualtestrc.json should be disabled when running test locally
-      run: npm run test-testcafe
+      run: npx nx test-testcafe
 
     - name: Show accessibility warnings
       if: matrix.STRATEGY == 'accessibility'

.github/workflows/demos_visual_tests_frameworks.yml

@@ -11,6 +11,10 @@ on:
       - "[0-9][0-9]_[0-9]"
   workflow_dispatch:
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   build-devextreme:
     runs-on: ubuntu-latest
@@ -107,7 +111,7 @@ jobs:
 
     - name: Prepare bundles
       working-directory: apps/demos
-      run: npm run prepare-bundles
+      run: npx nx prepare-bundles
 
     - name: Demos - Run tsc
       working-directory: apps/demos
@@ -160,7 +164,7 @@ jobs:
       matrix:
         include:
           - name: Lint code base (excluding demos)
-            command: npm run lint-non-demos
+            command: npx nx lint-non-demos
           # NOTE: skipped due to enormous number of errors
           # - name: Lint demos (1/4)
           #   command: CONSTEL=1/4 npm run lint-demos
@@ -378,17 +382,12 @@ jobs:
         # DISABLE_DEMO_TEST_SETTINGS: ignore # Uncomment to ignore the `ignore` field
         # DISABLE_DEMO_TEST_SETTINGS: comparison-options # Uncomment to ignore the `comparison-options` field
         CI_ENV: true # The `ignore` field in the visualtestrc.json should be disabled when running test locally
-      run: npm run test-testcafe
-
-    - name: Get screenshots artifacts name
-      if: ${{ failure() }}
-      id: screenshotname
-      run: echo "value=$(echo "${{ matrix.CONSTEL }}" | grep -oP "^\w+")" >> $GITHUB_OUTPUT
+      run: npx nx test-testcafe
 
     - name: Copy screenshots artifacts
       if: ${{ failure() }}
       uses: actions/upload-artifact@v3
       with:
-        name: screenshots-${{ steps.screenshotname.outputs.value }}-${{ matrix.THEME }}
+        name: screenshots
         path: ${{ github.workspace }}/apps/demos/testing/artifacts/compared-screenshots/**/*
         if-no-files-found: ignore

.github/workflows/lint.yml

@@ -9,6 +9,10 @@ on:
   push:
     branches: [24_1]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   Renovation:
     runs-on: devextreme-shr2
@@ -35,12 +39,12 @@ jobs:
     - name: Compile renovation
       working-directory: ./packages/devextreme
       run: |
-        npm run compile:r
+        npx nx compile:r
 # Remove package install after upgrade to TypeScript >= 4.6
 
     - name: Lint renovation
       working-directory: ./packages/devextreme
-      run: npm run lint-renovation
+      run: npx nx lint-renovation
 
   TS:
     runs-on: devextreme-shr2
@@ -66,25 +70,25 @@ jobs:
 
     - name: Build
       working-directory: ./packages/devextreme
-      run: npm run build
+      run: npx nx build
 
     - name: Lint TS
       working-directory: ./packages/devextreme
       env:
         DEBUG: eslint:cli-engine
-      run: npm run lint-ts
+      run: npx nx lint-ts
 
     - name: Lint .d.ts
       working-directory: ./packages/devextreme
       env:
         DEBUG: eslint:cli-engine
-      run: npm run lint-dts
-    
+      run: npx nx lint-dts
+
     - name: Lint Testcafe tests
       working-directory: ./e2e/testcafe-devextreme
       env:
         DEBUG: eslint:cli-engine
-      run: npm run lint
+      run: npx nx lint
 
   JS:
     runs-on: devextreme-shr2
@@ -110,13 +114,13 @@ jobs:
 
     - name: Build
       working-directory: ./packages/devextreme
-      run: npm run build
+      run: npx nx build
 
     - name: Lint JS
       working-directory: ./packages/devextreme
       env:
         DEBUG: eslint:cli-engine
-      run: npm run lint-js
+      run: npx nx lint-js
 
   texts:
     runs-on: devextreme-shr2
@@ -142,7 +146,7 @@ jobs:
 
     - name: Check texts
       working-directory: ./packages/devextreme
-      run: npm run lint-texts
+      run: npx nx lint-texts
 
   CSS:
     runs-on: devextreme-shr2
@@ -168,7 +172,7 @@ jobs:
 
     - name: Lint CSS
       working-directory: ./packages/devextreme
-      run: npm run lint-css
+      run: npx nx lint-css
 
   package_lock:
     runs-on: devextreme-shr2
@@ -193,7 +197,7 @@ jobs:
       with:
         name: package-lock.json
         path: ./package-lock.json
-        retention-days: 1  
+        retention-days: 1
 
     - name: Check package-lock
       run: git diff --exit-code package-lock.json
@@ -260,17 +264,8 @@ jobs:
     - name: Install dependencies
       run: npm install --no-audit --no-fund
 
-    - name: Lint devextreme-angular
-      working-directory: ./packages/devextreme-angular
-      run: npm run lint
-
-    - name: Lint devextreme-react
-      working-directory: ./packages/devextreme-react
-      run: npm run lint
-
-    - name: Lint devextreme-vue
-      working-directory: ./packages/devextreme-vue
-      run: npm run lint
+    - name: Lint wrappers
+      run: npx nx run-many -t lint -p devextreme-angular devextreme-react devextreme-vue
 
   notify:
     runs-on: devextreme-shr2

.github/workflows/playgrounds_tests.yml

@@ -9,6 +9,10 @@ on:
   push:
     branches: [24_1]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   build:
     name: build
@@ -39,7 +43,7 @@ jobs:
 
     - name: Build
       working-directory: ./packages/devextreme
-      run: npm run build
+      run: npx nx build
 
     - name: Zip artifacts
       working-directory: ./packages/devextreme
@@ -106,7 +110,7 @@ jobs:
 
     - name: Check sources compilation
       working-directory: ./apps/${{ matrix.ARGS.platform }}
-      run: npm run build
+      run: npx nx build
 
 #    - name: Run test
 #      if: ${{ matrix.ARGS.platform != 'angular' }}

.github/workflows/qunit_tests-additional-renovation.yml

@@ -9,6 +9,10 @@ on:
   push:
     branches: [24_1]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   build:
     runs-on: devextreme-shr2
@@ -41,8 +45,8 @@ jobs:
           DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
         working-directory: ./packages/devextreme
         run: |
-          npm run build:dev
-          npm run build:systemjs
+          npx nx build:dev
+          npx nx build:systemjs
 
       - name: Zip artifacts
         working-directory: ./packages/devextreme

.github/workflows/qunit_tests-renovation.yml

@@ -9,6 +9,10 @@ on:
   push:
     branches: [24_1]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   build:
     runs-on: devextreme-shr2
@@ -40,7 +44,8 @@ jobs:
         DEVEXTREME_TEST_CI: "true"
         DOTNET_CLI_TELEMETRY_OPTOUT: "true"
         DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
-      run: BUILD_INPROGRESS_RENOVATION=true npm run build:dev
+        BUILD_INPROGRESS_RENOVATION: "true"
+      run: npx nx build:dev
 
     - name: Zip artifacts
       working-directory: ./packages/devextreme

.github/workflows/testcafe_tests.yml

@@ -176,7 +176,7 @@ jobs:
         [ "${{ matrix.ARGS.platform }}" != "" ] && PLATFORM="--platform ${{ matrix.ARGS.platform }}"
         all_args="--browsers=chrome:devextreme-shr2 --componentFolder ${{ matrix.ARGS.componentFolder }} $CONCURRENCY $INDICES $PLATFORM $THEME"
         echo "$all_args"
-        npm run test -- $all_args
+        npx nx test $all_args
 
     - name: Copy compared screenshot artifacts
       if: ${{ failure() }}

.github/workflows/themebuilder_tests.yml

@@ -9,6 +9,10 @@ on:
   push:
     branches: [24_1]
 
+env:
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
+  NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+
 jobs:
   test:
     runs-on: devextreme-shr2
@@ -34,11 +38,11 @@ jobs:
 
     - name: Build
       working-directory: ./packages/devextreme-themebuilder
-      run: npm run build
+      run: npx nx build
 
     - name: Run themebuilder tests (full set, node)
-      run: npm run test
       working-directory: ./packages/devextreme-themebuilder
+      run: npx nx test
 
     - name: Check styles for duplicate rules (generic)
       working-directory: ./packages/devextreme

.github/workflows/wrapper_tests.yml

@@ -8,6 +8,7 @@ on:
 env:
   NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
   NX_SKIP_NX_CACHE: ${{ (github.event_name != 'pull_request' || contains( github.event.pull_request.labels.*.name, 'skip-cache')) && 'true' || 'false' }}
+  BUILD_TEST_INTERNAL_PACKAGE: true
 
 jobs:
   test:
@@ -39,9 +40,7 @@ jobs:
 
       - name: Build devextreme package
         working-directory: ./packages/devextreme
-        env:
-          BUILD_TEST_INTERNAL_PACKAGE: true
-        run: npm run build
+        run: npx nx build
 
       - name: Generate wrappers
         run: npm run regenerate-all
@@ -59,16 +58,13 @@ jobs:
           fi
 
       - name: Angular - Build
-        working-directory: ./packages/devextreme-angular
-        run: npm run build
+        run: npx nx build devextreme-angular
 
       - name: Angular - Run tests
-        working-directory: ./packages/devextreme-angular
-        run: npm run test:dev
+        run: npx nx test:dev devextreme-angular
 
       - name: Angular - Check packing
-        working-directory: ./packages/devextreme-angular
-        run: npm run pack
+        run: npx nx pack devextreme-angular
 
       - name: React - Run tests
         run: npx nx test devextreme-react
@@ -77,11 +73,10 @@ jobs:
         run: npx nx pack devextreme-react
 
       - name: Vue - Run tests
-        working-directory: packages/devextreme-vue
-        run: npm run test
+        run: npx nx test devextreme-vue
 
       - name: Vue - Check packing
-        run: npx nx run-many -t pack -p devextreme-vue
+        run: npx nx pack devextreme-vue
 
       - name: Archive internal-tools artifacts
         uses: actions/upload-artifact@v3

apps/angular/project.json

@@ -0,0 +1,25 @@
+{
+  "name": "devextreme-angular-playground",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/angular",
+  "projectType": "application",
+  "targets": {
+    "build": {
+      "executor": "nx:run-script",
+      "options": {
+        "script": "build"
+      },
+      "inputs": [
+        "{projectRoot}/src/**/*",
+        "{projectRoot}/angular.json",
+        "{projectRoot}/tsconfig*",
+        "{workspaceRoot}/tsconfig.json"
+      ],
+      "outputs": [
+        "{projectRoot}/dist"
+      ],
+      "cache": true
+    }
+  },
+  "tags": []
+}