@lando/drupal 1.5.0 → 1.6.1

package/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-drupal-plugin
+name: docs.drupal
+proxy:
+  cli:
+    - docs.drupal.lndo.site:5173
 services:
-  node:
-    type: node:18
-    build:
-      - npm install
+  cli:
+    api: 4
+    image: node:18
+    command: sleep infinity
+    ports:
+      - 5173:5173/http
     scanner: false
-    ssl: false
-    sslExpose: false
+    user: node
+    build:
+      app: |
+        npm install
 tooling:
   node:
-    service: node
+    service: cli
   npm:
-    service: node
+    service: cli
+  vitepress:
+    service: cli
+    cmd: npx vitepress

package/.nyc_output/05fbb779-a04a-4104-9822-47624cf9f1f3.json

@@ -0,0 +1 @@
+{"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":19},"end":{"line":37,"column":1}},"9":{"start":{"line":39,"column":17},"end":{"line":50,"column":1}},"10":{"start":{"line":52,"column":20},"end":{"line":64,"column":1}},"11":{"start":{"line":69,"column":20},"end":{"line":69,"column":107}},"12":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"13":{"start":{"line":74,"column":0},"end":{"line":94,"column":2}},"14":{"start":{"line":76,"column":2},"end":{"line":76,"column":30}},"15":{"start":{"line":77,"column":2},"end":{"line":77,"column":31}},"16":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"17":{"start":{"line":80,"column":4},"end":{"line":80,"column":29}},"18":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"19":{"start":{"line":83,"column":4},"end":{"line":83,"column":29}},"20":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"21":{"start":{"line":85,"column":4},"end":{"line":85,"column":33}},"22":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"23":{"start":{"line":87,"column":4},"end":{"line":87,"column":31}},"24":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"25":{"start":{"line":89,"column":4},"end":{"line":92,"column":7}},"26":{"start":{"line":99,"column":0},"end":{"line":104,"column":2}},"27":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"28":{"start":{"line":110,"column":0},"end":{"line":122,"column":2}},"29":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"30":{"start":{"line":112,"column":25},"end":{"line":112,"column":41}},"31":{"start":{"line":114,"column":22},"end":{"line":119,"column":3}},"32":{"start":{"line":121,"column":2},"end":{"line":121,"column":63}},"33":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"34":{"start":{"line":127,"column":0},"end":{"line":139,"column":2}},"35":{"start":{"line":128,"column":17},"end":{"line":128,"column":19}},"36":{"start":{"line":129,"column":2},"end":{"line":137,"column":5}},"37":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"38":{"start":{"line":131,"column":6},"end":{"line":131,"column":42}},"39":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"40":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"41":{"start":{"line":134,"column":8},"end":{"line":134,"column":79}},"42":{"start":{"line":138,"column":2},"end":{"line":138,"column":16}},"43":{"start":{"line":144,"column":0},"end":{"line":153,"column":3}},"44":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":69,"column":20},"end":{"line":69,"column":21}},"loc":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"line":69},"3":{"name":"(anonymous_3)","decl":{"start":{"line":74,"column":23},"end":{"line":74,"column":24}},"loc":{"start":{"line":74,"column":35},"end":{"line":94,"column":1}},"line":74},"4":{"name":"(anonymous_4)","decl":{"start":{"line":99,"column":19},"end":{"line":99,"column":20}},"loc":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"line":99},"5":{"name":"(anonymous_5)","decl":{"start":{"line":110,"column":18},"end":{"line":110,"column":19}},"loc":{"start":{"line":110,"column":54},"end":{"line":122,"column":1}},"line":110},"6":{"name":"(anonymous_6)","decl":{"start":{"line":121,"column":28},"end":{"line":121,"column":29}},"loc":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"line":121},"7":{"name":"(anonymous_7)","decl":{"start":{"line":127,"column":27},"end":{"line":127,"column":28}},"loc":{"start":{"line":127,"column":77},"end":{"line":139,"column":1}},"line":127},"8":{"name":"(anonymous_8)","decl":{"start":{"line":129,"column":19},"end":{"line":129,"column":20}},"loc":{"start":{"line":129,"column":27},"end":{"line":137,"column":3}},"line":129},"9":{"name":"(anonymous_9)","decl":{"start":{"line":144,"column":22},"end":{"line":144,"column":23}},"loc":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}},"line":144}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},{"start":{"line":79,"column":2},"end":{"line":93,"column":3}}],"line":79},"3":{"loc":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},{"start":{"line":81,"column":9},"end":{"line":93,"column":3}}],"line":81},"4":{"loc":{"start":{"line":81,"column":13},"end":{"line":81,"column":43}},"type":"binary-expr","locations":[{"start":{"line":81,"column":13},"end":{"line":81,"column":29}},{"start":{"line":81,"column":33},"end":{"line":81,"column":43}}],"line":81},"5":{"loc":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},{"start":{"line":84,"column":9},"end":{"line":93,"column":3}}],"line":84},"6":{"loc":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},{"start":{"line":86,"column":9},"end":{"line":93,"column":3}}],"line":86},"7":{"loc":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},{"start":{"line":88,"column":9},"end":{"line":93,"column":3}}],"line":88},"8":{"loc":{"start":{"line":110,"column":35},"end":{"line":110,"column":49}},"type":"default-arg","locations":[{"start":{"line":110,"column":43},"end":{"line":110,"column":49}}],"line":110},"9":{"loc":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"type":"if","locations":[{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},{"start":{"line":112,"column":2},"end":{"line":112,"column":41}}],"line":112},"10":{"loc":{"start":{"line":127,"column":37},"end":{"line":127,"column":72}},"type":"default-arg","locations":[{"start":{"line":127,"column":45},"end":{"line":127,"column":72}}],"line":127},"11":{"loc":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},{"start":{"line":130,"column":4},"end":{"line":136,"column":5}}],"line":130},"12":{"loc":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},{"start":{"line":132,"column":11},"end":{"line":136,"column":5}}],"line":132},"13":{"loc":{"start":{"line":132,"column":15},"end":{"line":132,"column":90}},"type":"binary-expr","locations":[{"start":{"line":132,"column":15},"end":{"line":132,"column":48}},{"start":{"line":132,"column":52},"end":{"line":132,"column":90}}],"line":132},"14":{"loc":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"type":"if","locations":[{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},{"start":{"line":133,"column":6},"end":{"line":135,"column":7}}],"line":133}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0,0],"7":[0,0],"8":[0],"9":[0,0],"10":[0],"11":[0,0],"12":[0,0],"13":[0,0],"14":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}

