Skip to content

Commit dfac863

Browse files
authored
Fix the remaining audit alerts (#33344)
1 parent 030f251 commit dfac863

11 files changed

Lines changed: 407 additions & 203 deletions

File tree

.github/actions/run-qunit-tests/action.yml

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,44 +42,16 @@ runs:
4242
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE"
4343
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE" >> $GITHUB_ENV
4444
45-
# - name: Update apt
46-
# run: |
47-
# sudo apt-get update
48-
49-
# - name: Setup utils
50-
# run: |
51-
# sudo apt-get install -y dbus-x11 httping x11vnc xvfb
52-
53-
- name: Setup Chrome
54-
if: ${{ inputs.browser == 'chrome' }}
55-
uses: ./.github/actions/setup-chrome-headless-shell
56-
with:
57-
chrome-version: '145.0.7632.67'
58-
59-
- name: Setup Firefox profile
60-
if: ${{ inputs.browser == 'firefox' }}
61-
shell: bash
62-
run: |
63-
mkdir -p /tmp/firefox-profile
64-
for p in \
65-
'"browser.shell.checkDefaultBrowser", false' \
66-
'"datareporting.policy.dataSubmissionEnabled", false' \
67-
'"font.name-list.monospace.x-western", "Liberation Mono"' \
68-
'"font.name-list.sans-serif.x-western", "Liberation Sans"' \
69-
'"font.name-list.serif.x-western", "Liberation Serif"' ; do echo "user_pref($p);" >> /tmp/firefox-profile/prefs.js; done
70-
71-
- name: Setup Firefox
72-
if: ${{ inputs.browser == 'firefox' }}
73-
id: setup-firefox
74-
uses: browser-actions/setup-firefox@v1
75-
with:
76-
firefox-version: '122.0.1'
77-
7845
- name: Use Node.js
7946
uses: actions/setup-node@v4
8047
with:
8148
node-version: '20'
8249

50+
- uses: pnpm/action-setup@v3
51+
with:
52+
version: 9
53+
run_install: false
54+
8355
- name: Download artifacts
8456
uses: actions/download-artifact@v4
8557
with:
@@ -93,11 +65,6 @@ runs:
9365
rm -rf artifacts/npm
9466
7z x artifacts.zip
9567
96-
- uses: pnpm/action-setup@v3
97-
with:
98-
version: 9
99-
run_install: false
100-
10168
- name: Get pnpm store directory
10269
shell: bash
10370
run: |
@@ -122,6 +89,31 @@ runs:
12289
shell: bash
12390
run: dotnet build build/build-dotnet.sln
12491

92+
- name: Setup Chrome
93+
if: ${{ inputs.browser == 'chrome' }}
94+
uses: ./.github/actions/setup-chrome-headless-shell
95+
with:
96+
chrome-version: '145.0.7632.67'
97+
98+
- name: Setup Firefox profile
99+
if: ${{ inputs.browser == 'firefox' }}
100+
shell: bash
101+
run: |
102+
mkdir -p /tmp/firefox-profile
103+
for p in \
104+
'"browser.shell.checkDefaultBrowser", false' \
105+
'"datareporting.policy.dataSubmissionEnabled", false' \
106+
'"font.name-list.monospace.x-western", "Liberation Mono"' \
107+
'"font.name-list.sans-serif.x-western", "Liberation Sans"' \
108+
'"font.name-list.serif.x-western", "Liberation Serif"' ; do echo "user_pref($p);" >> /tmp/firefox-profile/prefs.js; done
109+
110+
- name: Setup Firefox
111+
if: ${{ inputs.browser == 'firefox' }}
112+
id: setup-firefox
113+
uses: browser-actions/setup-firefox@v1
114+
with:
115+
firefox-version: '122.0.1'
116+
125117
- name: Run QUnit tests
126118
working-directory: ./packages/devextreme
127119
shell: bash

.github/actions/setup-chrome-headless-shell/action.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ runs:
1818
CHROME_VERSION: ${{ inputs.chrome-version }}
1919
run: |
2020
if [ -n "$CHROME_VERSION" ]; then
21-
sudo apt-get update
22-
sudo apt-get -y install libu2f-udev
23-
sudo apt-get -y install dbus
24-
2521
echo "version to install: $CHROME_VERSION"
26-
CHROME_BIN=`npx @puppeteer/browsers install chrome-headless-shell@$CHROME_VERSION | awk '{print $2}'`
27-
chmod +x $CHROME_BIN
22+
PUPPETEER_CMD="browsers install chrome-headless-shell@$CHROME_VERSION"
23+
CHROME_BIN=`pnpm --filter devextreme-angular exec puppeteer $PUPPETEER_CMD | awk '{print $2}'`
2824
echo "chrome-headless-shell installed in: $CHROME_BIN"
25+
chmod +x $CHROME_BIN
2926
$CHROME_BIN --version
3027
echo "CHROME_SHELL=$CHROME_BIN" >> $GITHUB_ENV
3128
else

.github/workflows/build_all.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,30 @@ jobs:
6464
needs: build
6565

6666
steps:
67+
- name: Get sources
68+
uses: actions/checkout@v4
69+
70+
- uses: pnpm/action-setup@v4
71+
with:
72+
run_install: false
73+
6774
- name: Download npm packages
6875
uses: actions/download-artifact@v4
6976
with:
7077
name: devextreme-npm-packages
7178
path: npm
7279

7380
- name: Move devextreme package
74-
run: mv ./npm/devextreme-2*.tgz ./devextreme.tgz
81+
run: mv ./npm/devextreme-2*.tgz ./e2e/devextreme-bundler/devextreme.tgz
7582

7683
- name: Setup deps
84+
working-directory: ./e2e/devextreme-bundler
7785
run: |
78-
npm init -y
79-
npm i webpack terser-webpack-plugin
80-
npm i ./devextreme.tgz
86+
pnpm install --filter devextreme-bundler-test --frozen-lockfile
87+
pnpm add --filter devextreme-bundler-test ./devextreme.tgz
8188
8289
- name: Build bundle
90+
working-directory: ./e2e/devextreme-bundler
8391
run: |
84-
npx --no-install devextreme-bundler-init custom-bundle
85-
npx --no-install devextreme-bundler custom-bundle
92+
pnpm exec devextreme-bundler-init custom-bundle
93+
pnpm exec devextreme-bundler custom-bundle

.github/workflows/demos_visual_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
${{ runner.os }}-pnpm-store
6767
6868
- name: Install dependencies
69-
run: pnpm install
69+
run: pnpm install --frozen-lockfile
7070

7171
- name: DevExtreme - Build
7272
shell: bash
@@ -125,7 +125,7 @@ jobs:
125125
${{ runner.os }}-pnpm-store
126126
127127
- name: Install dependencies
128-
run: pnpm install
128+
run: pnpm install --frozen-lockfile
129129

130130
- name: DevExtreme - Build
131131
run: pnpm exec nx build devextreme

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,6 @@ jobs:
142142
working-directory: apps/demos
143143
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
144144

145-
# - name: Build wrappers
146-
# run: pnpm exec nx run-many -t pack -p devextreme-angular devextreme-react devetreme-vue
147-
148-
# - name: Link wrappers packages
149-
# run: pnpm install
150-
151145
- name: Prepare bundles
152146
working-directory: apps/demos
153147
run: pnpm exec nx prepare-bundles

.github/workflows/wrapper_tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
${{ runner.os }}-pnpm-store
5858
5959
- name: Install dependencies
60-
run: pnpm install
60+
run: pnpm install --frozen-lockfile
6161

6262
- name: Build devextreme package
6363
env:
@@ -81,7 +81,9 @@ jobs:
8181
fi
8282
8383
- name: Angular - Download Browser
84-
run: pnpm --filter devextreme-angular exec puppeteer browsers install chrome@130.0.6723.69
84+
run: |
85+
PUPPETEER_CMD="browsers install chrome@130.0.6723.69"
86+
pnpm --filter devextreme-angular exec puppeteer $PUPPETEER_CMD
8587
8688
- name: Angular - Build
8789
run: pnpm exec nx build devextreme-angular
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "devextreme-bundler-test",
3+
"version": "24.2.14",
4+
"description": "Project for testing the \"devextreme-bundler\" commands from \"devextreme\" package. See build_all.yml for details",
5+
"scripts": {},
6+
"dependencies": {
7+
"terser-webpack-plugin": "5.3.10",
8+
"webpack": "5.104.1"
9+
}
10+
}

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -990,11 +990,11 @@ QUnit.module('Scrolling', baseModuleConfig, () => {
990990
scrollable.scrollTo(100.7);
991991

992992
// assert
993-
assert.equal(scrollable.scrollLeft(), 100);
994-
assert.equal($(scrollable.container()).scrollLeft(), 100);
993+
assert.equal(scrollable.scrollLeft(), 101);
994+
assert.equal($(scrollable.container()).scrollLeft(), 101);
995995

996996
const $headersScrollable = $dataGrid.find('.dx-datagrid-headers' + ' .dx-datagrid-scroll-container').first();
997-
assert.equal($headersScrollable.scrollLeft(), 100);
997+
assert.equal($headersScrollable.scrollLeft(), 101);
998998
});
999999

10001000
// T372552

0 commit comments

Comments
 (0)