Skip to content

Commit a991955

Browse files
VasilyStrelyaevGoodDayForSurfdxvladislavvolkovsergey-krasajivanyandev
authored
release: merge dev to master (#965)
* Move to create vite for creating React app (#928) * replace create-react-app by create-vite for creating React App template --------- Co-authored-by: Vasily Strelyaev <Vasily.Strelyaev@devexpress.com> * Add a version of the react with a SWC transpiler (#929) * replace create-react-app by create-vite for creating React App template * revive CI tasks that test against latest scaffolder and framework versions (#930) * Upgrade Devextreme version (#943) * upgrade to Devextreme 25.1.1-alpha * fix issues spotted by Vlad (#950) * Add nextjs template app (#949) Add nextjs template --------- Co-authored-by: Vasily Strelyaev <Vasily.Strelyaev@devexpress.com> * Add prompt for react-app for choosing nextjs/vite (#953) * add prompt for create new react-app --------- Co-authored-by: Vasily Strelyaev <Vasily.Strelyaev@devexpress.com> * chore: enhance nextjs auth stubs, bump versions (#955) * enhance Next.js auth stubs * bump DevExtreme version * disable test * oh * return footer to where it belongs * missed something * Use standalone in Angular app (#951) * use standalone in Angular app * Dev ng use standalone 2 (#956) * fix test increase screenshot comparing threshold * fix: Next.js template throws server cookie decrypt error (#961) * fix server cookie decrypt error * try largest threshold in problematic scenario * disable the problematic scenario completely * more general test suppression * try with new baseline * Add zoneless flag (#962) * Fix for CLI: ng app works incorrectly with ng 20 (#960) * feat: added angular 20 for app * feat: small fix angular 20 for app * feat: small fix angular 20 for app * fix: reverted files * fix: small fix * fix: fix build * fix: fixed tests * fix: small fix * fix: small fix * fix: small fix * fix: revert refactoring * fix: reverted patch * fix: reverted patch * fix(routing): Add logic to add missing imports (#959) * fix(routing): Add logic to add missing import statements to the routing file * fix(tests): Add tests to ensure correct imports in toutes file * fix(routing): Fix dasherize logic in getRooute and fix tests * fix(routing): Improve getRoute logic, add path optional param * fix: combine services and components into one array * fix a style that overlaps with Scheduler styles (#963) * fix rebase artifact * add type to imports --------- Co-authored-by: Aliullov Vlad <91639107+GoodDayForSurf@users.noreply.github.com> Co-authored-by: volvl <dxvladislavvolkov@users.noreply.github.com> Co-authored-by: Sergey Krasnolutskiy <vip.41243@gmail.com> Co-authored-by: Arman Jivanyan <arman.jivanyan@devexpress.com>
1 parent 8a2f2a0 commit a991955

225 files changed

Lines changed: 3946 additions & 1700 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/applications.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
pull_request:
66
workflow_call:
77
inputs:
8-
external-tools-version:
9-
description: 'Version of external tools'
10-
default: latest
8+
deps-version-tag:
9+
description: 'Version tag of scaffolder and framework'
10+
default: ''
1111
required: false
1212
type: string
1313

@@ -21,16 +21,19 @@ jobs:
2121
- vue-v3
2222
- react
2323
- react-ts
24+
- react-swc
25+
- react-swc-ts
26+
- nextjs
27+
- nextjs-ts
2428
NODE:
2529
- 18
2630
OS:
2731
- ubuntu-latest
28-
- windows-latest
2932

3033
runs-on: ${{ matrix.OS }}
3134
env:
3235
VUE_CLI_CONFIG_PATH: $GITHUB_WORKSPACE/.vuerc
33-
TOOLING_VERSION_PARAM: ${{ inputs.external-tools-version != '' && format('--tooling-version {0}', inputs.external-tools-version) || '' }}
36+
DEPS_VERSION_TAG_PARAM: ${{ inputs.deps-version-tag != '' && format('--deps-version-tag {0}', inputs.deps-version-tag) || '' }}
3437

3538
name: ${{ matrix.APPROACH }}, node ${{ matrix.NODE }}, ${{ matrix.OS }}
3639

@@ -52,7 +55,7 @@ jobs:
5255
run: npm config set legacy-peer-deps true
5356

5457
- name: Create ${{ matrix.APPROACH }} application
55-
run: npm run create-template -- -- -e ${{ matrix.APPROACH }} ${{ env.TOOLING_VERSION_PARAM }}
58+
run: npm run create-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
5659
timeout-minutes: 30
5760

5861
- name: Install Internal Packages
@@ -62,14 +65,14 @@ jobs:
6265

6366
- name: Lint created application
6467
if: ${{ matrix.OS != 'windows-latest' }}
65-
run: npm run lint-template -- -- -e ${{ matrix.APPROACH }} ${{ env.TOOLING_VERSION_PARAM }}
68+
run: npm run lint-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
6669

6770
- name: Run template tests
6871
if: ${{ matrix.OS != 'windows-latest' }}
6972
env:
7073
LAUNCH_BROWSER: true
7174
CHROME_PATH: ${{ steps.setup-chrome.outputs.chrome-path }}
72-
run: npm run test-template -- -- -e ${{ matrix.APPROACH }} ${{ env.TOOLING_VERSION_PARAM }}
75+
run: npm run test-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
7376
timeout-minutes: 40
7477

7578
- name: Archive artifacts

‎.github/workflows/check-nextjs.yml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: Check "add devextreme-react" for NextJS app
2+
3+
on:
4+
push:
5+
pull_request:
6+
workflow_dispatch:
7+
8+
jobs:
9+
nextjs-devextreme-test:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
TYPESCRIPT: [true, false]
14+
SRC_DIR: [true, false]
15+
APP_ROUTER: [true, false]
16+
NODE:
17+
- 18
18+
OS:
19+
- ubuntu-latest
20+
21+
runs-on: ${{ matrix.OS }}
22+
name: Next.js + DevExtreme (TS:${{ matrix.TYPESCRIPT }}, src:${{ matrix.SRC_DIR }}, app-router:${{ matrix.APP_ROUTER }}), node ${{ matrix.NODE }}, ${{ matrix.OS }}
23+
24+
steps:
25+
- name: Get sources
26+
uses: actions/checkout@v4
27+
28+
- name: Set up Node.js
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: ${{ matrix.NODE }}
32+
cache: 'npm'
33+
34+
- name: Extract create-next-app version
35+
run: |
36+
NEXT_APP_VERSION=$(node -e "const versions = require('./packages/devextreme-cli/src/utility/latest-versions.js'); console.log(versions['create-next-app'])")
37+
echo "Using create-next-app version: $NEXT_APP_VERSION"
38+
echo "NEXT_APP_VERSION=$NEXT_APP_VERSION" >> $GITHUB_ENV
39+
shell: bash
40+
41+
- name: Create Next.js application
42+
run: |
43+
npx create-next-app@${{ env.NEXT_APP_VERSION }} test-nextjs-app \
44+
--typescript=${{ matrix.TYPESCRIPT }} \
45+
--src-dir=${{ matrix.SRC_DIR }} \
46+
--app=${{ matrix.APP_ROUTER }} \
47+
--eslint \
48+
--no-tailwind \
49+
--import-alias="@/*" \
50+
--no-git \
51+
--use-npm
52+
shell: bash
53+
54+
- name: Add actual devExtreme-cli
55+
run: |
56+
cd test-nextjs-app
57+
npm add devextreme-cli
58+
rm -r ./node_modules/devextreme-cli/src/
59+
cp -r ../packages/devextreme-cli/src/ ./node_modules/devextreme-cli/
60+
ls ./node_modules/devextreme-cli
61+
ls ./node_modules/devextreme-cli/src
62+
shell: bash
63+
timeout-minutes: 15
64+
65+
- name: Add DevExtreme to Next.js application
66+
run: |
67+
cd test-nextjs-app
68+
npx devextreme-cli add devextreme-react
69+
shell: bash
70+
timeout-minutes: 15
71+
72+
- name: Verify DevExtreme dependencies in package.json
73+
run: |
74+
cd test-nextjs-app
75+
76+
if ! grep -q '"devextreme":' package.json; then
77+
echo "Error: devextreme dependency not found in package.json"
78+
exit 1
79+
fi
80+
81+
if ! grep -q '"devextreme-react":' package.json; then
82+
echo "Error: devextreme-react dependency not found in package.json"
83+
exit 1
84+
fi
85+
86+
echo "DevExtreme dependencies successfully installed"
87+
shell: bash
88+
89+
- name: Build Next.js application
90+
run: |
91+
cd test-nextjs-app
92+
npm run build
93+
shell: bash
94+
timeout-minutes: 15

‎.github/workflows/schedule-cli-tests-latest-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Run CLI tests
1111
uses: ./.github/workflows/applications.yml
1212
with:
13-
external-tools-version: latest
13+
deps-version-tag: latest
1414

1515
teams_notification_on_failure:
1616
name: Send Teams notification

‎.github/workflows/schedule-cli-tests-next-version.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: Schedule tests for next versions of external CLIs
22

33
on:
44
workflow_dispatch:
5-
schedule:
6-
- cron: "0 1 * * 1"
5+
# schedule:
6+
# - cron: "0 1 * * 1"
77

88
jobs:
99
call_tests_workflow:
1010
name: Run CLI tests
1111
uses: ./.github/workflows/applications.yml
1212
with:
13-
external-tools-version: next
13+
deps-version-tag: next
1414

1515
teams_notification_on_failure:
1616
name: Send Teams notification

0 commit comments

Comments
 (0)