@florianpat/lando-core 3.23.27-5florianPat.0 → 3.23.27-5florianPat.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.27-5florianPat.0 - [August 22, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-5florianPat.0)
+## v3.23.27-5florianPat.1 - [August 25, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-5florianPat.1)
 
 ## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
 

package/index.js

@@ -61,7 +61,7 @@ module.exports = async lando => {
   lando.events.on('pre-setup', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
 
   // ensure we setup docker if needed
-  lando.events.once('pre-setup', async options => await require(`./hooks/lando-setup-build-engine-${platform}`)(lando, options));
+  lando.events.once('pre-setup', async options => await require(`./hooks/lando-setup-build-engine-${process.platform}`)(lando, options));
 
   // do some sepecial handling on wsl
   lando.events.once('pre-setup', async options => await require('./hooks/lando-setup-create-ca-wsl')(lando, options));

package/lib/art.js

@@ -300,7 +300,7 @@ exports.newContent = (type = 'guide') => [
   '',
 ].join(os.EOL);
 
-exports.setupHeader = (bengine = process.landoPlatform === 'linux' || process.platform === 'linux' ? 'Engine' : 'Desktop') => `
+exports.setupHeader = (bengine = ['linux', 'wsl'].includes(process.landoPlatform) ? 'Engine' : 'Desktop') => `
 ${chalk.magenta(niceFont('Lando Setup!', 'Small Slant'))}
 
 ${chalk.bold('lando setup')} is a hidden convenience command to help you satisify the

package/lib/daemon.js

@@ -28,9 +28,9 @@ const buildDockerCmd = (cmd, scriptsDir, dockerBin) => {
     case 'darwin':
       return ['open', MACOS_BASE];
     case 'linux':
+    case 'wsl':
       return [path.join(scriptsDir, `docker-engine-${cmd}.sh`)];
     case 'win32':
-    case 'wsl':
       return ['powershell.exe', '-ExecutionPolicy', 'Bypass', '-File', `"${windowsStartScript}"`];
   }
 };
@@ -107,12 +107,12 @@ module.exports = class LandoDaemon {
                 await require('../utils/run-command')('open', [MACOS_BASE], {debug: this.debug});
                 break;
               case 'linux':
+              case 'wsl':
                 const lscript = path.join(this.scriptsDir, 'docker-engine-start.sh');
                 if (password) await require('../utils/run-elevated')([lscript], {debug, password});
                 else await require('../utils/run-command')(lscript, {debug});
                 break;
               case 'win32':
-              case 'wsl':
                 const wscript = path.join(this.scriptsDir, 'docker-desktop-start.ps1');
                 await require('../utils/run-powershell-script')(wscript, undefined, {debug: this.debug});
                 await require('delay')(2000);
@@ -226,10 +226,10 @@ module.exports = class LandoDaemon {
       case 'darwin':
         return getMacProp('CFBundleShortVersionString').then(version => ({...versions, desktop: version}));
       case 'linux':
+      case 'wsl':
         const cmd = [`"${this.docker}"`, 'version', '--format', '{{.Server.Version}}'];
         return shell.sh(cmd).catch(() => '18.0.0').then(version => ({...versions, engine: version}));
       case 'win32':
-      case 'wsl':
         const componentsVersionFile = this.platform === 'win32'
           ? path.resolve(getDockerBinPath('win32'), '..', 'componentsVersion.json') : '/Docker/host/componentsVersion.json';
 

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.27-5florianPat.0",
+  "version": "3.23.27-5florianPat.1",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -249,9 +249,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-4XH8m3midLfVyHWYS3dPq978/MNrKtNQ2HcNrj/iYXgS0+E05NauocHPAt9vBRHb3FCcGT9Eo1e5StzZUjb7xw==",
-    "shasum": "15a076e7e025a35ddf5c82fc789f8057c10b54f1",
-    "filename": "florianpat-lando-core-3.23.27-5florianPat.0.tgz",
-    "unpackedSize": 60980579
+    "integrity": "sha512-fKWOfM4UYDTsbPvvdsPG82hLRiDToxg9tTZeytY7Xr5BGs/HcR0NufBpTJ42Dd/zMNxsYp8undbxnHsHxC3ESw==",
+    "shasum": "03cc7ac953797fae05985d31f69a96efdfbcf351",
+    "filename": "florianpat-lando-core-3.23.27-5florianPat.1.tgz",
+    "unpackedSize": 60980524
   }
 }

package/plugins/networking/index.js

@@ -76,7 +76,7 @@ module.exports = lando => {
         if (lando.engine.dockerInstalled === false) return false;
 
         // we also want to do an additional check on docker-destkop
-        if (lando.config.os.landoPlatform !== 'linux' && !fs.existsSync(getDockerDesktopBin())) return false;
+        if (!['linux', 'wsl'].includes(lando.config.os.landoPlatform) && !fs.existsSync(getDockerDesktopBin())) return false;
 
         // otherwise attempt to sus things out
         try {

package/plugins/proxy/lib/utils.js

@@ -167,7 +167,7 @@ exports.parseRoutes = (service, urls = [], sslReady, labels = {}) => {
     rule.middlewares.push({name: 'lando', key: 'headers.customrequestheaders.X-Lando', value: 'on'});
 
     // Add in any path stripping middleware we need it
-    if (rule.pathname.length > 1) {
+    if (rule.pathname.length > 1 && _.get(rule, 'stripPrefix', true)) {
       rule.middlewares.push({name: 'stripprefix', key: 'stripprefix.prefixes', value: rule.pathname});
     };
 

package/tasks/setup.js

@@ -67,7 +67,7 @@ module.exports = lando => {
   // get defaults from the lando config
   const defaults = lando.config.setup;
   // determine label for build engine
-  const buildEngine = process.landoPlatform === 'linux' || process.platform === 'linux' ? 'docker-engine' : 'docker-desktop';
+  const buildEngine = ['linux', 'wsl'].includes(process.landoPlatform) ? 'docker-engine' : 'docker-desktop';
   // default options
   const options = {
     'build-engine': {

package/utils/get-config-defaults.js

@@ -10,11 +10,10 @@ const getBuildEngineVersion = (platform = process.landoPlatform ?? process.platf
     case 'darwin':
       return '4.37.2';
     case 'linux':
+    case 'wsl':
       return '27.5.0';
     case 'win32':
       return '4.37.1';
-    case 'wsl':
-      return '4.37.1';
   }
 };
 

package/utils/get-docker-bin-path.js

@@ -6,6 +6,7 @@ const path = require('path');
 module.exports = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
     case 'linux':
+    case 'wsl':
       return '/usr/share/lando/bin';
     case 'win32':
       const programFiles = process.env.ProgramW6432 || process.env.ProgramFiles;
@@ -17,8 +18,6 @@ module.exports = (platform = process.landoPlatform ?? process.platform) => {
       } else {
          return path.win32.join(programFiles + '\\Docker\\Docker\\resources\\bin');
       }
-    case 'wsl':
-      return '/mnt/wsl/docker-desktop/cli-tools/usr/bin';
     default:
       return '/usr/bin';
   }