Skip to content

Commit d915724

Browse files
Merge branch 'master' into fix/usememo-lint-error
2 parents a668cdb + 42e358e commit d915724

171 files changed

Lines changed: 51693 additions & 59 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
node-version: '24'
4949

50-
- name: Run npm install
50+
- name: Install dependencies
5151
env:
5252
PUPPETEER_SKIP_DOWNLOAD: true
5353
run: npm ci --no-audit --no-fund
@@ -117,7 +117,7 @@ jobs:
117117
cache: 'npm'
118118
cache-dependency-path: '**/package-lock.json'
119119

120-
- name: Run npm install
120+
- name: Install dependencies
121121
env:
122122
PUPPETEER_SKIP_DOWNLOAD: true
123123
run: npm ci --no-audit --no-fund

.github/workflows/check-nextjs.yml

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,48 +30,47 @@ jobs:
3030
with:
3131
node-version: ${{ matrix.NODE }}
3232
cache: 'npm'
33+
cache-dependency-path: |
34+
package-lock.json
35+
apps/nextjs-testing/**/package-lock.json
3336
34-
- name: Extract create-next-app version
37+
- name: Determine test app directory
3538
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+
TS_PART=${{ matrix.TYPESCRIPT == true && 'ts' || 'js' }}
40+
SRC_PART=${{ matrix.SRC_DIR == true && 'src' || 'nosrc' }}
41+
ROUTER_PART=${{ matrix.APP_ROUTER == true && 'app' || 'pages' }}
42+
echo "TEST_APP_DIR=apps/nextjs-testing/${TS_PART}-${SRC_PART}-${ROUTER_PART}" >> $GITHUB_ENV
3943
shell: bash
4044

41-
- name: Create Next.js application
45+
- name: Verify committed apps are up-to-date
4246
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
47+
EXPECTED_VERSION=$(node -e "const v = require('./packages/devextreme-cli/src/utility/latest-versions.js'); console.log(v['create-next-app'])")
48+
COMMITTED_VERSION=$(node -e "const m = require('./apps/nextjs-testing/.generator-meta.json'); console.log(m['create-next-app'])")
49+
if [ "$EXPECTED_VERSION" != "$COMMITTED_VERSION" ]; then
50+
echo "ERROR: Committed test apps use create-next-app@$COMMITTED_VERSION but latest-versions.js specifies $EXPECTED_VERSION"
51+
echo "Run 'npm run regenerate-nextjs-apps' and commit the results"
52+
exit 1
53+
fi
5254
shell: bash
5355

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
56+
- name: Install devextreme-cli dependencies
57+
run: npm ci --prefix packages/devextreme-cli
58+
timeout-minutes: 5
59+
60+
- name: Install test app dependencies
61+
run: cd ${{ env.TEST_APP_DIR }} && npm ci
62+
timeout-minutes: 5
6463

6564
- name: Add DevExtreme to Next.js application
6665
run: |
67-
cd test-nextjs-app
68-
npx devextreme-cli add devextreme-react
66+
cd ${{ env.TEST_APP_DIR }}
67+
node ../../../packages/devextreme-cli/index.js add devextreme-react
6968
shell: bash
7069
timeout-minutes: 15
7170

7271
- name: Verify DevExtreme dependencies in package.json
7372
run: |
74-
cd test-nextjs-app
73+
cd ${{ env.TEST_APP_DIR }}
7574
7675
if ! grep -q '"devextreme":' package.json; then
7776
echo "Error: devextreme dependency not found in package.json"
@@ -88,7 +87,7 @@ jobs:
8887

8988
- name: Build Next.js application
9089
run: |
91-
cd test-nextjs-app
90+
cd ${{ env.TEST_APP_DIR }}
9291
npm run build
9392
shell: bash
9493
timeout-minutes: 15

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
# Initializes the CodeQL tools for scanning.
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v2
43+
uses: github/codeql-action/init@v4
4444
with:
4545
languages: ${{ matrix.language }}
4646
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v2
57+
uses: github/codeql-action/autobuild@v4
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -67,6 +67,6 @@ jobs:
6767
# ./location_of_script_within_repo/buildscript.sh
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
70+
uses: github/codeql-action/analyze@v4
7171
with:
7272
category: "/language:${{matrix.language}}"

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
node-version: '24'
2323

24-
- name: Run npm install
24+
- name: Install dependencies
2525
env:
2626
PUPPETEER_SKIP_DOWNLOAD: true
2727
run: npm ci --no-audit --no-fund

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
node-version: '24'
3030

31-
- name: Run npm install - root
31+
- name: Install dependencies (root)
3232
run: npm ci --no-audit --no-fund
3333

34-
- name: Run npm install - devextreme-schematics
34+
- name: Install dependencies (devextreme-schematics)
3535
working-directory: packages/devextreme-schematics
3636
run: npm ci --no-audit --no-fund
3737

@@ -53,6 +53,6 @@ jobs:
5353
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5454
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5555
run: |
56-
npx lerna version ${{ github.event.inputs.version }} -y --no-push
56+
npx --no-install lerna version ${{ github.event.inputs.version }} -y --no-push
5757
git push -f --follow-tags --no-verify --atomic origin master
58-
npx lerna publish from-git -y
58+
npx --no-install lerna publish from-git -y

.github/workflows/themebuilder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
themebuilder-${{ runner.os }}-node-${{ matrix.NODE }}
3333
themebuilder-${{ runner.os }}-node-
3434
35-
- name: Run npm install
35+
- name: Install dependencies
3636
env:
3737
PUPPETEER_SKIP_DOWNLOAD: true
3838
run: npm ci --no-audit --no-fund

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# IDEs
22
**/.idea/
33
**/jsconfig.json
4+
!apps/nextjs-testing/**/jsconfig.json
45
**/.vscode/
56

67
# Misc
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"create-next-app": "16.1.0"
3+
}

apps/nextjs-testing/.npmrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
min-release-age=0.5
2+
os[]=darwin
3+
os[]=linux
4+
cpu[]=arm64
5+
cpu[]=x64
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.*
7+
.yarn/*
8+
!.yarn/patches
9+
!.yarn/plugins
10+
!.yarn/releases
11+
!.yarn/versions
12+
13+
# testing
14+
/coverage
15+
16+
# next.js
17+
/.next/
18+
/out/
19+
20+
# production
21+
/build
22+
23+
# misc
24+
.DS_Store
25+
*.pem
26+
27+
# debug
28+
npm-debug.log*
29+
yarn-debug.log*
30+
yarn-error.log*
31+
.pnpm-debug.log*
32+
33+
# env files (can opt-in for committing if needed)
34+
.env*
35+
36+
# vercel
37+
.vercel
38+
39+
# typescript
40+
*.tsbuildinfo
41+
next-env.d.ts

0 commit comments

Comments
 (0)