From 8a11c474ea375e88150b6450aad96d342ea79bab Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Tue, 2 Sep 2025 14:07:17 -0400 Subject: [PATCH 1/2] update plugins to handle bitnami brownout --- .github/workflows/pr-unit-tests.yml | 2 +- .github/workflows/pr-wordpress-tests.yml | 1 + .github/workflows/release.yml | 3 +- .lando.yml | 2 +- CHANGELOG.md | 7 ++- README.md | 2 +- docs/development.md | 2 +- docs/index.md | 2 +- netlify.toml | 9 +++ package-lock.json | 76 +++++++++++++++--------- package.json | 11 ++-- 11 files changed, 77 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index 5cc3c46..df40f56 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -11,7 +11,7 @@ jobs: os: - windows-2022 - ubuntu-24.04 - - macos-14 + - macos-15 node-version: - '20' steps: diff --git a/.github/workflows/pr-wordpress-tests.yml b/.github/workflows/pr-wordpress-tests.yml index 579e694..6ba5326 100644 --- a/.github/workflows/pr-wordpress-tests.yml +++ b/.github/workflows/pr-wordpress-tests.yml @@ -25,6 +25,7 @@ jobs: - examples/wordpress-nginx lando-version: - 3-edge + - 3-stable os: - ubuntu-24.04 node-version: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1135c23..d015f07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,7 @@ name: Publish to NPM on: release: types: - - published - - edited + - created jobs: deploy: diff --git a/.lando.yml b/.lando.yml index 71c2f92..61022cf 100644 --- a/.lando.yml +++ b/.lando.yml @@ -5,7 +5,7 @@ proxy: services: cli: api: 4 - image: node:18 + image: node:20 command: sleep infinity ports: - 5173:5173/http diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b5b648..853d721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) -* Updated lando/php to v1.7.1. +* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace +* Updated to [@lando/mariadb@1.7.0](https://github.com/lando/mariadb/releases/tag/v1.7.0) +* Updated to [@lando/mysql@1.6.0](https://github.com/lando/mysql/releases/tag/v1.6.0) +* Updated to [@lando/nginx@1.5.0](https://github.com/lando/nginx/releases/tag/v1.5.0) +* Updated to [@lando/php@1.8.0](https://github.com/lando/php/releases/tag/v1.8.0) +* Updated to [@lando/postgres@1.5.0](https://github.com/lando/postgres/releases/tag/v1.5.0) ## v1.8.0 - [December 9, 2024](https://github.com/lando/wordpress/releases/tag/v1.8.0) diff --git a/README.md b/README.md index 0a374d9..241c6f1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This is the _official_ [Lando](https://lando.dev) plugin for [WordPress](https://wordpress.org/). When installed it... * Allows users to run `wordpress` cms -* Allows users to configure `php` version from `5.3` all the way to `8.1` +* Allows users to configure `php` version from `5.3` all the way to `8.4` * Allows users to configure `webroot` * Allows users to configure web server to (`apache` or `nginx`) * Allows users to configure database backend to (`mariadb`, `mysql`, or `postgres`) diff --git a/docs/development.md b/docs/development.md index b892876..8bf8286 100644 --- a/docs/development.md +++ b/docs/development.md @@ -13,7 +13,7 @@ At the very least you will need to have the following installed: * [Lando 3.21.0+](https://docs.lando.dev/getting-started/installation.html) preferably installed [from source](https://docs.lando.dev/install/source.html). * [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) -* [Node 18](https://nodejs.org/dist/latest-v18.x/) +* [Node 20](https://nodejs.org/dist/latest-v20.x/) ## Installation diff --git a/docs/index.md b/docs/index.md index 702c2e8..f3efeb5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -12,7 +12,7 @@ Lando offers a configurable [recipe](https://docs.lando.dev/landofile/recipes.ht #### Features of this plugin: -* Configurable `php` version from `5.3` all the way to `8.3` +* Configurable `php` version from `5.3` all the way to `8.4` * Configurable `webroot` * Configurable web server (`apache` or `nginx`) * Configurable database backend (`mariadb`, `mysql`, or `postgres`) diff --git a/netlify.toml b/netlify.toml index e0b9084..e385d0f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -40,6 +40,15 @@ output_path = "reports/lighthouse.html" # We need this so preview environments and the base site look ok on their own +[[redirects]] + from = "https://lando-wordpress.netlify.app" + to = "https://lando-wordpress.netlify.app/plugins/wordpress/index.html" + status = 301 + force = true +[[redirects]] + from = "https://lando-wordpress.netlify.app/*" + to = "https://docs.lando.dev/:splat" + status = 301 [[redirects]] from = "/" to = "/plugins/wordpress" diff --git a/package-lock.json b/package-lock.json index 140e8c0..d7cfa84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,12 @@ "version": "1.8.0", "license": "MIT", "dependencies": { - "@lando/mariadb": "^1.6.3", + "@lando/mariadb": "^1.7.0", "@lando/mssql": "^1.4.3", - "@lando/mysql": "^1.4.4", - "@lando/php": "^1.7.1", - "@lando/postgres": "^1.4.4", + "@lando/mysql": "^1.6.0", + "@lando/nginx": "^1.5.0", + "@lando/php": "^1.8.0", + "@lando/postgres": "^1.5.0", "lodash": "^4.17.21" }, "devDependencies": { @@ -30,7 +31,7 @@ "vitepress": "^1.3.4" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@algolia/autocomplete-core": { @@ -1412,18 +1413,18 @@ } }, "node_modules/@lando/mariadb": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@lando/mariadb/-/mariadb-1.6.3.tgz", - "integrity": "sha512-56ZdlAnWVlsFV5oiGNOdgqprDxf5QyVc/LDOxk5CesInbH5knPJu04uE54UDwUcc41NmmX2DpTc7OTQ7ayURNA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@lando/mariadb/-/mariadb-1.7.0.tgz", + "integrity": "sha512-2R/c9VDkWP9DJFgb8KldgI5uSWF0Y35ZGTA+oSOI9kpKA6JKOVueIag5LJNGrhemsXlpytfiMgOPIwFyMKr7Pw==", "bundleDependencies": [ "lodash" ], - "license": "GPL-3.0", + "license": "MIT", "dependencies": { "lodash": "^4.17.21" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@lando/mariadb/node_modules/lodash": { @@ -1452,18 +1453,18 @@ "license": "MIT" }, "node_modules/@lando/mysql": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/@lando/mysql/-/mysql-1.4.4.tgz", - "integrity": "sha512-AmbCCj/Ifma5mobCGfkrQ1eEBkWNdxiJASSDhmsTc0ZnATPwJOyk9mjKNksMI3nsieP8VvRktdAVkj6LhfsWqA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@lando/mysql/-/mysql-1.6.0.tgz", + "integrity": "sha512-5HXK9JgBFnoPQCHNn7BuMmBCtyhB0Da6ZQ02KnuFfcZ3koaZ/IKyp2KIf+2vzRzvfZxK+/er7RdMk+2dnBzUCQ==", "bundleDependencies": [ "lodash" ], - "license": "GPL-3.0", + "license": "MIT", "dependencies": { "lodash": "^4.17.21" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@lando/mysql/node_modules/lodash": { @@ -1471,36 +1472,57 @@ "inBundle": true, "license": "MIT" }, + "node_modules/@lando/nginx": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-1.5.0.tgz", + "integrity": "sha512-OPLKofq8zH+Ht8Qia7ryeF+uLwhBojGll9cpOJssSGU5uIB7lyYcfW60DWdZDSapYJjQNboz82Hro0ELhvohGg==", + "bundleDependencies": [ + "lodash" + ], + "license": "MIT", + "dependencies": { + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/@lando/nginx/node_modules/lodash": { + "version": "4.17.21", + "inBundle": true, + "license": "MIT" + }, "node_modules/@lando/php": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.7.1.tgz", - "integrity": "sha512-yndqYlVy51k0GWVwbNas4MvY0mXTYyC9XJeUnyyx7kzX84j3TwnLt8/MYHXMaP6e/SsMp1nrb3Isi11NKYDrtg==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.8.0.tgz", + "integrity": "sha512-4Bjrnrw4hOfUoxYM/6xprwFqEL1/uh/N+RX2IxCq12l+uxcxCSNeEbEd0t/JopCkvOKR5KXFiiq5COe4TI6ohw==", "bundleDependencies": [ "@lando/nginx", "lodash", "semver" ], + "license": "MIT", "dependencies": { - "@lando/nginx": "^1.4.4", + "@lando/nginx": "^1.5.0", "lodash": "^4.17.21", "semver": "^7.6.3" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@lando/php/node_modules/@lando/nginx": { - "version": "1.4.4", + "version": "1.5.0", "bundleDependencies": [ "lodash" ], "inBundle": true, - "license": "GPL-3.0", + "license": "MIT", "dependencies": { "lodash": "^4.17.21" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@lando/php/node_modules/@lando/nginx/node_modules/lodash": { @@ -1525,13 +1547,13 @@ } }, "node_modules/@lando/postgres": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/@lando/postgres/-/postgres-1.4.4.tgz", - "integrity": "sha512-L+j+F2I0HdY7vUK3p4jb+wHJqVtrq3Fz0/B5A/4lo19H30Yzb5UZZvo8M1MFZDcbP5VoGNX11ZLuP1OesX8YbA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lando/postgres/-/postgres-1.5.0.tgz", + "integrity": "sha512-HAa/vundcz66uss87CCDmTbGO49MAg83k2HFLTDmWeuR+oeibwfwNwmbxPfcKxsZbAwvTMPcsovCCVF9WroYtA==", "bundleDependencies": [ "lodash" ], - "license": "GPL-3.0", + "license": "MIT", "dependencies": { "lodash": "^4.17.21" }, diff --git a/package.json b/package.json index 9ea0f14..75ea540 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "wordpress" ], "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" }, "lando": {}, "main": "index.js", @@ -43,11 +43,12 @@ "test": "npm run lint && npm run test:unit" }, "dependencies": { - "@lando/mariadb": "^1.6.3", + "@lando/mariadb": "^1.7.0", "@lando/mssql": "^1.4.3", - "@lando/mysql": "^1.4.4", - "@lando/php": "^1.7.1", - "@lando/postgres": "^1.4.4", + "@lando/mysql": "^1.6.0", + "@lando/nginx": "^1.5.0", + "@lando/php": "^1.8.0", + "@lando/postgres": "^1.5.0", "lodash": "^4.17.21" }, "devDependencies": { From 8243d840fa3a97c86864e19281d8ab21469e1a25 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Tue, 2 Sep 2025 14:12:07 -0400 Subject: [PATCH 2/2] chxlnx --- docs/config.md | 8 ++++---- docs/tooling.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/config.md b/docs/config.md index 74f74a0..b4a06d6 100644 --- a/docs/config.md +++ b/docs/config.md @@ -29,7 +29,7 @@ Note that if the above config options are not enough, all Lando recipes can be f ## Choosing a php version -You can set `php` to any version that is available in our [php service](https://docs.lando.dev/plugins/php). However, you should consult the [WordPress requirements](https://wordpress.org/about/requirements/) to make sure that version is actually supported by WordPress itself. +You can set `php` to any version that is available in our [php service](https://docs.lando.dev/plugins/php/index.html). However, you should consult the [WordPress requirements](https://wordpress.org/about/requirements/) to make sure that version is actually supported by WordPress itself. The [recipe config](https://docs.lando.dev/landofile/recipes.html#config) to set the WordPress recipe to use `php` version `7.1` is shown below: @@ -50,7 +50,7 @@ config: ## Choosing a web server -By default, this recipe will be served by the default version of our [apache](https://docs.lando.dev/plugins/apache) service but you can also switch this to use [`nginx`](https://docs.lando.dev/plugins/nginx). We *highly recommend* you check out both the [apache](https://docs.lando.dev/plugins/apache) and [nginx](https://docs.lando.dev/plugins/nginx) services before you change the default `via`. +By default, this recipe will be served by the default version of our [apache](https://docs.lando.dev/plugins/apache/index.html) service but you can also switch this to use [`nginx`](https://docs.lando.dev/plugins/nginx/index.html). We *highly recommend* you check out both the [apache](https://docs.lando.dev/plugins/apache/index.html) and [nginx](https://docs.lando.dev/plugins/nginx/index.html) services before you change the default `via`. #### With Apache (default) @@ -70,9 +70,9 @@ config: ## Choosing a database backend -By default, this recipe will use the default version of our [mysql](https://docs.lando.dev/plugins/mysql) service as the database backend but you can also switch this to use [`mariadb`](https://docs.lando.dev/plugins/mariadb) or ['postgres'](https://docs.lando.dev/plugins/postgres) instead. Note that you can also specify a version *as long as it is a version available for use with lando* for either `mysql`, `mariadb` or `postgres`. +By default, this recipe will use the default version of our [mysql](https://docs.lando.dev/plugins/mysql/index.html) service as the database backend but you can also switch this to use [`mariadb`](https://docs.lando.dev/plugins/mariadb/index.html) or ['postgres'](https://docs.lando.dev/plugins/postgres/index.html) instead. Note that you can also specify a version *as long as it is a version available for use with lando* for either `mysql`, `mariadb` or `postgres`. -If you are unsure about how to configure the `database`, we *highly recommend* you check out the [mysql](https://docs.lando.dev/plugins/mysql), [mariadb](https://docs.lando.dev/plugins/mariadb)and ['postgres'](https://docs.lando.dev/plugins/postgres) services before you change the default. +If you are unsure about how to configure the `database`, we *highly recommend* you check out the [mysql](https://docs.lando.dev/plugins/mysql/index.html), [mariadb](https://docs.lando.dev/plugins/mariadb/index.html)and ['postgres'](https://docs.lando.dev/plugins/postgres/index.html) services before you change the default. Also note that like the configuration of the `php` version you should consult the [WordPress requirements](https://wordpress.org/about/requirements/) to make sure the `database` and `version` you select is actually supported by WordPress itself. diff --git a/docs/tooling.md b/docs/tooling.md index 73fdacf..7f7cc47 100644 --- a/docs/tooling.md +++ b/docs/tooling.md @@ -38,7 +38,7 @@ You can also run `lando` from inside your app directory for a complete list of c ## Using xdebug -This is just a passthrough option to the [xdebug setting](https://docs.lando.dev/plugins/php/config.html#using-xdebug) that exists on all our [php services](https://docs.lando.dev/plugins/php). The `tl;dr` is `xdebug: true` enables and configures the php xdebug extension and `xdebug: false` disables it. +This is just a passthrough option to the [xdebug setting](https://docs.lando.dev/plugins/php/config.html#using-xdebug) that exists on all our [php services](https://docs.lando.dev/plugins/php/index.html). The `tl;dr` is `xdebug: true` enables and configures the php xdebug extension and `xdebug: false` disables it. ```yaml recipe: wordpress @@ -46,7 +46,7 @@ config: xdebug: true|false ``` -However, for more information we recommend you consult the [php service documentation](https://docs.lando.dev/plugins/php). +However, for more information we recommend you consult the [php service documentation](https://docs.lando.dev/plugins/php/index.html). ## Importing Your Database