@lando/drupal 1.10.1 → 1.11.0

package/.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "node": true,
-    "mocha": true
+    "mocha": true,
+    "es2021": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
@@ -9,15 +10,27 @@
     "ecmaVersion": 8,
     "requireConfigFile": false
   },
-  "extends": "google",
+  "extends": [
+    "eslint:recommended",
+    "google"
+  ],
   "rules": {
     "arrow-parens": ["error",
       "as-needed"
     ],
     "max-len": ["error", {
-      "code": 120,
+      "code": 140,
       "ignoreComments": true
     }],
+    "no-empty": ["error", {
+      "allowEmptyCatch": true
+    }],
+    "no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
+
     "require-jsdoc": ["error", {
       "require": {
         "FunctionDeclaration": true,

package/.node-version

@@ -1 +1 @@
-18
+20

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.11.0 - [December 9, 2024](https://github.com/lando/drupal/releases/tag/v1.11.0)
+
+* Optimized for `midcore`
+* Updated to [@lando/mariadb@1.6.3](https://github.com/lando/mariadb/releases/tag/v1.6.3).
+* Updated to [@lando/mssql@1.4.3](https://github.com/lando/mssql/releases/tag/v1.4.3).
+* Updated to [@lando/mysql@1.4.4](https://github.com/lando/mysql/releases/tag/v1.4.4).
+* Updated to [@lando/php@1.6.3](https://github.com/lando/php/releases/tag/v1.6.3).
+* Updated to [@lando/postgres@1.4.4](https://github.com/lando/postgres/releases/tag/v1.4.4).
+
+## v1.10.2 - [December 6, 2024](https://github.com/lando/drupal/releases/tag/v1.10.2)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
 ## v1.10.1 - [December 4, 2024](https://github.com/lando/drupal/releases/tag/v1.10.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).

package/builders/_drupaly.js

@@ -285,6 +285,6 @@ module.exports = {
 
       // Send downstream
       super(id, _.merge({}, config, options));
-    };
+    }
   },
 };

package/builders/drupal-mariadb.js

@@ -7,9 +7,9 @@ const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.
 module.exports = {
   name: 'drupal-mariadb',
   parent: '_service',
-  builder: (parent, config) => class DrupalMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
+  builder: parent => class DrupalMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/builders/drupal-mssql.js

@@ -7,9 +7,9 @@ const LandoMssql = require('./../node_modules/@lando/mssql/builders/mssql.js');
 module.exports = {
   name: 'drupal-mssql',
   parent: '_service',
-  builder: (parent, config) => class DrupalMssql extends LandoMssql.builder(parent, LandoMssql.config) {
+  builder: parent => class DrupalMssql extends LandoMssql.builder(parent, LandoMssql.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/builders/drupal-mysql.js

@@ -7,9 +7,9 @@ const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
 module.exports = {
   name: 'drupal-mysql',
   parent: '_service',
-  builder: (parent, config) => class DrupalMysql extends LandoMysql.builder(parent, LandoMysql.config) {
+  builder: parent => class DrupalMysql extends LandoMysql.builder(parent, LandoMysql.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/builders/drupal-nginx.js

@@ -13,6 +13,6 @@ module.exports = {
   builder: (parent, config) => class DrupalNginx extends PhpNginx.builder(parent, PhpNginx.config) {
     constructor(id, options = {}) {
       super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/builders/drupal-php.js

@@ -22,11 +22,11 @@ const loadScripts = options => {
 module.exports = {
   name: 'drupal-php',
   parent: '_appserver',
-  builder: (parent, config) => class DrupalPhp extends LandoPhp.builder(parent, LandoPhp.config) {
+  builder: parent => class DrupalPhp extends LandoPhp.builder(parent, LandoPhp.config) {
     constructor(id, options = {}, factory) {
       loadScripts(options);
       options.nginxServiceType = 'drupal-nginx';
       super(id, options, factory);
-    };
+    }
   },
 };

package/builders/drupal-postgres.js

@@ -7,9 +7,9 @@ const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgr
 module.exports = {
   name: 'drupal-postgres',
   parent: '_service',
-  builder: (parent, config) => class DrupalPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
+  builder: parent => class DrupalPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/builders/drupal10.js

@@ -38,6 +38,6 @@ module.exports = {
       }
       // Send it downstream
       super(id, options);
-    };
+    }
   },
 };

package/builders/drupal11.js

@@ -38,6 +38,6 @@ module.exports = {
       }
       // Send it downstream
       super(id, options);
-    };
+    }
   },
 };

package/builders/drupal6.js

@@ -21,6 +21,6 @@ module.exports = {
   builder: (parent, config) => class LandoDrupal6 extends parent {
     constructor(id, options = {}) {
       super(id, _.merge({}, config, options));
-    };
+    }
   },
 };

package/builders/drupal7.js

@@ -18,6 +18,6 @@ module.exports = {
   builder: (parent, config) => class LandoDrupal7 extends parent {
     constructor(id, options = {}) {
       super(id, _.merge({}, config, options));
-    };
+    }
   },
 };

package/builders/drupal8.js

@@ -32,6 +32,6 @@ module.exports = {
         }};
       }
       super(id, options);
-    };
+    }
   },
 };

package/builders/drupal9.js

@@ -39,6 +39,6 @@ module.exports = {
 
       // Send it downstream
       super(id, options);
-    };
+    }
   },
 };

