@lando/php 0.10.2 → 1.0.0

package/.lando.yml

@@ -1,14 +1,14 @@
 name: lando-php-plugin
 services:
   node:
-    type: node:14
+    type: node:18
     build:
-      - yarn install
+      - npm install
     scanner: false
     ssl: false
     sslExpose: false
 tooling:
   node:
     service: node
-  yarn:
+  npm:
     service: node

package/.nyc_output/processinfo/0d3f9936-7351-4e73-b720-0191b83fa2ed.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2099,"argv":["/opt/hostedtoolcache/node/18.19.0/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1702012297247,"ppid":2087,"coverageFilename":"/home/runner/work/php/php/.nyc_output/0d3f9936-7351-4e73-b720-0191b83fa2ed.json","externalId":"","uuid":"0d3f9936-7351-4e73-b720-0191b83fa2ed","files":[]}

package/.nyc_output/processinfo/ce923446-2865-4698-835b-17780656b791.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2087,"argv":["/opt/hostedtoolcache/node/18.19.0/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1702012297042,"ppid":2086,"coverageFilename":"/home/runner/work/php/php/.nyc_output/ce923446-2865-4698-835b-17780656b791.json","externalId":"","uuid":"ce923446-2865-4698-835b-17780656b791","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"41cf4733-5fd1-4901-8efe-1d8147fe6dfd":{"parent":null,"children":[]},"ad2f5569-33d5-49eb-a1cf-96c429e575e8":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"0d3f9936-7351-4e73-b720-0191b83fa2ed":{"parent":null,"children":[]},"ce923446-2865-4698-835b-17780656b791":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.0 - [December 7, 2023](https://github.com/lando/php/releases/tag/v1.0.0)
+    * Dialed fully for `lando update`
+
 ## v0.10.2 - [November 28, 2023](https://github.com/lando/php/releases/tag/v0.10.2)
 * Added option to override the image powering the service.
 * Removed apparmor step from image building.

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 2023-11-29T04:23:34.503Z
+                at 2023-12-08T05:11:37.450Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/netlify.toml

@@ -1,7 +1,7 @@
 [build]
   base = "./"
   publish = "docs/.vuepress/dist"
-  command = "yarn docs:build"
+  command = "npm run docs:build"
 
 # Sets our asset optimization
 [build.processing.css]

package/node_modules/@lando/nginx/.nyc_output/processinfo/68963536-315a-41b5-9dda-1c3f30fb9c99.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2001,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1701812496779,"ppid":2000,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/68963536-315a-41b5-9dda-1c3f30fb9c99.json","externalId":"","uuid":"68963536-315a-41b5-9dda-1c3f30fb9c99","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/e965c931-7444-4e4e-8bc1-c51f696e4cfe.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2012,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1701812496927,"ppid":2001,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/e965c931-7444-4e4e-8bc1-c51f696e4cfe.json","externalId":"","uuid":"e965c931-7444-4e4e-8bc1-c51f696e4cfe","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"25008f82-06ee-4bbc-8343-1d528da4b82d":{"parent":null,"children":[]},"6426f44d-f78d-4e10-9b15-d18497ce3d61":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"68963536-315a-41b5-9dda-1c3f30fb9c99":{"parent":null,"children":[]},"e965c931-7444-4e4e-8bc1-c51f696e4cfe":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

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

@@ -1,30 +1,37 @@
+## v0.11.0 - [December 5, 2023](https://github.com/lando/nginx/releases/tag/v0.11.0)
+
+  * Got rid of render-template tooling. [#33](https://github.com/lando/nginx/pull/33)
+  * Added support for `nginx:1.25`.
+
 ## v0.10.0 - [November 15, 2023](https://github.com/lando/nginx/releases/tag/v0.10.0)
-* Moved builder file to the new builders/ directory.
-* Isolated testing to fit with HARDCORE strategy.
+
+  * Moved builder file to the new builders/ directory.
+  * Isolated testing to fit with HARDCORE strategy.
 
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/nginx/releases/tag/v0.9.0)
-* Removed bundle-dependencies and version-bump-prompt from plugin.
-* Updated package to use prepare-release-action.
-* Updated documentation to reflect new release process.
+
+  * Removed bundle-dependencies and version-bump-prompt from plugin.
+  * Updated package to use prepare-release-action.
+  * Updated documentation to reflect new release process.
 
 ## v0.8.0 - [May 10, 2023](https://github.com/lando/nginx/releases/tag/v0.8.0)
 
-* Added support for `nginx:1.19`
-* Added support for `nginx:1.20`
-* Added support for `nginx:1.21`
-* Added support for `nginx:1.22`
-* Added support for `nginx:1.23`
-* Added support for `nginx:1.24`
+  * Added support for `nginx:1.19`
+  * Added support for `nginx:1.20`
+  * Added support for `nginx:1.21`
+  * Added support for `nginx:1.22`
+  * Added support for `nginx:1.23`
+  * Added support for `nginx:1.24`
 
 ## v0.7.0 - [December 12, 2022](https://github.com/lando/nginx/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 7, 2022](https://github.com/lando/nginx/releases/tag/v0.6.0)
 
 ## v0.5.0 - [November 9, 2021](https://github.com/lando/nginx/releases/tag/v0.5.0)
 
-Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
+  Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
 
-* Initial Release
+  * Initial Release

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

@@ -9,12 +9,13 @@ module.exports = {
   name: 'nginx',
   config: {
     version: '1.17',
-    supported: ['1.14', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24'],
+    supported: ['1.14', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25'],
     legacy: ['1.14'],
     pinPairs: {
-      '1.24': 'bitnami/nginx:1.24.0-debian-11-r1',
-      '1.23': 'bitnami/nginx:1.23.4-debian-11-r10',
-      '1.22': 'bitnami/nginx:1.22.1-debian-11-r64',
+      '1.25': 'bitnami/nginx:1.25.3-debian-11-r1',
+      '1.24': 'bitnami/nginx:1.24.0-debian-11-r153',
+      '1.23': 'bitnami/nginx:1.23.4-debian-11-r24',
+      '1.22': 'bitnami/nginx:1.22.1-debian-11-r66',
       '1.21': 'bitnami/nginx:1.21.6-debian-11-r21',
       '1.20': 'bitnami/nginx:1.20.2-debian-11-r9',
       '1.19': 'bitnami/nginx:1.19.10-debian-10-r94',
@@ -42,7 +43,6 @@ module.exports = {
     },
     ssl: false,
     webroot: '.',
-    renderTemplate: '1.0.5-5',
   },
   parent: '_webserver',
   builder: (parent, config) => class LandoNginx extends parent {
@@ -64,11 +64,6 @@ module.exports = {
         options.defaultFiles = _.merge({}, options.defaultFiles, {server: 'nginx.conf.tpl'});
       }
 
-      // swap to older render template as needed
-      if (mv === '1.14' || mv === '1.15' || mv === '1.16') {
-        options.renderTemplate = '1.0.0-3';
-      }
-
       // Get the config files final destination
       // @TODO: we cp the files instead of directly mounting them to
       // prevent unexpected edits to this files
@@ -78,7 +73,7 @@ module.exports = {
       // Build the default stuff here
       const nginx = {
         image: `bitnami/nginx:${options.version}`,
-        command: `/launch.sh ${vhosts} ${server} ${params} ${options.renderTemplate}`,
+        command: `/launch.sh ${vhosts} ${server} ${params}`,
         environment: {
           NGINX_HTTP_PORT_NUMBER: '80',
           NGINX_DAEMON_USER: 'root',

package/node_modules/@lando/nginx/config/launch.sh

@@ -7,7 +7,6 @@ set -e
 : ${VHOST:="$1"}
 : ${SERVER:="$2"}
 : ${PARAMS:="$3"}
-: ${RENDER_TEMPLATE:="$4"}
 : ${VHOST_SOURCE:="/tmp/vhosts.conf.lando"}
 : ${SERVER_SOURCE:="/tmp/server.conf.lando"}
 : ${PARAMS_SOURCE:="/tmp/fastcgi_params.lando"}
@@ -35,18 +34,10 @@ if [ -f "$PARAMS_SOURCE" ]; then
   cp -f "$PARAMS_SOURCE" "$PARAMS"
 fi
 
-# Unpack components
-if [ -f "/opt/bitnami/scripts/libcomponent.sh" ] && ! command -v render-template &> /dev/null; then
-  . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "$RENDER_TEMPLATE"
-fi
+# Replace LANDO_WEBROOT in the vhost template
+lando_info "Using sed to place correct webroot in vhost template"
+sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
 
-# Render the template if render-template exists
-if [ -x "$(command -v render-template)" ]; then
-  render-template "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
-else
-  lando_info "Command render-template not found, using sed"
-  sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
-fi
 lando_info "Rendered template /tmp/vhosts.lando to /opt/bitnami/nginx/conf/vhosts/lando.conf"
 lando_debug $(cat /opt/bitnami/nginx/conf/vhosts/lando.conf)
 

package/node_modules/@lando/nginx/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 2023-11-15T20:04:43.327Z
+                at 2023-12-05T21:41:37.121Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/node_modules/@lando/nginx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/nginx",
   "description": "A Lando plugin that provides a tight integration with NGINX.",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/nginx",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "0.10.2",
+  "version": "1.0.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/php",
@@ -14,13 +14,8 @@
     "php"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
-  "bundledDependencies": [
-    "@lando/nginx",
-    "lodash",
-    "semver"
-  ],
   "lando": {},
   "main": "index.js",
   "nyc": {
@@ -41,13 +36,13 @@
     "docs:dev": "vuepress dev docs --clean-cache --clean-temp",
     "docs:build": "vuepress build docs",
     "docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
-    "lint": "eslint --quiet . && yarn docs:lint",
+    "lint": "eslint --quiet . && npm run docs:lint",
     "test:unit": "nyc --reporter=html --reporter=text mocha --timeout 5000 test/**/*.spec.js",
-    "test:leia": "yarn leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
-    "test": "yarn lint && yarn test:unit"
+    "test:leia": "npm run leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
+    "test": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@lando/nginx": "0.10.0",
+    "@lando/nginx": "0.11.0",
     "lodash": "^4.17.21",
     "semver": "^7.3.7"
   },
@@ -63,5 +58,16 @@
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
     "vuepress": "2.0.0-beta.53"
+  },
+  "bundledDependencies": [
+    "@lando/nginx",
+    "lodash",
+    "semver"
+  ],
+  "dist": {
+    "integrity": "sha512-7SEQCVApKyU05ZUetBwh7jGL5Rg1mZpTuHe9zc1cDyYD8PLFj8hYVreQTckCp0A6U3gjj7gXJEBnDt0mGt9S6w==",
+    "shasum": "7a5c4b46424d67f08affec563e5257010d6ac085",
+    "filename": "lando-php-1.0.0.tgz",
+    "unpackedSize": 3232123
   }
 }

package/.nyc_output/processinfo/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2031,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701231814306,"ppid":2020,"coverageFilename":"/home/runner/work/php/php/.nyc_output/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json","externalId":"","uuid":"41cf4733-5fd1-4901-8efe-1d8147fe6dfd","files":[]}

package/.nyc_output/processinfo/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2020,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701231814117,"ppid":2019,"coverageFilename":"/home/runner/work/php/php/.nyc_output/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json","externalId":"","uuid":"ad2f5569-33d5-49eb-a1cf-96c429e575e8","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/25008f82-06ee-4bbc-8343-1d528da4b82d.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2030,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078683137,"ppid":2019,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/25008f82-06ee-4bbc-8343-1d528da4b82d.json","externalId":"","uuid":"25008f82-06ee-4bbc-8343-1d528da4b82d","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/6426f44d-f78d-4e10-9b15-d18497ce3d61.json

@@ -1 +0,0 @@
-{"parent":null,"pid":2019,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078682991,"ppid":2018,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/6426f44d-f78d-4e10-9b15-d18497ce3d61.json","externalId":"","uuid":"6426f44d-f78d-4e10-9b15-d18497ce3d61","files":[]}