@lando/laravel 1.4.0 → 1.5.1

package/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-laravel-plugin
+name: docs.laravel
+proxy:
+  cli:
+    - docs.laravel.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/22d05f1e-97ef-418d-8dfd-0ac40989dbdb.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2136,"argv":["/opt/hostedtoolcache/node/18.20.4/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":1725639514768,"ppid":2135,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/22d05f1e-97ef-418d-8dfd-0ac40989dbdb.json","externalId":"","uuid":"22d05f1e-97ef-418d-8dfd-0ac40989dbdb","files":[]}

package/.nyc_output/processinfo/3bb7b6b1-725d-46ef-a48e-6941aeebf180.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2147,"argv":["/opt/hostedtoolcache/node/18.20.4/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":1725639514925,"ppid":2136,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/3bb7b6b1-725d-46ef-a48e-6941aeebf180.json","externalId":"","uuid":"3bb7b6b1-725d-46ef-a48e-6941aeebf180","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"23845f2a-0eaf-4d6a-8885-30cd0027c66d":{"parent":null,"children":[]},"982ccd0d-9f58-48c0-9727-8cdb91b6f87c":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"22d05f1e-97ef-418d-8dfd-0ac40989dbdb":{"parent":null,"children":[]},"3bb7b6b1-725d-46ef-a48e-6941aeebf180":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,12 +1,31 @@
+## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
+
+## v1.5.1 - [September 6, 2024](https://github.com/lando/laravel/releases/tag/v1.5.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.5.0 - [May 27, 2024](https://github.com/lando/laravel/releases/tag/v1.5.0)
+
+* Updated mariadb plugin [#51](https://github.com/lando/mariadb/issues/51)
+* Use mysql command for MariaDB 10.3.x and below
+* Cleaned up test comments
+
 ## v1.4.0 - [March 8, 2024](https://github.com/lando/laravel/releases/tag/v1.4.0)
-  * Updated to latest database services.
 
+* Updated to latest database services.
 
 ## 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
+* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overridden downstream
 
 ## v1.3.0 - [February 27, 2024](https://github.com/lando/laravel/releases/tag/v1.3.0)
 
@@ -49,8 +68,9 @@
 * Add compatibility for MySQL 8.x [lando/lando#1426](https://github.com/lando/lando/issues/1462)
 
 ## v0.7.0 - [December 12, 2022](https://github.com/lando/laravel/releases/tag/v0.7.0)
-  * Added bundle-dependencies to release process.
-  * Fixed bug in plugin dogfooding test.
+
+* Added bundle-dependencies to release process.
+* Fixed bug in plugin dogfooding test.
 
 ## v0.6.0 - [September 8, 2022](https://github.com/lando/laravel/releases/tag/v0.6.0)
 

package/README.md

@@ -40,6 +40,12 @@ If you'd like to report a bug or submit a feature request then please [use the i
 
 We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/laravel/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/laravel/releases).
 
+
+## Maintainers
+
+* [@pirog](https://github.com/pirog)
+* [@reynoldsalec](https://github.com/reynoldsalec)
+
 ## Contributors
 
 <a href="https://github.com/lando/laravel/graphs/contributors">

package/builders/laravel.js

@@ -78,7 +78,20 @@ const toolingDefaults = {
   },
 };
 
-// Default DB cli commands
+// MariaDB cli commands
+const mariadbCli = {
+  service: ':host',
+  description: 'Drops into a MariaDB shell on a database service',
+  cmd: 'mariadb -uroot',
+  options: {
+    host: {
+      description: 'The database service to use',
+      default: 'database',
+      alias: ['h'],
+    },
+  },
+};
+// MySQL cli commands
 const mysqlCli = {
   service: ':host',
   description: 'Drops into a MySQL shell on a database service',
@@ -91,6 +104,7 @@ const mysqlCli = {
     },
   },
 };
+// Postgres cli commands
 const postgresCli = {
   service: ':host',
   description: 'Drops into a psql shell on a database service',
@@ -171,13 +185,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 (_.includes(['mysql', 'mariadb'], database)) {
+  if (db === 'mysql') {
+    return {mysql: mysqlCli};
+  } else if (db === 'mariadb' && ver < 10.4) {
+    // Use mysql command for MariaDB 10.3.x and below
     return {mysql: mysqlCli};
-  } else if (database === 'postgres') {
+  } else if (db === 'mariadb') {
+    return {mariadb: mariadbCli};
+  } 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',
@@ -185,6 +205,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
  */
@@ -247,8 +279,15 @@ module.exports = {
         options.services.cache = getCache(options.cache);
       }
 
+      // 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';
+      }
+
       // 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);
 
@@ -259,13 +298,6 @@ module.exports = {
         cmd: `php /app/${options.webroot}/../artisan`,
       };
 
-      // 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}`]);
-
       // Send downstream
       super(id, _.merge({}, config, 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-03-11T17:56:04.302Z
+                at 2024-09-06T16:18:35.127Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/node_modules/@lando/mariadb/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.3.0 - [April 11, 2024](https://github.com/lando/mariadb/releases/tag/v1.3.0)
+
+* Updated available version of Mariadb to 11.3. [#53](https://github.com/lando/mariadb/pull/53)
+
+## v1.2.0 - [March 19, 2024](https://github.com/lando/mariadb/releases/tag/v1.2.0)
+
+* Updated available version of Mariadb. [#45](https://github.com/lando/mariadb/pull/45)
+
 ## v1.1.0 - [March 8, 2024](https://github.com/lando/mariadb/releases/tag/v1.1.0)
 
 ### Fixes

package/node_modules/@lando/mariadb/README.md

@@ -33,6 +33,12 @@ If you'd like to report a bug or submit a feature request then please [use the i
 
 We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/mariadb/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/mariadb/releases).
 
+
+## Maintainers
+
+* [@pirog](https://github.com/pirog)
+* [@reynoldsalec](https://github.com/reynoldsalec)
+
 ## Contributors
 
 <a href="https://github.com/lando/mariadb/graphs/contributors">

package/node_modules/@lando/mariadb/builders/mariadb.js

@@ -9,9 +9,19 @@ module.exports = {
   name: 'mariadb',
   config: {
     version: '10.3',
-    supported: ['10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
-    legacy: ['10.1'],
+    supported: ['11.3', '11.2', '11.1', '11.0', '10.11', '10.10', '10.9',
+      '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
+    legacy: ['10.10', '10.9', '10.8', '10.7', '10.3', '10.2', '10.1'],
     pinPairs: {
+      '11.3': 'bitnami/mariadb:11.3.2-debian-12-r1',
+      '11.2': 'bitnami/mariadb:11.2.3-debian-12-r4',
+      '11.1': 'bitnami/mariadb:11.1.4-debian-12-r4',
+      '11.0': 'bitnami/mariadb:11.0.5-debian-12-r5',
+      '10.11': 'bitnami/mariadb:10.11.7-debian-12-r6',
+      '10.10': 'bitnami/mariadb:10.10.7-debian-11-r6',
+      '10.9': 'bitnami/mariadb:10.9.8-debian-11-r22',
+      '10.8': 'bitnami/mariadb:10.8.8-debian-11-r5',
+      '10.7': 'bitnami/mariadb:10.7.8-debian-11-r6',
       '10.6': 'bitnami/mariadb:10.6.5-debian-10-r30',
       '10.5': 'bitnami/mariadb:10.5.8-debian-10-r74',
       '10.4': 'bitnami/mariadb:10.4.17-debian-10-r84',

package/node_modules/@lando/mariadb/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/mariadb",
   "description": "A Lando plugin that provides a tight integration with mariadb.",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/mariadb",
@@ -46,8 +46,8 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
-    "@lando/leia": "^0.6.5",
-    "@lando/vitepress-theme-default-plus": "^1.0.0-beta.40",
+    "@lando/leia": "^1.0.0-beta.3",
+    "@lando/vitepress-theme-default-plus": "^1.0.1",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -61,9 +61,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-WfVKHB9WNfAnYmcUtvHD1mnEtzTrJPnC8IxxXD7bXlGHzCg0fTDMCDq/E4KULzPv3gzSv/Y/qVckwk6PBHrTPQ==",
-    "shasum": "3e46a4aa9c131181ed9fbe403e060c90ef9dff67",
-    "filename": "lando-mariadb-1.1.0.tgz",
-    "unpackedSize": 1469176
+    "integrity": "sha512-KS+XSsRaPbNKzzIqFgWeqzrZdW1u9687rDNby+ubOXHiIswReyil+lXOkQ6qYIl13kF3zINihEKzlMpWU/e+YQ==",
+    "shasum": "ddda15f427edcd3c39c6c0de143c04eda6eb48d9",
+    "filename": "lando-mariadb-1.3.0.tgz",
+    "unpackedSize": 1470246
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/laravel",
   "description": "A Lando plugin that provides a tight integration with Laravel.",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/laravel",
@@ -42,7 +42,7 @@
     "test": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@lando/mariadb": "^1.1.0",
+    "@lando/mariadb": "^1.3.0",
     "@lando/memcached": "^1.1.0",
     "@lando/mssql": "^1.0.0",
     "@lando/mysql": "^1.1.0",
@@ -54,8 +54,8 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.23.10",
-    "@lando/leia": "^0.6.7",
-    "@lando/vitepress-theme-default-plus": "^1.0.0-beta.40",
+    "@lando/leia": "^1.0.0-beta.3",
+    "@lando/vitepress-theme-default-plus": "^1.0.2",
     "chai": "~4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^8.56.0",
@@ -77,9 +77,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-1H7bv9UHZz+3cKn/b6v09lLtZnirSrTma2ulUuu++nc+39+MwmFS77fBuJzi9F7Kx8egIGKbetiCaajMObgP5w==",
-    "shasum": "1d9524436cfb8b60631ab036dc901a0470b8920d",
-    "filename": "lando-laravel-1.4.0.tgz",
-    "unpackedSize": 15127839
+    "integrity": "sha512-MTTjspW4jmM2dGEIKLkkZX/3oPOWXV34saOOrGHN6aagIm5VJ7/1n1P3IfjfplLFvqjCbjIyk497gZqyAja7MQ==",
+    "shasum": "03ae45dec8f8d971d8cb8591b27f81c02368bfdf",
+    "filename": "lando-laravel-1.5.1.tgz",
+    "unpackedSize": 15130603
   }
 }

package/.nyc_output/processinfo/23845f2a-0eaf-4d6a-8885-30cd0027c66d.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2022,"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":1710179763961,"ppid":2021,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/23845f2a-0eaf-4d6a-8885-30cd0027c66d.json","externalId":"","uuid":"23845f2a-0eaf-4d6a-8885-30cd0027c66d","files":[]}

package/.nyc_output/processinfo/982ccd0d-9f58-48c0-9727-8cdb91b6f87c.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2033,"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":1710179764113,"ppid":2022,"coverageFilename":"/home/runner/work/laravel/laravel/.nyc_output/982ccd0d-9f58-48c0-9727-8cdb91b6f87c.json","externalId":"","uuid":"982ccd0d-9f58-48c0-9727-8cdb91b6f87c","files":[]}