Merge branch 'main' into dependabot/npm_and_yarn/minimist-and-lando/l…

…eia--removed

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+### Bare minimum self-checks
+
+> [What do you think of a person who only does the bare minimum?](https://getyarn.io/yarn-clip/dcf80710-425e-478b-bde1-c107bd11e849)
+
+- [ ] I've updated this PR with the latest code from `main`
+- [ ] I've done a cursory QA pass of my code locally
+- [ ] I've ensured all automated status check and tests pass
+- [ ] I've [connected this PR to an issue](https://help.zenhub.com/support/solutions/articles/43000010350-connecting-pull-requests-to-github-issues)
+
+### Pieces of flare
+
+- [ ] I've written a unit or functional test for my code
+- [ ] I've updated relevant documentation it my code changes it
+- [ ] I've updated this repo's README if my code changes it
+- [ ] I've updated this repo's CHANGELOG with my change unless its a trivial change (like updating a typo in the docs)
+
+### Finally
+
+- [ ] I've [requested a review](https://help.github.com/en/articles/requesting-a-pull-request-review) with relevant people
+
+If you have any issues or need help please join the `#contributors` channel in the [Lando slack](https://www.launchpass.com/devwithlando) and someone will gladly help you out!
+
+You can also check out the [coder guide](https://docs.lando.dev/contrib/coder.html).

.github/workflows/label-add-to-project.yml

@@ -0,0 +1,19 @@
+name: Add to Contrib Project
+
+on:
+  issues:
+    types: [labeled]
+  pull_request:
+    types: [labeled]
+
+jobs:
+  add_to_project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue/PR to GitHub Project
+        if: github.event.label.name == 'flag'
+        uses: actions/add-to-project@v1.0.0
+        with:
+          project-url: https://github.com/orgs/lando/projects/7
+          github-token: ${{ secrets.SHADOW_COUNCIL_ESCALATOR }}
+          labeled: flag

.github/workflows/pr-apache-tests.yml

@@ -15,9 +15,9 @@ jobs:
           - examples/2.4
           - examples/custom
         lando-version:
-          - 3-dev-slim
+          - 3-edge-slim
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - '18'
     steps:
@@ -38,7 +38,7 @@ jobs:
           version: dev
           sync: false
       - name: Setup lando ${{ matrix.lando-version }}
-        uses: lando/setup-lando@v2
+        uses: lando/setup-lando@v3
         with:
           lando-version: ${{ matrix.lando-version }}
           config: |

.github/workflows/pr-docs-tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - '18'
     steps:

.github/workflows/pr-linter.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - '18'
     steps:

.github/workflows/pr-unit-tests.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         os:
           - windows-2022
-          - ubuntu-22.04
+          - ubuntu-24.04
           - macos-12
         node-version:
           - '18'

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - '18'
     steps:
@@ -42,6 +42,9 @@ jobs:
         uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
+          sync-email: rtfm47@lando.dev
+          sync-token: ${{ secrets.RTFM47_COAXIUM_INJECTOR }}
+          sync-username: rtfm-47
 
       # Deploy
       - name: Publish to npm

.lando.yml

@@ -1,14 +1,24 @@
-name: lando-apache-plugin
+name: docs.apache
+proxy:
+  cli:
+    - docs.apache.lndo.site:5173
 services:
-  node:
-    type: node:14
-    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

README.md

@@ -33,6 +33,12 @@ If you'd like to report a bug or submit a feature request then please [use the i
 
 We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/apache/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/apache/releases).
 
+
+## Maintainers
+
+* [@pirog](https://github.com/pirog)
+* [@reynoldsalec](https://github.com/reynoldsalec)
+
 ## Contributors
 
 <a href="https://github.com/lando/apache/graphs/contributors">

docs/.vitepress/config.mjs

@@ -49,8 +49,8 @@ function sidebar() {
         {text: 'GitHub', link: 'https://github.com/lando/apache/issues/new/choose'},
         {text: 'Slack', link: 'https://www.launchpass.com/devwithlando'},
         {text: 'Contact Us', link: '/support'},
+        {text: 'Examples', link: 'https://github.com/lando/apache/tree/main/examples'},
       ],
     },
-    {text: 'Examples', link: 'https://github.com/lando/apache/tree/main/examples'},
   ];
 };

docs/config.md

@@ -5,9 +5,9 @@ description: Learn how to configure the Lando Apache service.
 
 # Configuration
 
-Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/lando-service.html) to get a good handle on how the magicks work.
+Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/lando.html) to get a good handle on how the magicks work.
 
-Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/lando-service.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/lando-service.html#overrides) that are available to every service, are shown below:
+Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/lando.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/lando.html#overrides) that are available to every service, are shown below:
 
 ```yaml
 services:

docs/index.md

@@ -6,9 +6,9 @@ next: ./config.html
 
 # Apache
 
-[Apache](https://www.apache.org/) is a very common web server which you can easily add to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/lando-service.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3).
+[Apache](https://www.apache.org/) is a very common web server which you can easily add to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/services/lando.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3).
 
-You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/lando-service.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3).
+You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/services/lando.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3).
 
 ```yaml
 services:
@@ -19,7 +19,7 @@ services:
 ## Supported versions
 
 *   **[2.4](https://hub.docker.com/r/bitnami/apache)** **(default)**
-*   [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides)
+*   [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides)
 
 ## Patch versions