@lando/drupal 1.11.0 → 1.13.0

package/.lando.yml

@@ -5,7 +5,7 @@ proxy:
 services:
   cli:
     api: 4
-    image: node:18
+    image: node:20
     command: sleep infinity
     ports:
       - 5173:5173/http
@@ -22,4 +22,3 @@ tooling:
   vitepress:
     service: cli
     cmd: npx vitepress
-    

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.13.0 - [September 17, 2025](https://github.com/lando/drupal/releases/tag/v1.13.0)
+
+* Added default config values to the `.lando.yml` file after init.
+* 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/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)
+* Updated default `nginx` version to `1.29`
+* Updated MySQL config for better MySQL 8.4 support.
+
+## v1.12.0 - [January 16, 2025](https://github.com/lando/drupal/releases/tag/v1.12.0)
+
+* Updated globally installed Drush to `v8.5.0`.
+* Added docs for setting up [Drupal CMS](https://drupal.org/docs/drupal-cms).
+* Updated to [@lando/php@1.7.1](https://github.com/lando/php/releases/tag/v1.7.1).
+* Updated to [@lando/mysql@1.5.0](https://github.com/lando/mysql/releases/tag/v1.5.0).
+
 ## v1.11.0 - [December 9, 2024](https://github.com/lando/drupal/releases/tag/v1.11.0)
 
 * Optimized for `midcore`

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Lando Alliance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -3,7 +3,7 @@
 This is the _official_ [Lando](https://lando.dev) plugin for [Drupal](https://www.drupal.org/). When installed it...
 
 * Allows users to run `drupal` cms
-* Allows users to configure `php` version from `5.3` all the way to `8.3`
+* 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`)
@@ -15,11 +15,15 @@ Of course, once a user is running their Drupal project with Lando they can take
 
 ## Basic Usage
 
-Add a `drupal9` recipe to your Landofile
+Add a `drupal11` recipe to your Landofile
 
 ```yaml
-name: Drupal 9
-recipe: drupal9
+name: Drupal 11
+recipe: drupal11
+config:
+  php: 8.3
+  via: apache:2.4
+  database: mysql:8.0
 ```
 
 For more info you should check out the [docs](https://docs.lando.dev/drupal):
@@ -35,14 +39,11 @@ For more info you should check out the [docs](https://docs.lando.dev/drupal):
 ```bash
 # With npm
 npm install @lando/drupal
-
-# With yarn
-yarn add @lando/drupal
 ```
 
 ## Issues, Questions and Support
 
-If you have a question or would like some community support we recommend you [join us on Slack](https://launchpass.com/devwithlando). Note that this is the Slack community for [Lando](https://lando.dev) but we are more than happy to help with this module as well!
+If you have a question or would like some community support we recommend you [join us on Slack](https://launchpass.com/devwithlando).
 
 If you'd like to report a bug or submit a feature request then please [use the issue queue](https://github.com/lando/drupal/issues/new/choose) in this repo.
 
@@ -53,40 +54,27 @@ We try to log all changes big and small in both [THE CHANGELOG](https://github.c
 
 ## Development
 
-* Requires [Node 14+](https://nodejs.org/dist/latest-v14.x/)
-* Prefers [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
-
-```bash
-git clone https://github.com/lando/drupal.git && cd drupal
-yarn install
-```
-
-If you don't want to install Node 18 or Yarn for whatever reason you can install [Lando](https://docs.lando.dev/basics/installation.html) and use that:
+* Requires [Node 20+](https://nodejs.org/dist/latest-v20.x/)
 
 ```bash
 git clone https://github.com/lando/drupal.git && cd drupal
-# Install deps and get node
-lando start
-
-# Run commands
-lando node
-lando yarn
+npm install
 ```
 
 ## Testing
 
 ```bash
 # Lint the code
-yarn lint
+npm run lint
 
 # Run unit tests
-yarn test
+npm test
 ```
 
 ## Releasing
 
 ```bash
-yarn release
+npm release
 ```
 
 
@@ -94,6 +82,7 @@ yarn release
 
 * [@pirog](https://github.com/pirog)
 * [@reynoldsalec](https://github.com/reynoldsalec)
+* [@AaronFeledy](https://github.com/AaronFeledy)
 
 ## Contributors
 
@@ -105,4 +94,8 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Other Resources
 
-* [Important advice](https://www.youtube.com/watch?v=WA4iX5D9Z64)
+* [LICENSE](/LICENSE)
+* [TERMS OF USE](https://docs.lando.dev/terms)
+* [PRIVACY POLICY](https://docs.lando.dev/privacy)
+* [CODE OF CONDUCT](https://docs.lando.dev/coc)
+

package/builders/_drupaly.js

@@ -9,7 +9,7 @@ const utils = require('../lib/utils.js');
 const warnings = require('../lib/warnings.js');
 
 // "Constants"
-const DRUSH8 = '8.4.8';
+const DRUSH8 = '8.5.0';
 const DRUSH7 = '7.4.0';
 
 // Tooling defaults
@@ -147,7 +147,7 @@ const getServices = options => ({
   },
   database: {
     config: getServiceConfig(options, ['database']),
-    authentication: 'mysql_native_password',
+    authentication: '',
     type: `drupal-${options.database}`,
     portforward: true,
     creds: {
@@ -162,13 +162,11 @@ const getServices = options => ({
  * Helper to get the phar build command
  */
 const getDbTooling = database => {
-  // Make sure we strip out any version number
-  const db = database.split(':')[0];
-  const ver = database.split(':')[1];
+  const [db, ver] = database.split(':');
   // Choose wisely
   if (db === 'mysql') {
     return {mysql: mysqlCli};
-  } else if (db === 'mariadb' && ver < 10.4) {
+  } else if (db === 'mariadb' && semver.lt(semver.coerce(ver), '10.4.0')) {
     // Use mysql command for MariaDB 10.3.x and below
     return {mysql: mysqlCli};
   } else if (db === 'mariadb') {
@@ -176,10 +174,12 @@ const getDbTooling = database => {
   } else if (db === 'postgres') {
     return {psql: postgresCli};
   } else if (db === 'mongo') {
-    return {mongo: {
-      service: 'database',
-      description: 'Drop into the mongo shell',
-    }};
+    return {
+      mongo: {
+        service: 'database',
+        description: 'Drop into the mongo shell',
+      },
+    };
   }
 };
 
@@ -228,15 +228,17 @@ module.exports = {
     composer: {},
     confSrc: __dirname,
     config: {},
-    database: 'mysql',
+    database: 'mysql:5.7',
     defaultFiles: {
       php: 'php.ini',
     },
     php: '7.2',
-    tooling: {drush: {
-      service: 'appserver',
-    }},
-    via: 'apache',
+    tooling: {
+      drush: {
+        service: 'appserver',
+      },
+    },
+    via: 'apache:2.4',
     webroot: '.',
     xdebug: false,
     proxy: {},
@@ -244,6 +246,7 @@ module.exports = {
   builder: (parent, config) => class LandoDrupal extends parent {
     constructor(id, options = {}) {
       options = _.merge({}, config, options);
+
       // Set the default drush version if we don't have it
       if (!_.has(options, 'drush')) options.drush = (options.php === '5.3') ? DRUSH7 : DRUSH8;
 
@@ -264,12 +267,16 @@ module.exports = {
       }
 
       // Set legacy envars
-      options.services = _.merge({}, options.services, {appserver: {overrides: {
-        environment: {
-          SIMPLETEST_BASE_URL: (options.via === 'nginx') ? 'https://appserver_nginx' : 'https://appserver',
-          SIMPLETEST_DB: `mysql://${options.recipe}:${options.recipe}@database/${options.recipe}`,
+      options.services = _.merge({}, options.services, {
+        appserver: {
+          overrides: {
+            environment: {
+              SIMPLETEST_BASE_URL: (options.via === 'nginx') ? 'https://appserver_nginx' : 'https://appserver',
+              SIMPLETEST_DB: `mysql://${options.recipe}:${options.recipe}@database/${options.recipe}`,
+            },
+          },
         },
-      }}});
+      });
 
       // Switch the proxy service if needed
       if (!_.has(options, 'proxyService')) {

package/builders/drupal-mariadb.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.js');
+const LandoMariadb = require('@lando/mariadb/builders/mariadb.js');
 
 // Builder
 module.exports = {

package/builders/drupal-mssql.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMssql = require('./../node_modules/@lando/mssql/builders/mssql.js');
+const LandoMssql = require('@lando/mssql/builders/mssql.js');
 
 // Builder
 module.exports = {

package/builders/drupal-mysql.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
+const semver = require('semver');
+const LandoMysql = require('@lando/mysql/builders/mysql.js');
 
 // Builder
 module.exports = {
@@ -9,6 +10,11 @@ module.exports = {
   parent: '_service',
   builder: parent => class DrupalMysql extends LandoMysql.builder(parent, LandoMysql.config) {
     constructor(id, options = {}) {
+      // Versions of MySQL prior to 8.4 use mysql_native_password authentication
+      if (!options.authentication && semver.lt(semver.coerce(options.version), '8.4.0')) {
+        options.authentication = 'mysql_native_password';
+      }
+
       super(id, options, {services: _.set({}, options.name)});
     }
   },

package/builders/drupal-nginx.js

@@ -8,7 +8,7 @@ module.exports = {
   name: 'drupal-nginx',
   parent: '_webserver',
   config: {
-    version: '1.25',
+    version: '1.29',
   },
   builder: (parent, config) => class DrupalNginx extends PhpNginx.builder(parent, PhpNginx.config) {
     constructor(id, options = {}) {

package/builders/drupal-php.js

@@ -1,30 +1,29 @@
 'use strict';
 
-const _ = require('lodash');
-const fs = require('fs');
-const path = require('path');
-const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
-const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
+const LandoPhp = require('@lando/php/builders/php.js');
 
-const loadScripts = options => {
-  const lando = _.get(options, '_app._lando');
-  // Move the script to the confDir and make executable.
-  if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) {
-    const confDir = path.join(lando.config.userConfRoot, 'scripts');
-    const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir);
-    lando.utils.makeExecutable(fs.readdirSync(dest), dest);
-    lando.log.debug('automoved scripts from %s to %s and set to mode 755',
-      path.join(landoPhpPath, 'scripts'), confDir);
-  }
-};
-
-// Builder
+/**
+ * Drupal PHP builder class that extends Lando PHP builder.
+ * Uses the bundled version of @lando/php plugin instead of user's version.
+ *
+ * @module drupal-php
+ */
 module.exports = {
   name: 'drupal-php',
   parent: '_appserver',
+  /**
+   * Builder function that returns the DrupalPhp class
+   * @param {Object} parent - Parent builder class
+   * @return {Class} DrupalPhp class extending LandoPhp builder
+   */
   builder: parent => class DrupalPhp extends LandoPhp.builder(parent, LandoPhp.config) {
+    /**
+     * Create a new DrupalPhp instance
+     * @param {string} id - Service id
+     * @param {Object} options - Service options
+     * @param {Object} factory - App factory instance
+     */
     constructor(id, options = {}, factory) {
-      loadScripts(options);
       options.nginxServiceType = 'drupal-nginx';
       super(id, options, factory);
     }

package/builders/drupal-postgres.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgres.js');
+const LandoPostgres = require('@lando/postgres/builders/postgres.js');
 
 // Builder
 module.exports = {

package/builders/drupal10.js

@@ -27,7 +27,7 @@ module.exports = {
       // Set drush to false
       options.drush = false;
 
-      // Let's make sure we set appropripate default versions for things
+      // Let's make sure we set appropriate default versions for things
       // See: https://www.drupal.org/docs/system-requirements/database-server-requirements
       if (_.get(options, 'database') === 'mysql') {
         options.database = 'mysql:5.7';

package/builders/drupal6.js

@@ -14,8 +14,9 @@ module.exports = {
     confSrc: path.resolve(__dirname, '..', 'config', 'drupal6'),
     defaultFiles: {},
     php: '5.6',
-    // @NOTE: below seems to be the last known drush version that let you do
-    // drush si -y succesfully
+    // @NOTE: below seems to be the last known Drupal 6 compatible
+    // drush version that let you do drush si -y successfully.
+    // @see https://github.com/drush-ops/drush/issues/218#issuecomment-2580619527
     drush: '8.4.5',
   },
   builder: (parent, config) => class LandoDrupal6 extends parent {

package/builders/drupal9.js

@@ -27,7 +27,7 @@ module.exports = {
       // Set drush to false
       options.drush = false;
 
-      // Let's make sure we set appropripate default versions for things
+      // Let's make sure we set appropriate default versions for things
       // See: https://www.drupal.org/docs/9/how-drupal-9-is-made-and-what-is-included/environment-requirements-of-drupal-9
       if (_.get(options, 'database') === 'mysql') {
         options.database = 'mysql:5.7';

package/config/drupal11/mysql8.cnf

@@ -3,104 +3,56 @@
 #
 # LANDODRUPALMYSQL8CNF
 
-[mysqld]
-#
-# * Basic Settings
-#
-# Data is stored in a volume on the db container /sql
-default-storage-engine = innodb
+[server]
+# Character sets and SQL mode
+character_set_server = utf8mb4
+collation_server = utf8mb4_general_ci
+sql_mode = ONLY_FULL_GROUP_BY,TRADITIONAL
 
-#
-# * Fine Tuning
-#
-key_buffer_size    = 384M
-max_allowed_packet  = 32M
-thread_stack    = 400K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-table_open_cache = 512
-sort_buffer_size = 2M
+# Basic Tuning.
+max_connections = 500
+connect_timeout = 5
+wait_timeout = 28800
+max_allowed_packet = 32M
+thread_cache_size = 128
+sort_buffer_size = 4M
+bulk_insert_buffer_size = 16M
+tmp_table_size = 32M
+max_heap_table_size = 32M
+
+# MyISAM.
+myisam_recover_options = BACKUP
+key_buffer_size = 128M
+table_open_cache = 400
+myisam_sort_buffer_size = 512M
+concurrent_insert = 2
 read_buffer_size = 2M
+read_rnd_buffer_size = 1M
 
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /src/.lando/log/mysql.log
-#general_log             = 1
-#
-# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
-#
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id    = 1
-#log_bin      = /src/.lando/log/mysql-bin.log
-expire_logs_days = 10
-max_binlog_size = 101M
-#binlog_do_db   = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = C:\mysql\data/
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 384M
-#innodb_additional_mem_pool_size = 20M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 100M
-#innodb_log_buffer_size = 8M
-innodb_flush_log_at_trx_commit = 0
-#innodb_lock_wait_timeout = 50
+# InnoDB.
+default_storage_engine = InnoDB
 innodb_buffer_pool_size = 384M
-innodb_log_buffer_size  = 4M
-innodb_file_per_table   = 1
-innodb_open_files       = 256
-innodb_io_capacity      = 512
-innodb_flush_method     = O_DIRECT
-innodb_thread_concurrency = 8
+innodb_log_buffer_size = 8M
+innodb_file_per_table = 1
+innodb_open_files = 400
+innodb_io_capacity = 512
+innodb_thread_concurrency = 0
+innodb_read_io_threads = 16
+innodb_write_io_threads = 16
+innodb_flush_log_at_trx_commit = 0
+innodb_max_dirty_pages_pct = 70
+innodb_adaptive_hash_index = 0
+innodb_use_native_aio = 0
 innodb_lock_wait_timeout = 127
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
+
+[mysqld-8.4]
+mysql_native_password=ON
+
+[client]
+default_character_set=utf8mb4
+max_allowed_packet = 64M
 
 [mysqldump]
 quick
 quote-names
-max_allowed_packet  = 32M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completion
-
-[isamchk]
-key_buffer_size = 384M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
+no-tablespaces

package/inits/drupal10.js

@@ -5,4 +5,9 @@
  */
 module.exports = {
   name: 'drupal10',
+  defaults: {
+    'php': '8.1',
+    'drush': '^11',
+    'composer_version': '2-latest',
+  },
 };

package/inits/drupal11.js

@@ -5,4 +5,11 @@
  */
 module.exports = {
   name: 'drupal11',
+  defaults: {
+    'php': '8.3',
+    'via': 'apache:2.4',
+    'database': 'mysql:8.0',
+    'composer_version': '2-latest',
+    'drush': '^13',
+  },
 };

package/inits/drupal6.js

@@ -5,4 +5,8 @@
  */
 module.exports = {
   name: 'drupal6',
+  defaults: {
+    'php': '5.6',
+    'drush': '8.4.5',
+  },
 };

package/inits/drupal7.js

@@ -5,4 +5,7 @@
  */
 module.exports = {
   name: 'drupal7',
+  defaults: {
+    'php': '7.4',
+  },
 };

package/inits/drupal8.js

@@ -5,4 +5,7 @@
  */
 module.exports = {
   name: 'drupal8',
+  defaults: {
+    'php': '7.3',
+  },
 };

package/inits/drupal9.js

@@ -5,4 +5,9 @@
  */
 module.exports = {
   name: 'drupal9',
+  defaults: {
+    'php': '8.0',
+    'drush': '^11',
+    'composer_version': '2-latest',
+  },
 };

package/netlify.toml

@@ -10,7 +10,14 @@
 [[context.deploy-preview.plugins]]
   package = "netlify-plugin-checklinks"
   [context.deploy-preview.plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "x.com", "twitter.com", "/v/" ]
+    todoPatterns = [
+      "load",
+      "CHANGELOG.html",
+      "x.com",
+      "twitter.com",
+      "https://www.drupal.org",
+      "/v/"
+    ]
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 
@@ -40,6 +47,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-drupal.netlify.app"
+  to = "https://lando-drupal.netlify.app/plugins/drupal/index.html"
+  status = 301
+  force = true
+[[redirects]]
+  from = "https://lando-drupal.netlify.app/*"
+  to = "https://docs.lando.dev/:splat"
+  status = 301
 [[redirects]]
   from = "/"
   to = "/plugins/drupal"

package/node_modules/@lando/mariadb/.lando.yml

@@ -5,7 +5,7 @@ proxy:
 services:
   cli:
     api: 4
-    image: node:18
+    image: node:20
     command: sleep infinity
     ports:
       - 5173:5173/http