@lando/wordpress 1.2.0 → 1.2.1

package/.nyc_output/processinfo/09cdc376-a10c-4b83-b8ec-41c8d0338871.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1930,"argv":["/opt/hostedtoolcache/node/18.19.1/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":1709613420261,"ppid":1929,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/09cdc376-a10c-4b83-b8ec-41c8d0338871.json","externalId":"","uuid":"09cdc376-a10c-4b83-b8ec-41c8d0338871","files":[]}

package/.nyc_output/processinfo/de2bdb45-7c07-4db9-968d-bd97cb07b03e.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1941,"argv":["/opt/hostedtoolcache/node/18.19.1/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":1709613420413,"ppid":1930,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/de2bdb45-7c07-4db9-968d-bd97cb07b03e.json","externalId":"","uuid":"de2bdb45-7c07-4db9-968d-bd97cb07b03e","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"60bcd701-7f12-46d8-9181-6dc35120f897":{"parent":null,"children":[]},"c429492a-cdef-42c0-a2d6-3a207362156d":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"09cdc376-a10c-4b83-b8ec-41c8d0338871":{"parent":null,"children":[]},"de2bdb45-7c07-4db9-968d-bd97cb07b03e":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.1 - [March 4, 2024](https://github.com/lando/wordpress/releases/tag/v1.2.1)
+
+### Fixes
+
+* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overriden downstream
+
 ## v1.2.0 - [February 22, 2024](https://github.com/lando/wordpress/releases/tag/v1.2.0)
 
 ### New Features

package/builders/wordpress.js

@@ -65,6 +65,13 @@ const getServiceConfig = (options, types = ['php', 'server', 'vhosts']) => {
   return config;
 };
 
+/*
+ * Helper to get database type
+ */
+const getDatabaseType = options => {
+  return _.get(options, '_app.config.services.database.type', options.database) ?? 'mysql';
+};
+
 // Tooling defaults
 const toolingDefaults = {
   'composer': {
@@ -163,11 +170,12 @@ const getConfigDefaults = options => {
   // Get the viaconf
   if (_.startsWith(options.via, 'nginx')) options.defaultFiles.vhosts = 'default.conf.tpl';
 
-  // Get the default db conf
-  const dbConfig = _.get(options, 'database', 'mysql');
+  // attempt to discover the database that is actually being used
+  // @NOTE: this will look to see if database is overridden
+  const dbConfig = getDatabaseType(options);
   const database = _.first(dbConfig.split(':'));
   const version = _.last(dbConfig.split(':')).substring(0, 2);
-  if (database === 'mysql' || database === 'mariadb') {
+  if (database === 'wordpress-mysql' || database === 'mysql' || database === 'mariadb') {
     if (version === '8.') {
       options.defaultFiles.database = 'mysql8.cnf';
     } else {

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-02-22T15:48:01.020Z
+                at 2024-03-05T04:37:00.784Z
             </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.2.0",
+  "version": "1.2.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/wordpress",
@@ -75,9 +75,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-wcyCtgj6G9aERYc8vfzcHsDvTZ/4400tenKgjspnsLnrXPIGBpAg/8kNxevTsr8Ym975lCaghYmx9R0NKQPdAA==",
-    "shasum": "4fd39d6a0bdfea50072b1a4dbc27b9e2edbad9f6",
-    "filename": "lando-wordpress-1.2.0.tgz",
-    "unpackedSize": 13749634
+    "integrity": "sha512-uF5JvI5fSGbFlT7+YNpW3c9LFRreT1r8qvMgwyy8UpRiFc5YCJZa71aCqWea8wXYka/oXOH5qYlUyL4OGGIE0g==",
+    "shasum": "26dc2a1e04c72768096092f99ae4482b180f19e7",
+    "filename": "lando-wordpress-1.2.1.tgz",
+    "unpackedSize": 13750173
   }
 }

package/.nyc_output/processinfo/60bcd701-7f12-46d8-9181-6dc35120f897.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1935,"argv":["/opt/hostedtoolcache/node/18.19.1/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":1708616880664,"ppid":1934,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/60bcd701-7f12-46d8-9181-6dc35120f897.json","externalId":"","uuid":"60bcd701-7f12-46d8-9181-6dc35120f897","files":[]}

package/.nyc_output/processinfo/c429492a-cdef-42c0-a2d6-3a207362156d.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1946,"argv":["/opt/hostedtoolcache/node/18.19.1/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":1708616880821,"ppid":1935,"coverageFilename":"/home/runner/work/wordpress/wordpress/.nyc_output/c429492a-cdef-42c0-a2d6-3a207362156d.json","externalId":"","uuid":"c429492a-cdef-42c0-a2d6-3a207362156d","files":[]}