package/.nyc_output/processinfo/05fbb779-a04a-4104-9822-47624cf9f1f3.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2252,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1725558387252,"ppid":2251,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/05fbb779-a04a-4104-9822-47624cf9f1f3.json","externalId":"","uuid":"05fbb779-a04a-4104-9822-47624cf9f1f3","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}

package/.nyc_output/processinfo/ad7cc7e8-6f19-410d-a744-65f566b7b0bc.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2263,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1725558387695,"ppid":2252,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/ad7cc7e8-6f19-410d-a744-65f566b7b0bc.json","externalId":"","uuid":"ad7cc7e8-6f19-410d-a744-65f566b7b0bc","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"85d65275-0a95-4a60-a626-06f63d95d46f":{"parent":null,"children":[]},"f0add8e0-d60a-460b-9cfd-21beb5545a6e":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["85d65275-0a95-4a60-a626-06f63d95d46f"],"/home/runner/work/drupal/drupal/lib/warnings.js":["85d65275-0a95-4a60-a626-06f63d95d46f"]},"externalIds":{}}
+{"processes":{"05fbb779-a04a-4104-9822-47624cf9f1f3":{"parent":null,"children":[]},"ad7cc7e8-6f19-410d-a744-65f566b7b0bc":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["05fbb779-a04a-4104-9822-47624cf9f1f3"],"/home/runner/work/drupal/drupal/lib/warnings.js":["05fbb779-a04a-4104-9822-47624cf9f1f3"]},"externalIds":{}}

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.1 - [September 5, 2024](https://github.com/lando/drupal/releases/tag/v1.6.1)
+
+## Bug Fixes
+
+* Fixed bug causing default `proxy` settings to be clobbered by user specified ones
+
+## Internal
+
+* Updated DevOps to use new `lando exec`
+* Updated `ubuntu` test runners to `24.04`
+
+## v1.6.0 - [May 27, 2024](https://github.com/lando/drupal/releases/tag/v1.6.0)
+
+* Use mysql command for MariaDB 10.3.x and below
+
 ## v1.5.0 - [May 8, 2024](https://github.com/lando/drupal/releases/tag/v1.5.0)
 
 * Updated mariadb plugin and added tooling support for the mariadb executable. [#51](https://github.com/lando/mariadb/issues/51

package/builders/_drupaly.js

@@ -163,15 +163,19 @@ const getServices = options => ({
  */
 const getDbTooling = database => {
   // Make sure we strip out any version number
-  database = database.split(':')[0];
+  const db = database.split(':')[0];
+  const ver = database.split(':')[1];
   // Choose wisely
-  if (database === 'mysql') {
+  if (db === 'mysql') {
     return {mysql: mysqlCli};
-  } else if (database === 'mariadb') {
+  } 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 (database === 'postgres') {
+  } else if (db === 'postgres') {
     return {psql: postgresCli};
-  } else if (database === 'mongo') {
+  } else if (db === 'mongo') {
     return {mongo: {
       service: 'database',
       description: 'Drop into the mongo shell',
@@ -179,6 +183,18 @@ const getDbTooling = database => {
   }
 };
 
+/*
+ * Helper to get proxy config
+ */
+const getProxy = (options, proxyService = 'appserver') => {
+  // get any intial proxy stuff for proxyService
+  const urls = _.get(options, `_app.config.proxy.${proxyService}`, []);
+  // add
+  urls.push(`${options.app}.${options._app._config.domain}`);
+  // return
+  return {[proxyService]: _.uniq(_.compact(urls))};
+};
+
 /*
  * Helper to get service config
  */
@@ -201,7 +217,6 @@ const getServiceConfig = (options, types = ['php', 'server', 'vhosts']) => {
  */
 const getTooling = options => _.merge({}, toolingDefaults, getDbTooling(options.database));
 
-
 /*
  * Build Drupal 7
  */
@@ -256,17 +271,17 @@ module.exports = {
         },
       }}});
 
-      // Rebase on top of any default config we might already have
-      options.defaultFiles = _.merge({}, getConfigDefaults(_.cloneDeep(options)), options.defaultFiles);
-      options.services = _.merge({}, getServices(options), options.services);
-      options.tooling = _.merge({}, getTooling(options), options.tooling);
-
-      // Switch the proxy if needed
+      // Switch the proxy service if needed
       if (!_.has(options, 'proxyService')) {
         if (_.startsWith(options.via, 'nginx')) options.proxyService = 'appserver_nginx';
         else if (_.startsWith(options.via, 'apache')) options.proxyService = 'appserver';
       }
-      options.proxy = _.set(options.proxy, options.proxyService, [`${options.app}.${options._app._config.domain}`]);
+
+      // Rebase on top of any default config we might already have
+      options.defaultFiles = _.merge({}, getConfigDefaults(_.cloneDeep(options)), options.defaultFiles);
+      options.proxy = _.merge({}, getProxy(options, options.proxyService), options.proxy);
+      options.services = _.merge({}, getServices(options), options.services);
+      options.tooling = _.merge({}, getTooling(options), options.tooling);
 
       // Send downstream
       super(id, _.merge({}, config, options));

package/coverage/index.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/44</span>
+                <span class='fraction'>0/47</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/23</span>
+                <span class='fraction'>0/27</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/36</span>
+                <span class='fraction'>0/39</span>
             </div>
         
             
@@ -84,13 +84,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
 	</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="42" class="abs low">0/42</td>
+	<td data-value="45" class="abs low">0/45</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="23" class="abs low">0/23</td>
+	<td data-value="27" class="abs low">0/27</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="10" class="abs low">0/10</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="35" class="abs low">0/35</td>
+	<td data-value="38" class="abs low">0/38</td>
 	</tr>
 
 <tr>
@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-05-08T18:30:59.565Z
+                at 2024-09-05T17:46:27.939Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/utils.js.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/42</span>
+                <span class='fraction'>0/45</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/23</span>
+                <span class='fraction'>0/27</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/35</span>
+                <span class='fraction'>0/38</span>
             </div>
         
             
@@ -212,7 +212,11 @@
 <a name='L147'></a><a href='#L147'>147</a>
 <a name='L148'></a><a href='#L148'>148</a>
 <a name='L149'></a><a href='#L149'>149</a>
-<a name='L150'></a><a href='#L150'>150</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</a>
+<a name='L152'></a><a href='#L152'>152</a>
+<a name='L153'></a><a href='#L153'>153</a>
+<a name='L154'></a><a href='#L154'>154</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -288,10 +292,14 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -436,15 +444,19 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
  */
 <span class="cstat-no" title="statement not covered" >exports.getDbTooling = <span class="fstat-no" title="function not covered" >da</span>tabase =&gt; {</span>
   // Make sure we strip out any version number
-<span class="cstat-no" title="statement not covered" >  database = database.split(':')[0];</span>
+<span class="cstat-no" title="statement not covered" >  db = database.split(':')[0];</span>
+<span class="cstat-no" title="statement not covered" >  ver = database.split(':')[1];</span>
   // Choose wisely
-<span class="cstat-no" title="statement not covered" >  if (database === 'mysql') {</span>
+<span class="cstat-no" title="statement not covered" >  if (db === 'mysql') {</span>
+<span class="cstat-no" title="statement not covered" >    return {mysql: mysqlCli};</span>
+  } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb' &amp;&amp; ver &lt; 10.4) {</span>
+    // Use mysql command for MariaDB 10.3.x and below
 <span class="cstat-no" title="statement not covered" >    return {mysql: mysqlCli};</span>
-  } else <span class="cstat-no" title="statement not covered" >if (database === 'mariadb') {</span>
+  } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb') {</span>
 <span class="cstat-no" title="statement not covered" >    return {mariadb: mariadbCli};</span>
-  } else <span class="cstat-no" title="statement not covered" >if (database === 'postgres') {</span>
+  } else <span class="cstat-no" title="statement not covered" >if (db === 'postgres') {</span>
 <span class="cstat-no" title="statement not covered" >    return {psql: postgresCli};</span>
-  } else <span class="cstat-no" title="statement not covered" >if (database === 'mongo') {</span>
+  } else <span class="cstat-no" title="statement not covered" >if (db === 'mongo') {</span>
 <span class="cstat-no" title="statement not covered" >    return {mongo: {</span>
       service: 'database',
       description: 'Drop into the mongo shell',
@@ -517,7 +529,7 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-05-08T18:30:59.565Z
+                at 2024-09-05T17:46:27.939Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/warnings.js.html

@@ -109,7 +109,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-05-08T18:30:59.565Z
+                at 2024-09-05T17:46:27.939Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/lib/utils.js

@@ -73,15 +73,19 @@ const getDrushUrl = version => `https://github.com/drush-ops/drush/releases/down
  */
 exports.getDbTooling = database => {
   // Make sure we strip out any version number
-  database = database.split(':')[0];
+  db = database.split(':')[0];
+  ver = database.split(':')[1];
   // Choose wisely
-  if (database === 'mysql') {
+  if (db === 'mysql') {
     return {mysql: mysqlCli};
-  } else if (database === 'mariadb') {
+  } 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 (database === 'postgres') {
+  } else if (db === 'postgres') {
     return {psql: postgresCli};
-  } else if (database === 'mongo') {
+  } else if (db === 'mongo') {
     return {mongo: {
       service: 'database',
       description: 'Drop into the mongo shell',

package/netlify.toml

@@ -45,5 +45,11 @@
   from = "/plugins/drupal/*"
   to = "/:splat"
   status = 200
-
-
+[[redirects]]
+  from = "/legacy-versions.html"
+  to = "/plugins/drupal/legacy/drupal-8.html"
+  status = 302
+[[redirects]]
+  from = "/plugins/drupal/drupal-multisite.html"
+  to = "/plugins/drupal/guides/drupal-multisite.html"
+  status = 302

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/drupal",
   "description": "A Lando plugin that provides a tight integration with Drupal.",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/drupal",
@@ -76,9 +76,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-ePpVmVPfmbd3ugvoUVqX87eKKTj9nKD9cO9PFYZFh/pgAL8KHjdyMYn4qCz17cxA3CxgoEEffW9NKsimflQ0pg==",
-    "shasum": "67909777573e1b385ed854d9127b4546c2e91b5a",
-    "filename": "lando-drupal-1.5.0.tgz",
-    "unpackedSize": 12386687
+    "integrity": "sha512-bhzOh+6AXbnsTaHC8Hhhvc13BnfxQtSYJN/8jtAtcUeWrJqyWZBAcnOBU5x/lBzvA1RG56OYdZKCuWHKLraOmA==",
+    "shasum": "4d7ad800e753f6481cc819b63795ca3a04e30269",
+    "filename": "lando-drupal-1.6.1.tgz",
+    "unpackedSize": 12389533
   }
 }

package/.nyc_output/85d65275-0a95-4a60-a626-06f63d95d46f.json

@@ -1 +0,0 @@
-{"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":19},"end":{"line":37,"column":1}},"9":{"start":{"line":39,"column":17},"end":{"line":50,"column":1}},"10":{"start":{"line":52,"column":20},"end":{"line":64,"column":1}},"11":{"start":{"line":69,"column":20},"end":{"line":69,"column":107}},"12":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"13":{"start":{"line":74,"column":0},"end":{"line":90,"column":2}},"14":{"start":{"line":76,"column":2},"end":{"line":76,"column":36}},"15":{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},"16":{"start":{"line":79,"column":4},"end":{"line":79,"column":29}},"17":{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},"18":{"start":{"line":81,"column":4},"end":{"line":81,"column":33}},"19":{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},"20":{"start":{"line":83,"column":4},"end":{"line":83,"column":31}},"21":{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},"22":{"start":{"line":85,"column":4},"end":{"line":88,"column":7}},"23":{"start":{"line":95,"column":0},"end":{"line":100,"column":2}},"24":{"start":{"line":95,"column":40},"end":{"line":100,"column":1}},"25":{"start":{"line":106,"column":0},"end":{"line":118,"column":2}},"26":{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},"27":{"start":{"line":108,"column":25},"end":{"line":108,"column":41}},"28":{"start":{"line":110,"column":22},"end":{"line":115,"column":3}},"29":{"start":{"line":117,"column":2},"end":{"line":117,"column":63}},"30":{"start":{"line":117,"column":35},"end":{"line":117,"column":48}},"31":{"start":{"line":123,"column":0},"end":{"line":135,"column":2}},"32":{"start":{"line":124,"column":17},"end":{"line":124,"column":19}},"33":{"start":{"line":125,"column":2},"end":{"line":133,"column":5}},"34":{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},"35":{"start":{"line":127,"column":6},"end":{"line":127,"column":42}},"36":{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},"37":{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},"38":{"start":{"line":130,"column":8},"end":{"line":130,"column":79}},"39":{"start":{"line":134,"column":2},"end":{"line":134,"column":16}},"40":{"start":{"line":140,"column":0},"end":{"line":149,"column":3}},"41":{"start":{"line":140,"column":39},"end":{"line":149,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":69,"column":20},"end":{"line":69,"column":21}},"loc":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"line":69},"3":{"name":"(anonymous_3)","decl":{"start":{"line":74,"column":23},"end":{"line":74,"column":24}},"loc":{"start":{"line":74,"column":35},"end":{"line":90,"column":1}},"line":74},"4":{"name":"(anonymous_4)","decl":{"start":{"line":95,"column":19},"end":{"line":95,"column":20}},"loc":{"start":{"line":95,"column":40},"end":{"line":100,"column":1}},"line":95},"5":{"name":"(anonymous_5)","decl":{"start":{"line":106,"column":18},"end":{"line":106,"column":19}},"loc":{"start":{"line":106,"column":54},"end":{"line":118,"column":1}},"line":106},"6":{"name":"(anonymous_6)","decl":{"start":{"line":117,"column":28},"end":{"line":117,"column":29}},"loc":{"start":{"line":117,"column":35},"end":{"line":117,"column":48}},"line":117},"7":{"name":"(anonymous_7)","decl":{"start":{"line":123,"column":27},"end":{"line":123,"column":28}},"loc":{"start":{"line":123,"column":77},"end":{"line":135,"column":1}},"line":123},"8":{"name":"(anonymous_8)","decl":{"start":{"line":125,"column":19},"end":{"line":125,"column":20}},"loc":{"start":{"line":125,"column":27},"end":{"line":133,"column":3}},"line":125},"9":{"name":"(anonymous_9)","decl":{"start":{"line":140,"column":22},"end":{"line":140,"column":23}},"loc":{"start":{"line":140,"column":39},"end":{"line":149,"column":2}},"line":140}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},{"start":{"line":78,"column":2},"end":{"line":89,"column":3}}],"line":78},"3":{"loc":{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},{"start":{"line":80,"column":9},"end":{"line":89,"column":3}}],"line":80},"4":{"loc":{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},{"start":{"line":82,"column":9},"end":{"line":89,"column":3}}],"line":82},"5":{"loc":{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},{"start":{"line":84,"column":9},"end":{"line":89,"column":3}}],"line":84},"6":{"loc":{"start":{"line":106,"column":35},"end":{"line":106,"column":49}},"type":"default-arg","locations":[{"start":{"line":106,"column":43},"end":{"line":106,"column":49}}],"line":106},"7":{"loc":{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},"type":"if","locations":[{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},{"start":{"line":108,"column":2},"end":{"line":108,"column":41}}],"line":108},"8":{"loc":{"start":{"line":123,"column":37},"end":{"line":123,"column":72}},"type":"default-arg","locations":[{"start":{"line":123,"column":45},"end":{"line":123,"column":72}}],"line":123},"9":{"loc":{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},"type":"if","locations":[{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},{"start":{"line":126,"column":4},"end":{"line":132,"column":5}}],"line":126},"10":{"loc":{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},"type":"if","locations":[{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},{"start":{"line":128,"column":11},"end":{"line":132,"column":5}}],"line":128},"11":{"loc":{"start":{"line":128,"column":15},"end":{"line":128,"column":90}},"type":"binary-expr","locations":[{"start":{"line":128,"column":15},"end":{"line":128,"column":48}},{"start":{"line":128,"column":52},"end":{"line":128,"column":90}}],"line":128},"12":{"loc":{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},"type":"if","locations":[{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},{"start":{"line":129,"column":6},"end":{"line":131,"column":7}}],"line":129}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0],"7":[0,0],"8":[0],"9":[0,0],"10":[0,0],"11":[0,0],"12":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}

package/.nyc_output/processinfo/85d65275-0a95-4a60-a626-06f63d95d46f.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1853,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1715193058931,"ppid":1852,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/85d65275-0a95-4a60-a626-06f63d95d46f.json","externalId":"","uuid":"85d65275-0a95-4a60-a626-06f63d95d46f","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}

package/.nyc_output/processinfo/f0add8e0-d60a-460b-9cfd-21beb5545a6e.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1864,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1715193059364,"ppid":1853,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/f0add8e0-d60a-460b-9cfd-21beb5545a6e.json","externalId":"","uuid":"f0add8e0-d60a-460b-9cfd-21beb5545a6e","files":[]}