Skip to content

Commit d1c64b4

Browse files
committed
Merge remote-tracking branch 'origin/main' into devDep_updates
* origin/main: merge from main (#3761) Generate Manual test case for ADP Test (#3602) chore: apply latest changesets fix: CF integration tests and sonar issues (#3739)
1 parent fa9580c commit d1c64b4

File tree

11 files changed

+1906
-1893
lines changed

11 files changed

+1906
-1893
lines changed

examples/ui-prompting-examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"style-loader": "3.3.3",
6868
"ts-loader": "9.4.4",
6969
"ts-node": "10.9.2",
70-
"typescript": "5.6.2",
70+
"typescript": "5.9.3",
7171
"ws": "8.18.0"
7272
}
7373
}

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@
88
"@changesets/cli": "2.27.10",
99
"@playwright/test": "1.56.1",
1010
"@types/jest": "30.0.0",
11-
"@types/node": "18.11.9",
11+
"@types/node": "18.19.130",
1212
"@typescript-eslint/eslint-plugin": "^7.18.0",
1313
"@typescript-eslint/parser": "^7.18.0",
14-
"autoprefixer": "10.4.7",
15-
"check-dependency-version-consistency": "5.0.0",
16-
"esbuild": "0.25.6",
14+
"autoprefixer": "10.4.21",
15+
"check-dependency-version-consistency": "5.0.1",
16+
"esbuild": "0.25.11",
1717
"esbuild-sass-plugin": "3.3.1",
18-
"eslint": "8.56.0",
19-
"eslint-config-prettier": "8.10.0",
20-
"eslint-import-resolver-typescript": "3.6.1",
21-
"eslint-plugin-import": "2.29.1",
18+
"eslint": "8.57.1",
19+
"eslint-config-prettier": "8.10.2",
20+
"eslint-import-resolver-typescript": "3.10.1",
21+
"eslint-plugin-import": "2.32.0",
2222
"eslint-plugin-jsdoc": "46.10.1",
23-
"eslint-plugin-prettier": "4.2.1",
24-
"eslint-plugin-promise": "6.1.1",
25-
"eslint-plugin-sonarjs": "0.23.0",
23+
"eslint-plugin-prettier": "4.2.5",
24+
"eslint-plugin-promise": "6.6.0",
25+
"eslint-plugin-sonarjs": "0.25.1",
2626
"husky": "8.0.3",
27-
"jest": "30.1.1",
27+
"jest": "30.2.0",
2828
"jest-sonar": "0.2.16",
2929
"npm-run-all2": "7.0.2",
30-
"nx": "21.0.3",
31-
"postcss": "8.5.1",
32-
"prebuild-install": "^7.0.1",
30+
"nx": "21.6.5",
31+
"postcss": "8.5.6",
32+
"prebuild-install": "^7.1.3",
3333
"prettier": "2.8.8",
34-
"pretty-quick": "3.1.3",
35-
"react-select": "5.8.0",
36-
"react-virtualized": "9.22.5",
34+
"pretty-quick": "3.3.1",
35+
"react-select": "5.10.2",
36+
"react-virtualized": "9.22.6",
3737
"rimraf": "6.0.1",
38-
"ts-jest": "29.4.1",
39-
"typescript": "5.9.2",
40-
"update-ts-references": "3.2.1",
38+
"ts-jest": "29.4.5",
39+
"typescript": "5.9.3",
40+
"update-ts-references": "3.6.2",
4141
"yargs-parser": "21.1.1"
4242
},
4343
"scripts": {

packages/control-property-editor-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@sap-ux/logger": "workspace:*",
2525
"npm-run-all2": "6.2.0",
2626
"rimraf": "6.0.1",
27-
"ts-jest": "29.4.1"
27+
"ts-jest": "29.4.5"
2828
},
2929
"files": [
3030
"dist"

packages/control-property-editor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"source-map-support": "0.5.16",
5454
"stream-browserify": "3.0.0",
5555
"ts-import-plugin": "1.6.3",
56-
"ts-jest": "29.4.1",
56+
"ts-jest": "29.4.5",
5757
"postcss-modules": "6.0.1",
5858
"ejs": "3.1.10",
5959
"@ui5/fs": "3.0.4",

packages/fiori-app-sub-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/yeoman-generator": "5.2.14",
7575
"@types/yeoman-test": "4.0.6",
7676
"jest-extended": "6.0.0",
77-
"jest-mock": "30.0.5",
77+
"jest-mock": "30.2.0",
7878
"mock-spawn": "0.2.6",
7979
"rimraf": "6.0.1",
8080
"yeoman-test": "6.3.0"

packages/jest-file-matchers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"chalk": "4.1.2",
3232
"dir-compare": "5.0.0",
3333
"filenamify": "4.2.0",
34-
"jest-diff": "30.0.1",
34+
"jest-diff": "30.2.0",
3535
"minimatch": "3.0.5",
3636
"mkdirp": "1.0.4"
3737
},

packages/jest-runner-puppeteer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"chalk": "4.1.2",
33-
"jest-environment-node": "30.0.1",
33+
"jest-environment-node": "30.2.0",
3434
"mkdirp": "1.0.4",
3535
"puppeteer-core": "22.15.0",
3636
"which": "2.0.2"

packages/project-access/test/project/ui5-config.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ describe('Test getAllUi5YamlFileNames()', () => {
3535
memFs.write(join(samplesRoot, 'default-with-ui5-yaml', 'ui5-something.yaml'), 'yet another test');
3636
memFs.delete(join(samplesRoot, 'default-with-ui5-yaml', 'ui5-custom.yaml'));
3737

38-
expect(await getAllUi5YamlFileNames(join(samplesRoot, 'default-with-ui5-yaml'), memFs)).toMatchInlineSnapshot(`
38+
const result = await getAllUi5YamlFileNames(join(samplesRoot, 'default-with-ui5-yaml'), memFs);
39+
expect(result.sort()).toMatchInlineSnapshot(`
3940
Array [
4041
"ui5-custom-multi.yaml",
4142
"ui5-local.yaml",
4243
"ui5-mock.yaml",
43-
"ui5.yaml",
4444
"ui5-something.yaml",
45+
"ui5.yaml",
4546
]
4647
`);
4748
});

packages/ui-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@types/react-virtualized": "9.21.29",
6262
"@types/sanitize-html": "2.11.0",
6363
"@types/uuid": "3.4.11",
64-
"babel-jest": "30.0.1",
64+
"babel-jest": "30.2.0",
6565
"babel-loader": "9.1.3",
6666
"copyfiles": "2.4.1",
6767
"css-loader": "6.8.1",

packages/ui-prompting/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
"@types/inquirer": "8.2.6",
5858
"@types/react": "16.14.55",
5959
"@types/react-dom": "16.9.24",
60-
"babel-jest": "30.0.1",
60+
"babel-jest": "30.2.0",
6161
"babel-loader": "9.1.3",
6262
"copyfiles": "2.4.1",
6363
"css-loader": "6.8.1",
6464
"eslint-plugin-react": "7.33.2",
6565
"eslint-plugin-storybook": "0.6.15",
66-
"jest-environment-jsdom": "30.0.1",
66+
"jest-environment-jsdom": "29.7.0",
6767
"jest-scss-transform": "1.0.4",
6868
"npm-run-all2": "6.2.0",
6969
"react": "16.14.0",

0 commit comments

Comments
 (0)