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

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.27-4florianPat.2 - [March 13, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.2)
+## 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/hooks/plugin-auth-from-npmrc.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const write = require('../utils/write-file');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const {parse} = require('ini');
+
+module.exports = async lando => {
+  if (!lando.config.loadNpmrcForPluginAuth) {
+    return;
+  }
+
+  const npmrcPath = path.resolve(os.homedir(), '.npmrc');
+  if (!fs.existsSync(npmrcPath)) {
+    return;
+  }
+  lando.log.debug('Reading home .npmrc for plugin-auth.json...');
+  const content = fs.readFileSync(npmrcPath, {
+    encoding: 'utf-8',
+  });
+  const data = parse(content);
+  write(lando.config.pluginConfigFile, data);
+  lando.plugins.updates = data;
+};

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));
@@ -102,6 +102,8 @@ module.exports = async lando => {
   // move v3 scripts directories as needed
   lando.events.on('pre-engine-start', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
 
+  lando.events.on('post-bootstrap-config', async () => await require('./hooks/plugin-auth-from-npmrc')(lando));
+
   // return some default things
   return _.merge({}, defaults, uc(), {config: {
     appEnv: {

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/node_modules/ini/LICENSE

@@ -0,0 +1,15 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/node_modules/ini/README.md

@@ -0,0 +1,180 @@
+
+An INI format parser & serializer.
+
+## Note
+
+-   Sections are treated as nested objects.
+
+-   Section-less items are treated as globals.
+
+## Usage
+
+Consider an INI file such as the following:
+
+```ini
+; This comment is being ignored
+scope = global
+
+[database]
+user = dbuser
+password = dbpassword
+database = use_this_database
+
+[paths.default]
+datadir = /var/lib/data
+array[] = first value
+array[] = second value
+array[] = third value
+```
+
+You can **read**, **modify** and **write** it like so:
+
+```js
+import { writeFile , readFile } from 'node:fs/promises'
+import { stringify , parse } from 'ini'
+
+//  Read INI file as text
+
+let text = await readFile(`./Original.ini`,{
+    encoding : 'utf-8'
+})
+
+//  Parse text data to object
+
+const config = parse(text)
+
+//  Modify data object
+
+config.scope = 'local'
+config.database.database = 'use_another_database'
+config.paths.default.tmpdir = '/tmp'
+delete config.paths.default.datadir
+config.paths.default.array.push('fourth value')
+
+//  Stringify data object
+
+text = stringify(config,{ 
+    section : 'section' 
+})
+
+//  Write INI file as text
+
+await writeFile(`./Modified.ini`,text)
+```
+
+The written file will contain the following:
+
+```ini
+[section]
+scope=local
+[section.database]
+user=dbuser
+password=dbpassword
+database=use_another_database
+[section.paths.default]
+tmpdir=/tmp
+array[]=first value
+array[]=second value
+array[]=third value
+array[]=fourth value
+```
+
+## API
+
+### Parse
+
+Attempts to turn the given INI string into a nested data object.
+
+```js
+// You can also use `decode`
+const object = parse(`<INI Text>`) 
+```
+
+### Stringify
+
+Encodes the given data object as an INI formatted string.
+
+```js
+// You can also use `encode`
+stringify(object,{
+
+    /**
+     *  Whether to insert spaces before & after `=`
+     * 
+     *  Disabled by default to have better 
+     *  compatibility with old picky parsers.
+     */
+
+    whitespace : false ,
+
+    /**
+     *  Whether to align the `=` character for each section.
+     *  -> Also enables the `whitespace` option
+     */
+
+    align : false ,
+
+    /**
+     *  Identifier to use for global items 
+     *  and to prepend to all other sections.
+     */
+
+    section ,
+
+    /**
+     *  Whether to sort all sections & their keys alphabetically.
+     */
+
+    sort : false ,
+
+    /**
+     *  Whether to insert a newline after each section header.
+     * 
+     *  The TOSHIBA & FlashAir parser require this format. 
+     */
+
+    newline : false ,
+
+    /**
+     *  Which platforms line-endings should be used.
+     * 
+     *  win32 -> CR+LF
+     *  other -> LF
+     * 
+     *  Default is the current platform
+     */
+
+    platform ,
+
+    /**
+     *  Whether to append `[]` to array keys.
+     * 
+     *  Some parsers treat duplicate names by themselves as arrays
+     */
+
+    bracketedArray : true
+
+})
+```
+
+*For backwards compatibility any string passed as the*  
+*options parameter is treated as the `section` option.*
+
+```js
+stringify(object,'section')
+```
+
+### Un / Escape
+
+Turn the given string into a safe to  
+use key or value in your INI file.
+
+```js
+safe(`"unsafe string"`) // -> \"unsafe string\"
+```
+
+Or reverse the process with:
+
+```js
+unsafe(`\\"safe string\\"`) // -> "safe string"
+```

package/node_modules/ini/lib/ini.js

@@ -0,0 +1,280 @@
+const { hasOwnProperty } = Object.prototype
+
+const encode = (obj, opt = {}) => {
+  if (typeof opt === 'string') {
+    opt = { section: opt }
+  }
+  opt.align = opt.align === true
+  opt.newline = opt.newline === true
+  opt.sort = opt.sort === true
+  opt.whitespace = opt.whitespace === true || opt.align === true
+  // The `typeof` check is required because accessing the `process` directly fails on browsers.
+  /* istanbul ignore next */
+  opt.platform = opt.platform || (typeof process !== 'undefined' && process.platform)
+  opt.bracketedArray = opt.bracketedArray !== false
+
+  /* istanbul ignore next */
+  const eol = opt.platform === 'win32' ? '\r\n' : '\n'
+  const separator = opt.whitespace ? ' = ' : '='
+  const children = []
+
+  const keys = opt.sort ? Object.keys(obj).sort() : Object.keys(obj)
+
+  let padToChars = 0
+  // If aligning on the separator, then padToChars is determined as follows:
+  // 1. Get the keys
+  // 2. Exclude keys pointing to objects unless the value is null or an array
+  // 3. Add `[]` to array keys
+  // 4. Ensure non empty set of keys
+  // 5. Reduce the set to the longest `safe` key
+  // 6. Get the `safe` length
+  if (opt.align) {
+    padToChars = safe(
+      (
+        keys
+          .filter(k => obj[k] === null || Array.isArray(obj[k]) || typeof obj[k] !== 'object')
+          .map(k => Array.isArray(obj[k]) ? `${k}[]` : k)
+      )
+        .concat([''])
+        .reduce((a, b) => safe(a).length >= safe(b).length ? a : b)
+    ).length
+  }
+
+  let out = ''
+  const arraySuffix = opt.bracketedArray ? '[]' : ''
+
+  for (const k of keys) {
+    const val = obj[k]
+    if (val && Array.isArray(val)) {
+      for (const item of val) {
+        out += safe(`${k}${arraySuffix}`).padEnd(padToChars, ' ') + separator + safe(item) + eol
+      }
+    } else if (val && typeof val === 'object') {
+      children.push(k)
+    } else {
+      out += safe(k).padEnd(padToChars, ' ') + separator + safe(val) + eol
+    }
+  }
+
+  if (opt.section && out.length) {
+    out = '[' + safe(opt.section) + ']' + (opt.newline ? eol + eol : eol) + out
+  }
+
+  for (const k of children) {
+    const nk = splitSections(k, '.').join('\\.')
+    const section = (opt.section ? opt.section + '.' : '') + nk
+    const child = encode(obj[k], {
+      ...opt,
+      section,
+    })
+    if (out.length && child.length) {
+      out += eol
+    }
+
+    out += child
+  }
+
+  return out
+}
+
+function splitSections (str, separator) {
+  var lastMatchIndex = 0
+  var lastSeparatorIndex = 0
+  var nextIndex = 0
+  var sections = []
+
+  do {
+    nextIndex = str.indexOf(separator, lastMatchIndex)
+
+    if (nextIndex !== -1) {
+      lastMatchIndex = nextIndex + separator.length
+
+      if (nextIndex > 0 && str[nextIndex - 1] === '\\') {
+        continue
+      }
+
+      sections.push(str.slice(lastSeparatorIndex, nextIndex))
+      lastSeparatorIndex = nextIndex + separator.length
+    }
+  } while (nextIndex !== -1)
+
+  sections.push(str.slice(lastSeparatorIndex))
+
+  return sections
+}
+
+const decode = (str, opt = {}) => {
+  opt.bracketedArray = opt.bracketedArray !== false
+  const out = Object.create(null)
+  let p = out
+  let section = null
+  //          section          |key      = value
+  const re = /^\[([^\]]*)\]\s*$|^([^=]+)(=(.*))?$/i
+  const lines = str.split(/[\r\n]+/g)
+  const duplicates = {}
+
+  for (const line of lines) {
+    if (!line || line.match(/^\s*[;#]/) || line.match(/^\s*$/)) {
+      continue
+    }
+    const match = line.match(re)
+    if (!match) {
+      continue
+    }
+    if (match[1] !== undefined) {
+      section = unsafe(match[1])
+      if (section === '__proto__') {
+        // not allowed
+        // keep parsing the section, but don't attach it.
+        p = Object.create(null)
+        continue
+      }
+      p = out[section] = out[section] || Object.create(null)
+      continue
+    }
+    const keyRaw = unsafe(match[2])
+    let isArray
+    if (opt.bracketedArray) {
+      isArray = keyRaw.length > 2 && keyRaw.slice(-2) === '[]'
+    } else {
+      duplicates[keyRaw] = (duplicates?.[keyRaw] || 0) + 1
+      isArray = duplicates[keyRaw] > 1
+    }
+    const key = isArray && keyRaw.endsWith('[]')
+      ? keyRaw.slice(0, -2) : keyRaw
+
+    if (key === '__proto__') {
+      continue
+    }
+    const valueRaw = match[3] ? unsafe(match[4]) : true
+    const value = valueRaw === 'true' ||
+      valueRaw === 'false' ||
+      valueRaw === 'null' ? JSON.parse(valueRaw)
+      : valueRaw
+
+    // Convert keys with '[]' suffix to an array
+    if (isArray) {
+      if (!hasOwnProperty.call(p, key)) {
+        p[key] = []
+      } else if (!Array.isArray(p[key])) {
+        p[key] = [p[key]]
+      }
+    }
+
+    // safeguard against resetting a previously defined
+    // array by accidentally forgetting the brackets
+    if (Array.isArray(p[key])) {
+      p[key].push(value)
+    } else {
+      p[key] = value
+    }
+  }
+
+  // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
+  // use a filter to return the keys that have to be deleted.
+  const remove = []
+  for (const k of Object.keys(out)) {
+    if (!hasOwnProperty.call(out, k) ||
+      typeof out[k] !== 'object' ||
+      Array.isArray(out[k])) {
+      continue
+    }
+
+    // see if the parent section is also an object.
+    // if so, add it to that, and mark this one for deletion
+    const parts = splitSections(k, '.')
+    p = out
+    const l = parts.pop()
+    const nl = l.replace(/\\\./g, '.')
+    for (const part of parts) {
+      if (part === '__proto__') {
+        continue
+      }
+      if (!hasOwnProperty.call(p, part) || typeof p[part] !== 'object') {
+        p[part] = Object.create(null)
+      }
+      p = p[part]
+    }
+    if (p === out && nl === l) {
+      continue
+    }
+
+    p[nl] = out[k]
+    remove.push(k)
+  }
+  for (const del of remove) {
+    delete out[del]
+  }
+
+  return out
+}
+
+const isQuoted = val => {
+  return (val.startsWith('"') && val.endsWith('"')) ||
+    (val.startsWith("'") && val.endsWith("'"))
+}
+
+const safe = val => {
+  if (
+    typeof val !== 'string' ||
+    val.match(/[=\r\n]/) ||
+    val.match(/^\[/) ||
+    (val.length > 1 && isQuoted(val)) ||
+    val !== val.trim()
+  ) {
+    return JSON.stringify(val)
+  }
+  return val.split(';').join('\\;').split('#').join('\\#')
+}
+
+const unsafe = val => {
+  val = (val || '').trim()
+  if (isQuoted(val)) {
+    // remove the single quotes before calling JSON.parse
+    if (val.charAt(0) === "'") {
+      val = val.slice(1, -1)
+    }
+    try {
+      val = JSON.parse(val)
+    } catch {
+      // ignore errors
+    }
+  } else {
+    // walk the val to find the first not-escaped ; character
+    let esc = false
+    let unesc = ''
+    for (let i = 0, l = val.length; i < l; i++) {
+      const c = val.charAt(i)
+      if (esc) {
+        if ('\\;#'.indexOf(c) !== -1) {
+          unesc += c
+        } else {
+          unesc += '\\' + c
+        }
+
+        esc = false
+      } else if (';#'.indexOf(c) !== -1) {
+        break
+      } else if (c === '\\') {
+        esc = true
+      } else {
+        unesc += c
+      }
+    }
+    if (esc) {
+      unesc += '\\'
+    }
+
+    return unesc.trim()
+  }
+  return val
+}
+
+module.exports = {
+  parse: decode,
+  decode,
+  stringify: encode,
+  encode,
+  safe,
+  unsafe,
+}

package/node_modules/ini/package.json

@@ -0,0 +1,45 @@
+{
+  "author": "GitHub Inc.",
+  "name": "ini",
+  "description": "An ini encoder/decoder for node",
+  "version": "5.0.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/ini.git"
+  },
+  "main": "lib/ini.js",
+  "scripts": {
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
+    "lint": "npm run eslint",
+    "lintfix": "npm run eslint -- --fix",
+    "test": "tap",
+    "snap": "tap",
+    "posttest": "npm run lint",
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force"
+  },
+  "devDependencies": {
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.23.3",
+    "tap": "^16.0.1"
+  },
+  "license": "ISC",
+  "files": [
+    "bin/",
+    "lib/"
+  ],
+  "engines": {
+    "node": "^18.17.0 || >=20.5.0"
+  },
+  "templateOSS": {
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "4.23.3",
+    "publish": "true"
+  },
+  "tap": {
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
+  }
+}

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-4florianPat.2",
+  "version": "3.23.27-5florianPat.1",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -127,6 +127,7 @@
     "figures": "^3.2.0",
     "fs-extra": "^11.1.1",
     "glob": "^7.1.3",
+    "ini": "^5.0.0",
     "inquirer": "^6.5.2",
     "inquirer-autocomplete-prompt": "^1.4.0",
     "is-class": "^0.0.9",
@@ -208,6 +209,7 @@
     "figures",
     "fs-extra",
     "glob",
+    "ini",
     "inquirer",
     "inquirer-autocomplete-prompt",
     "is-class",
@@ -247,9 +249,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-md/dXWSDeZ/Yuv01a926LsoZUUFhVdhXKhuTsxueCV87DdsJ95SrVgwn8X7DiqD0sRb771j4oQ1wEYr01OId/g==",
-    "shasum": "48b0d84ff591b9cc816be0d7ac6a68c952270de0",
-    "filename": "florianpat-lando-core-3.23.27-4florianPat.2.tgz",
-    "unpackedSize": 60967667
+    "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';
   }