@florianpat/lando-core 3.23.3-compose → 3.23.7-compose

package/CHANGELOG.md

@@ -1,6 +1,22 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.3-compose - [November 7, 2024](https://github.com/florianPat/lando-core/releases/tag/v3.23.3-compose)
+## v3.23.7-compose - [November 17, 2024](https://github.com/florianPat/lando-core/releases/tag/v3.23.7-compose)
+
+## v3.23.7 - [November 13, 2024](https://github.com/lando/core/releases/tag/v3.23.7)
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.23](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.23)
+
+## v3.23.6 - [November 13, 2024](https://github.com/lando/core/releases/tag/v3.23.6)
+
+* Improved homepage documentation selector part 2
+
+## v3.23.5 - [November 13, 2024](https://github.com/lando/core/releases/tag/v3.23.5)
+
+* Improved homepage documentation selector
+
+## v3.23.4 - [November 12, 2024](https://github.com/lando/core/releases/tag/v3.23.4)
+
+* Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.21](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.21)
 
 ## v3.23.3 - [November 4, 2024](https://github.com/lando/core/releases/tag/v3.23.3)
 

package/_redirects

@@ -67,6 +67,7 @@ https://api.lando.dev/*               https://docs.lando.dev/:splat          302
 /contrib/evangelist-*                /contrib/evangelist.html                301
 /contrib/sponsor-*                   /contrib/sponsoring.html                301
 /contrib/how.html                    /contrib                                301
+/install                             /install/index.html                     301
 /lando-service.html                  /services/lando-3.html                  301
 /getting-started/updating.html       /guides/updating.html                   301
 /getting-started/uninstalling.html   /guides/uninstalling.html               301

package/components/plugin.js