package/index.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = lando => {};
+module.exports = () => {};

package/lib/utils.js

@@ -22,77 +22,11 @@ exports.getPhar = (url, src, dest, check = 'true') => {
   return _.map(pharInstall, cmd => cmd.join(' ')).join(' && ');
 };
 
-// MariaDB cli commands
-const mariadbCli = {
-  service: ':host',
-  description: 'Drops into a MariaDB shell on a database service',
-  cmd: 'mariadb -uroot',
-  options: {
-    host: {
-      description: 'The database service to use',
-      default: 'database',
-      alias: ['h'],
-    },
-  },
-};
-// MySQL cli commands
-const mysqlCli = {
-  service: ':host',
-  description: 'Drops into a MySQL shell on a database service',
-  cmd: 'mysql -uroot',
-  options: {
-    host: {
-      description: 'The database service to use',
-      default: 'database',
-      alias: ['h'],
-    },
-  },
-};
-// Postgres cli commands
-const postgresCli = {
-  service: ':host',
-  description: 'Drops into a psql shell on a database service',
-  cmd: 'psql -Upostgres',
-  user: 'root',
-  options: {
-    host: {
-      description: 'The database service to use',
-      default: 'database',
-      alias: ['h'],
-    },
-  },
-};
-
 /*
  * Helper to get DRUSH phar url
  */
 const getDrushUrl = version => `https://github.com/drush-ops/drush/releases/download/${version}/drush.phar`;
 
-/*
- * Helper to get the phar build command
- */
-exports.getDbTooling = database => {
-  // Make sure we strip out any version number
-  db = database.split(':')[0];
-  ver = database.split(':')[1];
-  // Choose wisely
-  if (db === 'mysql') {
-    return {mysql: mysqlCli};
-  } else if (db === 'mariadb' && ver < 10.4) {
-    // Use mysql command for MariaDB 10.3.x and below
-    return {mysql: mysqlCli};
-  } else if (db === 'mariadb') {
-    return {mariadb: mariadbCli};
-  } else if (db === 'postgres') {
-    return {psql: postgresCli};
-  } else if (db === 'mongo') {
-    return {mongo: {
-      service: 'database',
-      description: 'Drop into the mongo shell',
-    }};
-  }
-};
-
 /*
  * Helper to get the phar build command
  */

package/netlify.toml

@@ -14,8 +14,6 @@
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 
-
-
 # Sets our asset optimization
 [build.processing.css]
   bundle = true
@@ -41,8 +39,6 @@
   [plugins.inputs.audits]
     output_path = "reports/lighthouse.html"
 
-
-
 # We need this so preview environments and the base site look ok on their own
 [[redirects]]
   from = "/"

package/node_modules/@lando/mariadb/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.3 - [December 6, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.3)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
+## v1.6.2 - [December 4, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.2)
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
+
 ## v1.6.1 - [November 4, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.18](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.18).

package/node_modules/@lando/mariadb/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/mariadb",
   "description": "A Lando plugin that provides a tight integration with mariadb.",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/mariadb",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^1.0.0-beta.3",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.18",
