@lando/laravel 1.3.0 → 1.3.1

package/.nyc_output/processinfo/16689bc2-5921-4d0c-98df-ecf13f5ae64f.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1858,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709221105911,"ppid":1857,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/16689bc2-5921-4d0c-98df-ecf13f5ae64f.json","externalId":"","uuid":"16689bc2-5921-4d0c-98df-ecf13f5ae64f","files":[]}

package/.nyc_output/processinfo/7f7842bc-1fdd-4513-9d7b-b6d734676407.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1869,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709221106073,"ppid":1858,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/7f7842bc-1fdd-4513-9d7b-b6d734676407.json","externalId":"","uuid":"7f7842bc-1fdd-4513-9d7b-b6d734676407","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"1a51e868-2a90-4899-a80f-a2d22e294afd":{"parent":null,"children":[]},"cfe77227-42d4-47f8-a2fc-53f0e5a4a741":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"16689bc2-5921-4d0c-98df-ecf13f5ae64f":{"parent":null,"children":[]},"7f7842bc-1fdd-4513-9d7b-b6d734676407":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+
+## v1.3.1 - [February 29, 2024](https://github.com/lando/laravel/releases/tag/v1.3.1)
+
+### Fixes
+
+* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overriden downstream
+
 ## v1.3.0 - [February 27, 2024](https://github.com/lando/laravel/releases/tag/v1.3.0)
 
 ### New Features
@@ -25,7 +32,7 @@
 * Fixed issue with missing proxy URLs.
 
 ## v1.0.0 - [December 7, 2023](https://github.com/lando/laravel/releases/tag/v1.0.0)
-  
+
 * Dialed fully for `lando update`
 
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/laravel/releases/tag/v0.9.0)

package/builders/laravel.js

@@ -26,6 +26,13 @@ const getCache = cache => {
   }
 };
 
+/*
+ * Helper to get database type
+ */
+const getDatabaseType = options => {
+  return _.get(options, '_app.config.services.database.type', options.database) ?? 'mysql';
+};
+
 // Tooling defaults
 const toolingDefaults = {
   'composer': {
@@ -105,11 +112,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 === 'laravel-mysql' || database === 'mysql' || database === 'mariadb') {
     if (version === '8.') {
       options.defaultFiles.database = 'mysql8.cnf';
     } else {
@@ -243,6 +251,7 @@ module.exports = {
       options.defaultFiles = _.merge({}, getConfigDefaults(_.cloneDeep(options)), options.defaultFiles);
       options.services = _.merge({}, getServices(options), options.services);
       options.tooling = _.merge({}, getTooling(options), options.tooling);
+
       // Add in artisan tooling
       // @NOTE: does artisan always live one up of the webroot?
       options.tooling.artisan = {

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-27T20:37:45.313Z
+                at 2024-02-29T15:38:26.270Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/laravel",
   "description": "A Lando plugin that provides a tight integration with Laravel.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/laravel",
@@ -77,9 +77,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-XF0Yr+z1v/7BExDKdgqwlp5cRdoVRGtytoEBX7oJOGz6DUQQcmpWCO7Gykk5yyuL0OF4vUqNVpOqTmNfBJBUqQ==",
-    "shasum": "b77c3ca1ccac053091473d6f3dd7c15d5da5c183",
-    "filename": "lando-laravel-1.3.0.tgz",
-    "unpackedSize": 15124492
+    "integrity": "sha512-/vH+X8mJblSoiyzX27LBm/vRvMfp+6MNjWt6i2q7nNAyVb3hD78j/8H/cA53m7obbvR3EBygIaCsxge1TTvVvw==",
+    "shasum": "04a8f3d4d383460c3e6e8979d47427514f232265",
+    "filename": "lando-laravel-1.3.1.tgz",
+    "unpackedSize": 15125031
   }
 }

package/.nyc_output/processinfo/1a51e868-2a90-4899-a80f-a2d22e294afd.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1903,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709066265077,"ppid":1892,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/1a51e868-2a90-4899-a80f-a2d22e294afd.json","externalId":"","uuid":"1a51e868-2a90-4899-a80f-a2d22e294afd","files":[]}

package/.nyc_output/processinfo/cfe77227-42d4-47f8-a2fc-53f0e5a4a741.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1892,"argv":["/opt/hostedtoolcache/node/18.19.1/x64/bin/node","/home/runner/work/laravel/laravel/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/laravel/laravel","time":1709066264910,"ppid":1891,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/cfe77227-42d4-47f8-a2fc-53f0e5a4a741.json","externalId":"","uuid":"cfe77227-42d4-47f8-a2fc-53f0e5a4a741","files":[]}