@@ -226,7 +226,7 @@ class Plugin {
     // add auxilary package info
     this.spec = `${this.package}@${this.version}`;
     this.scope = require('npm-package-arg')(this.spec).scope;
-    if (this.scope) this.unscoped = this.spec.replace(`${this.scope}/`, '');
+    if (this.scope) this.unscoped = this.package.replace(`${this.scope}/`, '');
 
     // add some computed properties
     // @NOTE: do we need a stronger check for isupdateable?

package/hooks/app-run-events.js

@@ -6,6 +6,28 @@ const path = require('path');
 
 module.exports = async (app, lando, cmds, data, event) => {
   const eventCommands = require('./../utils/parse-events-config')(cmds, app, data, lando);
+  // add perm sweeping to all v3 services
+  if (!_.isEmpty(eventCommands)) {
+    const permsweepers = _(eventCommands)
+      .filter(command => command.api === 3)
+      .map(command => ({id: command.id, services: _.get(command, 'opts.services', [])}))
+      .uniqBy('id')
+      .value();
+    lando.log.debug('added preemptive perm sweeping to evented v3 services %j', permsweepers.map(s => s.id));
+    _.forEach(permsweepers, ({id, services}) => {
+      eventCommands.unshift({
+        id,
+        cmd: '/helpers/user-perms.sh --silent',
+        compose: app.compose,
+        project: app.project,
+        opts: {
+          mode: 'attach',
+          user: 'root',
+          services,
+        },
+      });
+    });
+  }
   const injectable = _.has(app, 'engine') ? app : lando;
   return injectable.engine.run(eventCommands).catch(err => {
     const command = _.tail(event.split('-')).join('-');

package/lib/router.js

@@ -90,7 +90,7 @@ exports.run = (data, compose, docker, started = true) => Promise.mapSeries(norma
           '/bin/sh',
           '-c',
           // eslint-disable-next-line max-len
-          'if [ "$LANDO_SERVICE_API" = "3" ] && test -f /helpers/check-entrypoint-ran.sh; then /helpers/check-entrypoint-ran.sh; fi',
+          'if [ "$LANDO_SERVICE_API" = "3" ]; then if [ -f /helpers/check-entrypoint-ran.sh ]; then /helpers/check-entrypoint-ran.sh; fi fi',
         ];
         return compose('run', _.merge(
           {},

package/lib/updates.js

@@ -126,13 +126,18 @@ module.exports = class UpdateManager {
           const {data, status, url} = await octokit.rest.repos.listReleases({owner: 'lando', repo: 'core'});
           this.debug('retrieved cli information from %o [%o]', url, status);
 
+          const newestCoreVersion = semver.clean((await this.plugins.find(plugin => plugin.core)?.check4Update())?.update?.version ?? '');
+
           const versions = data
             .map(release => ({...release, version: semver.clean(release.tag_name)}))
             .filter(release => semver.valid(release.version) !== null)
             .filter(release => semver.satisfies(release.version, '>=3.0.0 <4', {loose: true, includePrerelease: true}))
             .filter(release => release.draft === false)
             .filter(release => this.channel === 'edge' ? true : release.prerelease === false)
-            .map(release => release.version);
+            .map(release => release.version)
+            .filter(version => null === newestCoreVersion ?
+              true : require('../utils/is-lte-version')(version, newestCoreVersion),
+            );
 
           // get highest version
           const hv = semver.rsort(versions)[0];

package/netlify.toml

@@ -58,12 +58,7 @@
     output_path = "reports/lighthouse.html"
 
 # SEE _redirects for 301/302 which get loaded first
-# NOTE THAT REDIRECTS ARE EXECUTED FIRST COME FIRST SERVE
-# setup site
-[[redirects]]
-  from = "/install/*"
-  to = "https://setup-lando.netlify.app/:splat"
-  status = 200
+# NOTE THAT REDIRECTS/REWRITES ARE EXECUTED FIRST COME FIRST SERVE
 
 # lando 4 docs (for now)
 [[redirects]]

package/node_modules/cross-spawn/README.md

@@ -1,24 +1,17 @@
 # cross-spawn
 
-[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Build status][appveyor-image]][appveyor-url] [![Coverage Status][codecov-image]][codecov-url] [![Dependency status][david-dm-image]][david-dm-url] [![Dev Dependency status][david-dm-dev-image]][david-dm-dev-url]
+[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][ci-image]][ci-url] [![Build status][appveyor-image]][appveyor-url]
 
 [npm-url]:https://npmjs.org/package/cross-spawn
 [downloads-image]:https://img.shields.io/npm/dm/cross-spawn.svg
 [npm-image]:https://img.shields.io/npm/v/cross-spawn.svg
-[travis-url]:https://travis-ci.org/moxystudio/node-cross-spawn
-[travis-image]:https://img.shields.io/travis/moxystudio/node-cross-spawn/master.svg
+[ci-url]:https://github.com/moxystudio/cross-spawn/actions/workflows/ci.yaml
+[ci-image]:https://github.com/moxystudio/node-cross-spawn/actions/workflows/ci.yaml/badge.svg
 [appveyor-url]:https://ci.appveyor.com/project/satazor/node-cross-spawn
 [appveyor-image]:https://img.shields.io/appveyor/ci/satazor/node-cross-spawn/master.svg
-[codecov-url]:https://codecov.io/gh/moxystudio/node-cross-spawn
-[codecov-image]:https://img.shields.io/codecov/c/github/moxystudio/node-cross-spawn/master.svg
-[david-dm-url]:https://david-dm.org/moxystudio/node-cross-spawn
-[david-dm-image]:https://img.shields.io/david/moxystudio/node-cross-spawn.svg
-[david-dm-dev-url]:https://david-dm.org/moxystudio/node-cross-spawn?type=dev
-[david-dm-dev-image]:https://img.shields.io/david/dev/moxystudio/node-cross-spawn.svg
 
 A cross platform solution to node's spawn and spawnSync.
 
-
 ## Installation
 
 Node.js version 8 and up:

package/node_modules/cross-spawn/lib/enoent.js

@@ -24,7 +24,7 @@ function hookChildProcess(cp, parsed) {
         // the command exists and emit an "error" instead
         // See https://github.com/IndigoUnited/node-cross-spawn/issues/16
         if (name === 'exit') {
-            const err = verifyENOENT(arg1, parsed, 'spawn');
+            const err = verifyENOENT(arg1, parsed);
 
             if (err) {
                 return originalEmit.call(cp, 'error', err);

package/node_modules/cross-spawn/lib/util/escape.js

@@ -15,15 +15,17 @@ function escapeArgument(arg, doubleEscapeMetaChars) {
     arg = `${arg}`;
 
     // Algorithm below is based on https://qntm.org/cmd
+    // It's slightly altered to disable JS backtracking to avoid hanging on specially crafted input
+    // Please see https://github.com/moxystudio/node-cross-spawn/pull/160 for more information
 
     // Sequence of backslashes followed by a double quote:
     // double up all the backslashes and escape the double quote
-    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+    arg = arg.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
 
     // Sequence of backslashes followed by the end of the string
     // (which will become a double quote later):
     // double up all the backslashes
-    arg = arg.replace(/(\\*)$/, '$1$1');
+    arg = arg.replace(/(?=(\\+?)?)\1$/, '$1$1');
 
     // All other backslashes occur literally
 

package/node_modules/cross-spawn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-spawn",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "description": "Cross platform child_process#spawn and child_process#spawnSync",
   "keywords": [
     "spawn",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@florianpat/lando-core",
   "description": "The libraries that power all of Lando. Fork by flo for compose integration",
-  "version": "3.23.3-compose",
+  "version": "3.23.7-compose",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -168,7 +168,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^1.0.0-beta.4",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.18",
+    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.23",
     "@yao-pkg/pkg": "^5.16.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
@@ -181,7 +181,8 @@
     "nyc": "^15.1.0",
     "sinon": "^4.3.0",
     "sinon-chai": "^2.14.0",
-    "vitepress": "^1.4.2"
+    "ua-parser-js": "^1.0.39",
+    "vitepress": "^1.5.0"
   },
   "bundledDependencies": [
     "@lando/argv",
@@ -246,9 +247,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-ymB8zI/RdDsMJ8V0+gcBCWAteGdWjEeP3zOLe7jsxIAFLsLazgzLdiwDp5i/H6d4JKlUgWax/APXyfQTpI7Mgg==",
-    "shasum": "94c9d63acec21f3e92e932716c9bd4a44f9082bd",
-    "filename": "florianpat-lando-core-3.23.3-compose.tgz",
-    "unpackedSize": 60879409
+    "integrity": "sha512-6Xq72IhD1/1DBzarI6IEybpTykDn0k4Msia/Uwovg7sXRH+ML1DOnrPG8YvZyQVmPh2KBrsCVGkyfT57zJu80g==",
+    "shasum": "66e479f5ab1a093a4d4e0a7709ac28a4c2b2b910",
+    "filename": "florianpat-lando-core-3.23.7-compose.tgz",
+    "unpackedSize": 60880860
   }
 }

package/release-aliases/3-EDGE

@@ -1 +1 @@
-v3.23.3
+v3.23.7

package/release-aliases/3-STABLE

@@ -1 +1 @@
-v3.23.3
+v3.23.7

package/scripts/generate-checksums.sh

@@ -72,9 +72,9 @@ debug ""
 > "$OUTPUT_FILE"
 
 # Loop through each file in the directory with specified depth
-find "$DIRECTORY" -maxdepth "$DEPTH" -type f | while read -r file; do
+find "$DIRECTORY" -maxdepth "$DEPTH" -type f | sort | while read -r file; do
   # Calculate the SHA-256 checksum and append to the output file
-  sha256sum "$file" >> "$OUTPUT_FILE"
+  sha256sum "${file#./}" >> "$OUTPUT_FILE"
   # debug
   debug "wrote checksum $(sha256sum "$file") to ${OUTPUT_FILE}"
 done

package/scripts/lando-entrypoint.sh

@@ -2,6 +2,10 @@
 
 set -e
 
+if [ -f /tmp/lando-entrypoint-ran ]; then
+  rm /tmp/lando-entrypoint-ran
+fi
+
 # Get the lando logger
 . /helpers/log.sh