Skip to content

Commit 7604f86

Browse files
Merge branch '26_1' into 26_1_dx_scss_nx_infra_p
2 parents e84a339 + b9a13a6 commit 7604f86

237 files changed

Lines changed: 9570 additions & 2434 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/renovate.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
"gulp-jsbeautifier",
142142
"gulp-multi-process",
143143
"gulp-notify",
144-
"gulp-remote-src",
145144
"gulp-rename",
146145
"gulp-tap",
147146
"gulp-uglify-es",

.github/workflows/health-check.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ jobs:
1010
invoke:
1111
name: Invoke
1212
uses: DevExpress/github-actions/.github/workflows/repository-check.yml@repository-check
13+
with:
14+
config: |
15+
{
16+
ignoredAdvisories: [
17+
'GHSA-67hx-6x53-jw92', // babel-traverse
18+
]
19+
}

.github/workflows/packages_publishing.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,6 @@ jobs:
4242
with:
4343
run_install: false
4444

45-
- name: Get pnpm store directory
46-
shell: bash
47-
run: |
48-
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
49-
50-
- uses: actions/cache@v4
51-
name: Setup pnpm cache
52-
with:
53-
path: ${{ env.PNPM_STORE_PATH }}
54-
key: ${{ runner.os }}-pnpm-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
55-
restore-keys: |
56-
${{ runner.os }}-pnpm-cache
57-
5845
- name: Install dependencies
5946
run: pnpm install --frozen-lockfile
6047

@@ -140,19 +127,6 @@ jobs:
140127
with:
141128
run_install: false
142129

143-
- name: Get pnpm store directory
144-
shell: bash
145-
run: |
146-
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
147-
148-
- uses: actions/cache@v4
149-
name: Setup pnpm cache
150-
with:
151-
path: ${{ env.PNPM_STORE_PATH }}
152-
key: ${{ runner.os }}-pnpm-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
153-
restore-keys: |
154-
${{ runner.os }}-pnpm-cache
155-
156130
- name: Install dependencies
157131
run: pnpm install --frozen-lockfile
158132

.github/workflows/packages_publishing_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1313
strategy:
1414
matrix:
15-
branch: ['24_1', '24_2', '25_1', '25_2', '26_1']
15+
branch: ['24_2', '25_1', '25_2', '26_1']
1616

1717
name: Run Packages Publishing workflow
1818
steps:
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Storybook PR Preview Cleanup
2+
3+
on:
4+
schedule:
5+
- cron: '0 3 * * 1' # Every Monday at 03:00 UTC
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
cleanup:
13+
name: Delete stale PR preview folders
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 10
16+
17+
steps:
18+
- name: Checkout gh-pages (full history)
19+
uses: actions/checkout@v4
20+
with:
21+
ref: gh-pages
22+
fetch-depth: 0
23+
24+
- name: Delete preview folders older than 7 days
25+
id: cleanup
26+
run: |
27+
DELETED=0
28+
CUTOFF=$(date -d '7 days ago' +%s)
29+
30+
for dir in preview/pr-*/; do
31+
[ -d "$dir" ] || continue
32+
33+
LAST_COMMIT_TS=$(git log -1 --format="%ct" -- "$dir")
34+
35+
if [ -z "$LAST_COMMIT_TS" ]; then
36+
echo "Skipping $dir: no commit history found"
37+
continue
38+
fi
39+
40+
if [ "$LAST_COMMIT_TS" -lt "$CUTOFF" ]; then
41+
echo "Removing $dir (last commit: $(date -d @$LAST_COMMIT_TS))"
42+
if git rm -rf "$dir"; then
43+
DELETED=$((DELETED + 1))
44+
else
45+
echo "Failed to remove $dir"
46+
fi
47+
else
48+
echo "Keeping $dir (last commit: $(date -d @$LAST_COMMIT_TS))"
49+
fi
50+
done
51+
52+
echo "deleted=$DELETED" >> "$GITHUB_OUTPUT"
53+
54+
- name: Commit and push removals
55+
if: steps.cleanup.outputs.deleted != '0'
56+
run: |
57+
git config --global user.email "DXGitHubRobot@devexpress.com"
58+
git config --global user.name "DX Robot"
59+
git commit -m "chore: remove ${{ steps.cleanup.outputs.deleted }} stale PR preview(s) [skip ci]"
60+
git push origin gh-pages

.github/workflows/publish-demos.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,3 +249,5 @@ jobs:
249249
with:
250250
github_token: ${{ secrets.GITHUB_TOKEN }}
251251
publish_dir: ./apps/demos/publish-demos
252+
destination_dir: demos
253+
keep_files: true

apps/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devextreme-angular-playground",
33
"description": "DevExtreme Angular UI and Visualization Components",
44
"private": true,
5-
"version": "26.1.0",
5+
"version": "26.1.2",
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {

apps/demos/Demos/Calendar/Overview/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function App() {
3131
const [useCellTemplate, setUseCellTemplate] = useState<boolean | null>(null);
3232
const [disabled, setDisabled] = useState<boolean>(false);
3333
const [showWeekNumbers, setShowWeekNumbers] = useState<boolean>(false);
34-
const [firstDay, setFirstDay] = useState<CalendarTypes.FirstDayOfWeek>(0);
34+
const [firstDay, setFirstDay] = useState<CalendarTypes.DayOfWeek>(0);
3535
const [weekNumberRule, setWeekNumberRule] = useState<CalendarTypes.WeekNumberRule>('auto');
3636

3737
const onCurrentValueChange = useCallback(

apps/demos/Demos/Calendar/Overview/Vue/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const currentValue = ref(new Date());
9090
const cellTemplate = ref('cell');
9191
const disabled = ref(false);
9292
const showWeekNumbers = ref(false);
93-
const firstDay = ref<DxCalendarTypes.FirstDayOfWeek>(0);
93+
const firstDay = ref<DxCalendarTypes.DayOfWeek>(0);
9494
const weekNumberRule = ref<DxCalendarTypes.WeekNumberRule>('auto');
9595
const weekDays = [
9696
{ id: 0, text: 'Sunday' },

apps/demos/configs/Angular/config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@ window.config = {
150150
'openai': {
151151
'esModule': true,
152152
},
153+
'zod': {
154+
'esModule': true,
155+
},
156+
'zod-to-json-schema': {
157+
'esModule': true,
158+
},
153159
},
154160
paths: {
155161
'npm:': '../../../../node_modules/',
@@ -221,6 +227,9 @@ window.config = {
221227
'openai': 'externals:openai.bundle.js',
222228
/**/
223229

230+
'zod': 'externals:zod.bundle.js',
231+
'zod-to-json-schema': 'externals:zod-to-json-schema.bundle.js',
232+
224233
'tslib': 'npm:tslib/tslib.js',
225234
'rxjs': 'npm:rxjs/dist/bundles/rxjs.umd.js',
226235
'rxjs/operators': 'npm:rxjs/dist/cjs/operators/index.js',

0 commit comments

Comments
 (0)