@lando/symfony 1.6.0 → 1.6.1

package/.lando.yml

@@ -1,14 +1,24 @@
-name: lando-symfony-plugin
+name: docs.symfony
+proxy:
+  cli:
+    - docs.symfony.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/1f8196a2-03bf-4d5c-ace0-a7b7d17d4977.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2275,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1725645153463,"ppid":2264,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/1f8196a2-03bf-4d5c-ace0-a7b7d17d4977.json","externalId":"","uuid":"1f8196a2-03bf-4d5c-ace0-a7b7d17d4977","files":[]}

package/.nyc_output/processinfo/5e7aa96e-5e23-428b-804c-a7499bf5cfe2.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2264,"argv":["/opt/hostedtoolcache/node/18.20.4/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1725645153308,"ppid":2263,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/5e7aa96e-5e23-428b-804c-a7499bf5cfe2.json","externalId":"","uuid":"5e7aa96e-5e23-428b-804c-a7499bf5cfe2","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"4ed427dc-02b6-43ca-b0c2-f579149c83dc":{"parent":null,"children":[]},"6f0c983e-dc2f-4a49-82b2-0305c8fca917":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"1f8196a2-03bf-4d5c-ace0-a7b7d17d4977":{"parent":null,"children":[]},"5e7aa96e-5e23-428b-804c-a7499bf5cfe2":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.1 - [September 6, 2024](https://github.com/lando/symfony/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 31, 2024](https://github.com/lando/symfony/releases/tag/v1.6.0)
 
 * Use mysql command for MariaDB 10.3.x and below [#52](https://github.com/lando/symfony/issues/52)

package/builders/symfony.js

@@ -57,6 +57,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
 */
@@ -262,18 +274,20 @@ module.exports = {
         service: 'appserver',
         cmd: `php /app/${options.webroot}/../bin/console`,
       };
+
       if (_.has(options, 'cache')) options.services.cache = getCache(options.cache);
 
-      // 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}`]);
+
+      // 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-31T20:18:48.695Z
+                at 2024-09-06T17:52:33.653Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/symfony",
   "description": "A Lando plugin that provides a tight integration with Symfony.",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/symfony",
@@ -79,9 +79,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-B8Phc+St499Q95K7DX4PZBDb9p58JPP90EXhMCEVJsnKGT2TXU/lRHBUIuJpfwTL4GfYJ2E8kOKXNJl7sAXyXw==",
-    "shasum": "0a5ca7d528be49179ae9302bfde1d0f5cfcd9d1f",
-    "filename": "lando-symfony-1.6.0.tgz",
-    "unpackedSize": 16654474
+    "integrity": "sha512-B/e3cuLDQYWr+2HH/wN10KIc79CkwEWWXsqWHNJ8LEWgLIMNLfZU0aT6odXmbFzEdNNqhkn9nKysOzYACkayfQ==",
+    "shasum": "797649d50c7e058108ba464643a4ebcd67da9b25",
+    "filename": "lando-symfony-1.6.1.tgz",
+    "unpackedSize": 16655247
   }
 }

package/.nyc_output/processinfo/4ed427dc-02b6-43ca-b0c2-f579149c83dc.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1841,"argv":["/opt/hostedtoolcache/node/18.20.3/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1717186728340,"ppid":1840,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/4ed427dc-02b6-43ca-b0c2-f579149c83dc.json","externalId":"","uuid":"4ed427dc-02b6-43ca-b0c2-f579149c83dc","files":[]}

package/.nyc_output/processinfo/6f0c983e-dc2f-4a49-82b2-0305c8fca917.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1852,"argv":["/opt/hostedtoolcache/node/18.20.3/x64/bin/node","/home/runner/work/symfony/symfony/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/symfony/symfony","time":1717186728503,"ppid":1841,"coverageFilename":"/home/runner/work/symfony/symfony/.nyc_output/6f0c983e-dc2f-4a49-82b2-0305c8fca917.json","externalId":"","uuid":"6f0c983e-dc2f-4a49-82b2-0305c8fca917","files":[]}