+    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -62,9 +62,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-Pus/ZXVZPERcY2HiM3DXKo34VzSQJeAs7U3pFd1gZqh4HuMV3ofsEHr5jH4+44FW34fKNZ56wZbfus7eYKu5wQ==",
-    "shasum": "05b53572baeb25ca9dbe075a031be2c37f5f5809",
-    "filename": "lando-mariadb-1.6.1.tgz",
-    "unpackedSize": 1471861
+    "integrity": "sha512-lRNFeEZkrIJV03mrt2s2DUWEwEI/E760tYyzb3OfSfkVtJLbUOe9vz7rKr06BzxdY/zSWHt4DAIMix9Qq0dXgg==",
+    "shasum": "0728729f8f452a75b9430492284186b4a394bf68",
+    "filename": "lando-mariadb-1.6.3.tgz",
+    "unpackedSize": 1472258
   }
 }

package/node_modules/@lando/mssql/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.4.3 - [December 6, 2024](https://github.com/lando/mssql/releases/tag/v1.4.3)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
+## v1.4.2 - [December 4, 2024](https://github.com/lando/mssql/releases/tag/v1.4.2)
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
+
 ## v1.4.1 - [November 4, 2024](https://github.com/lando/mssql/releases/tag/v1.4.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.18](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.18).

package/node_modules/@lando/mssql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/mssql",
   "description": "A Lando plugin that provides a tight integration with MSSQL.",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/mssql",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^0.6.5",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.18",
+    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -62,9 +62,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-7aFeTgRjipmzHetHgmAroPUoMXa66jVNrqkIvx+5Cl0cg29tzPyOtGlK5WAQCAJiREcbikvYsfkN1leX/lAJqw==",
-    "shasum": "c05c600245b99d5c607e14405fbc69c7a22e8b56",
-    "filename": "lando-mssql-1.4.1.tgz",
-    "unpackedSize": 1468678
+    "integrity": "sha512-ngNDTiHoauyfAHNCA341ZXDENHPObzddhZ4NuKfLr2r3B8Zwl/CgB8Mo5eqcOlXD944PgE4NUond9S2C28uHkQ==",
+    "shasum": "c32d1fecc940e9244e297d044375947cabbb3761",
+    "filename": "lando-mssql-1.4.3.tgz",
+    "unpackedSize": 1469071
   }
 }

package/node_modules/@lando/mysql/.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "node": true,
-    "mocha": true
+    "mocha": true,
+    "es2021": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
@@ -9,15 +10,27 @@
     "ecmaVersion": 8,
     "requireConfigFile": false
   },
-  "extends": "google",
+  "extends": [
+    "eslint:recommended",
+    "google"
+  ],
   "rules": {
     "arrow-parens": ["error",
       "as-needed"
     ],
     "max-len": ["error", {
-      "code": 120,
+      "code": 140,
       "ignoreComments": true
     }],
+    "no-empty": ["error", {
+      "allowEmptyCatch": true
+    }],
+    "no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
+
     "require-jsdoc": ["error", {
       "require": {
         "FunctionDeclaration": true,

package/node_modules/@lando/mysql/.node-version

@@ -1 +1 @@
-18
+20

package/node_modules/@lando/mysql/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.4.4 - [December 7, 2024](https://github.com/lando/mysql/releases/tag/v1.4.4)
+
+* Optimized for `midcore`
+
+## v1.4.3 - [December 6, 2024](https://github.com/lando/mysql/releases/tag/v1.4.3)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
+## v1.4.2 - [December 4, 2024](https://github.com/lando/mysql/releases/tag/v1.4.2)
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
+
 ## v1.4.1 - [November 4, 2024](https://github.com/lando/mysql/releases/tag/v1.4.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.18](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.18).

package/node_modules/@lando/mysql/builders/mysql.js

@@ -64,9 +64,8 @@ module.exports = {
         ],
       };
 
-
         // Send it downstream
       super(id, options, {services: _.set({}, options.name, mysql)});
-    };
+    }
   },
 };

package/node_modules/@lando/mysql/index.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = lando => {};
+module.exports = () => {};

package/node_modules/@lando/mysql/netlify.toml

@@ -14,8 +14,6 @@
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 
-
-
 # Sets our asset optimization
 [build.processing.css]
   bundle = true
