@lando/wordpress 1.4.0 → 1.4.1

package/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-wordpress-plugin
+name: docs.wordpress
+proxy:
+  cli:
+    - docs.wordpress.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/0e18f58f-cfbf-4b4c-be35-e69b76cbb5b2.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2120,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/wordpress/wordpress/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/wordpress/wordpress","time":1725636560209,"ppid":2109,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/0e18f58f-cfbf-4b4c-be35-e69b76cbb5b2.json","externalId":"","uuid":"0e18f58f-cfbf-4b4c-be35-e69b76cbb5b2","files":[]}

package/.nyc_output/processinfo/65d20d75-7644-4e68-906d-6357eab3b219.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2109,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/wordpress/wordpress/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/wordpress/wordpress","time":1725636560048,"ppid":2108,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/65d20d75-7644-4e68-906d-6357eab3b219.json","externalId":"","uuid":"65d20d75-7644-4e68-906d-6357eab3b219","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"0298b2c4-77fd-4b4a-83d3-e81717e44301":{"parent":null,"children":[]},"4778d34a-15d5-4032-993f-a2c190116380":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"0e18f58f-cfbf-4b4c-be35-e69b76cbb5b2":{"parent":null,"children":[]},"65d20d75-7644-4e68-906d-6357eab3b219":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.4.1 - [September 6, 2024](https://github.com/lando/wordpress/releases/tag/v1.4.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.4.0 - [May 27, 2024](https://github.com/lando/wordpress/releases/tag/v1.4.0)
 
 * Updated mariadb plugin [#51](https://github.com/lando/mariadb/issues/51)

package/builders/wordpress.js

@@ -48,6 +48,18 @@ const getServices = options => ({
   },
 });
 
+/*
+ * 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
  */
@@ -249,19 +261,19 @@ module.exports = {
         '/usr/local/bin/wp',
         getWpStatusCheck(options.version),
       ));
-      // 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
       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}`]);
 
-      // Downstream
+      // 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, options);
     };

package/coverage/index.html

@@ -86,7 +86,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:24:17.446Z
+                at 2024-09-06T15:29:20.422Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/wordpress",
   "description": "A Lando plugin that provides a tight integration with WordPress.",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/wordpress",
@@ -75,9 +75,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-EZmZ3qN6NBItq62Q5+d3XyWi/aQwj4CoHR5pZ4gOT8Q1/ihQlM5dyTKrorFYyQLfd2mBDpAyoqVE07IugZz6kQ==",
-    "shasum": "9e5b97eb43e1613cc2a50caecabda86030c95bdf",
-    "filename": "lando-wordpress-1.4.0.tgz",
-    "unpackedSize": 13717578
+    "integrity": "sha512-gV4jlvh8EQb9vk5R34Mgw2025PeYFTby1eg3D8UvcrE1rozFftYhdnuy0NszYYAHL68vUurHErnA831dNIXZ2g==",
+    "shasum": "c8d8afe9ce1a6e60ba373c7df622ba7b903d6e6d",
+    "filename": "lando-wordpress-1.4.1.tgz",
+    "unpackedSize": 13718334
   }
 }

package/.nyc_output/processinfo/0298b2c4-77fd-4b4a-83d3-e81717e44301.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2014,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/wordpress/wordpress/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/wordpress/wordpress","time":1716837857253,"ppid":2003,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/0298b2c4-77fd-4b4a-83d3-e81717e44301.json","externalId":"","uuid":"0298b2c4-77fd-4b4a-83d3-e81717e44301","files":[]}

package/.nyc_output/processinfo/4778d34a-15d5-4032-993f-a2c190116380.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2003,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/wordpress/wordpress/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/wordpress/wordpress","time":1716837857098,"ppid":2002,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/4778d34a-15d5-4032-993f-a2c190116380.json","externalId":"","uuid":"4778d34a-15d5-4032-993f-a2c190116380","files":[]}