@lando/drupal 1.6.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/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":{"a429ea73-cd15-4ad9-a2ac-1365773339cf":{"parent":null,"children":[]},"d414c776-d2a1-41d8-8549-8b0524ed17c8":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"],"/home/runner/work/drupal/drupal/lib/warnings.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"]},"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,16 @@
 ## {{ 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

package/builders/_drupaly.js

@@ -183,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
  */
@@ -205,7 +217,6 @@ const getServiceConfig = (options, types = ['php', 'server', 'vhosts']) => {
  */
 const getTooling = options => _.merge({}, toolingDefaults, getDbTooling(options.database));
 
-
 /*
  * Build Drupal 7
  */
@@ -260,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

@@ -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-27T19:26:53.668Z
+                at 2024-09-05T17:46:27.939Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/utils.js.html

@@ -529,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-27T19:26:53.668Z
+                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-27T19:26:53.668Z
+                at 2024-09-05T17:46:27.939Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

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

package/.nyc_output/processinfo/a429ea73-cd15-4ad9-a2ac-1365773339cf.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2017,"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":1716838013031,"ppid":2016,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/a429ea73-cd15-4ad9-a2ac-1365773339cf.json","externalId":"","uuid":"a429ea73-cd15-4ad9-a2ac-1365773339cf","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}

package/.nyc_output/processinfo/d414c776-d2a1-41d8-8549-8b0524ed17c8.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2028,"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":1716838013477,"ppid":2017,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/d414c776-d2a1-41d8-8549-8b0524ed17c8.json","externalId":"","uuid":"d414c776-d2a1-41d8-8549-8b0524ed17c8","files":[]}