Skip to content

Commit 113deb5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/GPHWPP-4237-cleanup-for-sfs-constant
2 parents cfe1bb7 + a003d18 commit 113deb5

File tree

14 files changed

+1120
-860
lines changed

14 files changed

+1120
-860
lines changed

.githooks/pre-commit

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,5 @@ source "./scripts/includes/bootstrap.sh"
1919

2020
[[ "$CHECK_LEAKED_SECRETS" =~ true|yes ]] || exit 0
2121

22-
# test if docker image is locally available, otherwise pull it
23-
if [[ -z $(docker images -q zricethezav/gitleaks:latest) ]]; then
24-
ionos.wordpress.log_info "pulling gitleaks docker image (only done on first run) ..."
25-
docker pull zricethezav/gitleaks:latest
26-
fi
27-
28-
docker run --rm -v "$(pwd):/path" zricethezav/gitleaks:latest protect --source="/path" --staged -v
22+
# --pull=always is the cheapest way to ensure latest gitleaks database is used
23+
docker run $DOCKER_FLAGS --pull=always --rm -v "$(pwd):/path" zricethezav/gitleaks:latest protect --source="/path" --staged -v

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ packages/*/*/webpack.config.js
3131
.go-waas.env
3232
mcp.log
3333
.gemini/skills
34-
packages/docker/*/vendor
34+
packages/docker/*/vendor

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"license": "MIT",
6565
"devDependencies": {
6666
"@changesets/cli": "2.29.8",
67-
"@chromatic-com/storybook": "^4.1.3",
67+
"@chromatic-com/storybook": "^5.0.0",
6868
"@commitlint/cli": "20.3.1",
6969
"@commitlint/config-conventional": "20.3.1",
7070
"@devcontainers/cli": "^0.81.1",
@@ -82,29 +82,29 @@
8282
"@storybook/react": "^10.1.11",
8383
"@storybook/react-webpack5": "^10.1.11",
8484
"@storybook/test": "^8.6.15",
85-
"@types/node": "25.0.7",
85+
"@types/node": "25.0.9",
8686
"@wordpress/components": "catalog:",
87-
"@wordpress/e2e-test-utils-playwright": "^1.37.0",
88-
"@wordpress/env": "^10.37.0",
89-
"@wordpress/scripts": "^31.2.0",
87+
"@wordpress/e2e-test-utils-playwright": "^1.38.0",
88+
"@wordpress/env": "^10.38.0",
89+
"@wordpress/scripts": "^31.3.0",
9090
"@wp-now/wp-now": "0.1.74",
9191
"eslint": "9.39.2",
9292
"eslint-config-prettier": "10.1.8",
9393
"eslint-plugin-import": "2.32.0",
94-
"eslint-plugin-prettier": "5.5.4",
94+
"eslint-plugin-prettier": "5.5.5",
9595
"eslint-plugin-react": "7.37.5",
9696
"eslint-plugin-react-hooks": "7.0.1",
9797
"eslint-plugin-simple-import-sort": "12.1.1",
9898
"eslint-plugin-storybook": "^10.1.11",
9999
"git-cz": "4.9.0",
100100
"globals": "17.0.0",
101-
"prettier": "3.7.4",
101+
"prettier": "3.8.0",
102102
"react": "19.2.3",
103103
"react-dom": "19.2.3",
104104
"storybook": "^10.1.11",
105-
"stylelint": "^16.26.1",
106-
"stylelint-config-recommended-scss": "^16.0.2",
105+
"stylelint": "^17.0.0",
106+
"stylelint-config-recommended-scss": "^17.0.0",
107107
"stylelint-prettier": "^5.0.3",
108-
"stylelint-scss": "^6.14.0"
108+
"stylelint-scss": "^7.0.0"
109109
}
110110
}

packages/docker/potrans/composer.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/docker/potrans/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ionos-wordpress/potrans",
33
"description": "Docker image providing the most recent potrans (https://github.com/OzzyCzech/potrans) composer image in a docker image",
4-
"version": "1.1.9",
4+
"version": "1.1.10",
55
"private": true,
66
"keywords": [
77
"php",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"rector/rector": "2.3.0",
3+
"rector/rector": "2.3.4",
44
"php-stubs/wordpress-stubs": "6.9.0"
55
}
66
}

packages/docker/rector-php/composer.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/docker/rector-php/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionos-wordpress/rector-php",
3-
"version": "1.1.14",
3+
"version": "1.1.16",
44
"description": "This image provides the most recent [rector](https://github.com/rectorphp/rector) in a docker image.",
55
"private": true,
66
"keywords": [

0 commit comments

Comments
 (0)