@@ -41,8 +39,6 @@
   [plugins.inputs.audits]
     output_path = "reports/lighthouse.html"
 
-
-
 # We need this so preview environments and the base site look ok on their own
 [[redirects]]
   from = "/"

package/node_modules/@lando/mysql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/mysql",
   "description": "A Lando plugin that provides a tight integration with MySQL.",
-  "version": "1.4.1",
+  "version": "1.4.4",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/mysql",
@@ -43,13 +43,12 @@
     "test": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@lando/mysql": "^1.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^1.0.0-beta.3",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.18",
+    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -60,13 +59,12 @@
     "vitepress": "^1.3.4"
   },
   "bundledDependencies": [
-    "@lando/mysql",
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-dvCwjk0xeUbjjwEKRj6nDUgr0i+NC3tcoRYpB4W9lt4D8SRZZ9DlRu2+OQE3yROpmj6kR6DWaGIuFg7ibXKygg==",
-    "shasum": "7f3aa8adc084d9d0884e5335046bdad00eb12c1c",
-    "filename": "lando-mysql-1.4.1.tgz",
-    "unpackedSize": 2939692
+    "integrity": "sha512-b2k9E1ArWb3VNdPxxfEiEB05XCO7HtoTkf0O44E7SlPeYUfTTsBP6bPk60SJ6SJFA3V5KHl9TAPfXIhVemONtg==",
+    "shasum": "2db77cc0602dc1a32f67205a058837954250ec60",
+    "filename": "lando-mysql-1.4.4.tgz",
+    "unpackedSize": 1471119
   }
 }

package/node_modules/@lando/php/.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "node": true,
-    "mocha": true
+    "mocha": true,
+    "es2021": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
@@ -9,15 +10,27 @@
     "ecmaVersion": 8,
     "requireConfigFile": false
   },
-  "extends": "google",
+  "extends": [
+    "eslint:recommended",
+    "google"
+  ],
   "rules": {
     "arrow-parens": ["error",
       "as-needed"
     ],
     "max-len": ["error", {
-      "code": 120,
+      "code": 140,
       "ignoreComments": true
     }],
+    "no-empty": ["error", {
+      "allowEmptyCatch": true
+    }],
+    "no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": false
+    }],
+
     "require-jsdoc": ["error", {
       "require": {
         "FunctionDeclaration": true,

package/node_modules/@lando/php/.node-version

@@ -1 +1 @@
-18
+20

package/node_modules/@lando/php/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)
+
+* Optimized for `midcore`
+
+## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
+
+* Updated the version index.md to get Docuverse page to build correctly.
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
+* Updated GitHub Actions to build images only on changes to images or workflows.
+
 ## v1.6.1 - [November 4, 2024](https://github.com/lando/php/releases/tag/v1.6.1)
 
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.18](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.18).

package/node_modules/@lando/php/builders/php-nginx.js

@@ -7,9 +7,9 @@ const LandoNginx = require('@lando/nginx/builders/nginx.js');
 module.exports = {
   name: 'php-nginx',
   parent: '_webserver',
-  builder: (parent, config) => class PhpNginx extends LandoNginx.builder(parent, LandoNginx.config) {
+  builder: parent => class PhpNginx extends LandoNginx.builder(parent, LandoNginx.config) {
     constructor(id, options = {}) {
       super(id, options, {services: _.set({}, options.name)});
-    };
+    }
   },
 };

package/node_modules/@lando/php/builders/php.js

@@ -127,7 +127,7 @@ module.exports = {
       pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
     sources: [],
-    suffix: '4',
+    suffix: '5',
     ssl: false,
     via: 'apache',
     volumes: ['/usr/local/bin'],
@@ -215,6 +215,6 @@ module.exports = {
       // Add in the php service and push downstream
       options.sources.push({services: _.set({}, options.name, php)});
       super(id, options, ..._.flatten(options.sources));
-    };
+    }
   },
 };

package/node_modules/@lando/php/images/5.6-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-apache-4 .
+# docker build -t devwithlando/php:5.6-apache-5 .
 
 FROM php:5.6-apache-stretch
 

package/node_modules/@lando/php/images/5.6-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-fpm-4 .
+# docker build -t devwithlando/php:5.6-fpm-5 .
 
 FROM php:5.6-fpm-stretch