Skip to content

Commit

Permalink
update deps and optimize for midcore
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Dec 8, 2024
1 parent b3dae18 commit c0c7f09
Show file tree
Hide file tree
Showing 30 changed files with 2,133 additions and 1,876 deletions.
19 changes: 16 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
{
"env": {
"node": true,
"mocha": true
"mocha": true,
"es2021": true
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 8,
"requireConfigFile": false
},
"extends": "google",
"extends": [
"eslint:recommended",
"google"
],
"rules": {
"arrow-parens": ["error",
"as-needed"
],
"max-len": ["error", {
"code": 120,
"code": 140,
"ignoreComments": true
}],
"no-empty": ["error", {
"allowEmptyCatch": true
}],
"no-unused-vars": ["error", {
"vars": "all",
"args": "after-used",
"ignoreRestSiblings": false
}],

"require-jsdoc": ["error", {
"require": {
"FunctionDeclaration": true,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-24.04
node-version:
- '18'
- '20'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-lemp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
fail-fast: false
matrix:
lando-version:
- 3-edge-slim
- 3-edge
os:
- ubuntu-24.04
node-version:
- '18'
- '20'
leia-test:
- examples/lemp-custom
- examples/lemp-defaults
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-24.04
node-version:
- '18'
- '20'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- ubuntu-24.04
- macos-14
node-version:
- '18'
- '20'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.github
.nyc_output
coverage
docs
examples
guides
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Optimized for `midcore`
* Updated to [@lando/mariadb@1.6.3](https://github.com/lando/mariadb/releases/tag/v1.6.3).
* Updated to [@lando/mongo@1.2.3](https://github.com/lando/mongo/releases/tag/v1.2.3).
* Updated to [@lando/mssql@1.4.3](https://github.com/lando/mssql/releases/tag/v1.4.3).
* Updated to [@lando/mysql@1.4.4](https://github.com/lando/mysql/releases/tag/v1.4.4).
* Updated to [@lando/php@1.6.3](https://github.com/lando/php/releases/tag/v1.6.3).
* Updated to [@lando/postgres@1.4.4](https://github.com/lando/postgres/releases/tag/v1.4.4).

## v1.7.3 - [December 6, 2024](https://github.com/lando/lemp/releases/tag/v1.7.3)

* Updated the version index.md to get Docuverse page to build correctly.
Expand Down
4 changes: 2 additions & 2 deletions builders/lemp-mariadb.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.
module.exports = {
name: 'lemp-mariadb',
parent: '_service',
builder: (parent, config) => class LempMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
builder: parent => class LempMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-mongo.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMongo = require('./../node_modules/@lando/mongo/builders/mongo.js');
module.exports = {
name: 'lemp-mongo',
parent: '_service',
builder: (parent, config) => class LempMongo extends LandoMongo.builder(parent, LandoMongo.config) {
builder: parent => class LempMongo extends LandoMongo.builder(parent, LandoMongo.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-mssql.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMssql = require('./../node_modules/@lando/mssql/builders/mssql.js');
module.exports = {
name: 'lemp-mssql',
parent: '_service',
builder: (parent, config) => class LempMssql extends LandoMssql.builder(parent, LandoMssql.config) {
builder: parent => class LempMssql extends LandoMssql.builder(parent, LandoMssql.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-mysql.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
module.exports = {
name: 'lemp-mysql',
parent: '_service',
builder: (parent, config) => class LempMysql extends LandoMysql.builder(parent, LandoMysql.config) {
builder: parent => class LempMysql extends LandoMysql.builder(parent, LandoMysql.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-nginx.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const PhpNginx = require('@lando/php/builders/php-nginx.js');
module.exports = {
name: 'lemp-nginx',
parent: '_webserver',
builder: (parent, config) => class LempNginx extends PhpNginx.builder(parent, PhpNginx.config) {
builder: parent => class LempNginx extends PhpNginx.builder(parent, PhpNginx.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-php.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ const loadScripts = options => {
module.exports = {
name: 'lemp-php',
parent: '_appserver',
builder: (parent, config) => class LempPhp extends LandoPhp.builder(parent, LandoPhp.config) {
builder: parent => class LempPhp extends LandoPhp.builder(parent, LandoPhp.config) {
constructor(id, options = {}, factory) {
loadScripts(options);
options.nginxServiceType = 'lemp-nginx';
super(id, options, factory);
};
}
},
};
4 changes: 2 additions & 2 deletions builders/lemp-postgres.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgr
module.exports = {
name: 'lemp-postgres',
parent: '_service',
builder: (parent, config) => class LempPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
builder: parent => class LempPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
2 changes: 1 addition & 1 deletion builders/lemp.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,6 @@ module.exports = {

// Downstream
super(id, _.merge({}, config, options));
};
}
},
};
6 changes: 3 additions & 3 deletions docs/.vitepress/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const {name, version} = require('../../package.json');
const landoPlugin = name.replace('@lando/', '');

export default defineConfig({
title: 'Lando Lemp Plugin',
description: 'The offical Lando plugin for Lemp.',
title: 'Lando LEMP Plugin',
description: 'The offical Lando plugin for LEMP.',
landoDocs: 3,
landoPlugin,
version,
Expand All @@ -20,7 +20,7 @@ export default defineConfig({
],
themeConfig: {
multiVersionBuild: {
satisfies: '>=1.6.0',
satisfies: '>=1.7.0',
},
sidebar: sidebar(),
},
Expand Down
8 changes: 4 additions & 4 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ description: Learn how to configure the Lando LEMP recipe.

# Configuration

While Lando [recipes](https://docs.lando.dev/core/v3/recipes.html) set sane defaults so they work out of the box, they are also [configurable](https://docs.lando.dev/core/v3/recipes.html#config).
While Lando [recipes](https://docs.lando.dev/landofile/recipes.html) set sane defaults so they work out of the box, they are also [configurable](https://docs.lando.dev/landofile/recipes.html#config).

Here are the configuration options, set to the default values, for this recipe's [Landofile](https://docs.lando.dev/core/v3). If you are unsure about where this goes or what this means we *highly recommend* scanning the [recipes documentation](https://docs.lando.dev/core/v3/recipes.html) to get a good handle on how the magicks work.
Here are the configuration options, set to the default values, for this recipe's [Landofile](https://docs.lando.dev/landofile/). If you are unsure about where this goes or what this means we *highly recommend* scanning the [recipes documentation](https://docs.lando.dev/landofile/recipes.html) to get a good handle on how the magicks work.

```yaml
recipe: lemp
Expand All @@ -24,13 +24,13 @@ config:
vhosts: SEE BELOW
```
Note that if the above config options are not enough, all Lando recipes can be further [extended and overriden](https://docs.lando.dev/core/v3/recipes.html#extending-and-overriding-recipes).
Note that if the above config options are not enough, all Lando recipes can be further [extended and overriden](https://docs.lando.dev/landofile/recipes.html#extending-and-overriding-recipes).
## Choosing a php version
You can set `php` to any version that is available in our [php service](https://docs.lando.dev/plugins/php). However, you should make sure that whatever framework or custom code you write is designed to work with your choice.

The [recipe config](https://docs.lando.dev/core/v3/recipes.html#config) to set the LEMP recipe to use `php` version `5.3` is shown below:
The [recipe config](https://docs.lando.dev/landofile/recipes.html#config) to set the LEMP recipe to use `php` version `5.3` is shown below:

```yaml
recipe: lemp
Expand Down
22 changes: 14 additions & 8 deletions docs/development.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Development
description: Learn how to develop and contribute to the Lando Lemp service
description: Learn how to develop and contribute to the Lando LEMP service
---

# Development
Expand Down Expand Up @@ -91,25 +91,31 @@ npm run test:unit

We do end to end testing with our made-just-for-Lando testing framework [Leia](https://github.com/lando/leia). Leia allows us to define tests as a series of commented shell commands in human readable markdown files. Here is a simple example:

```md
Start up tests
--------------
````md
## Start up tests

```bash
# Should start up successfully
lando start
```

Verification commands
---------------------
## Verification commands

```bash
# Should be able to connect to all mariadb relationships
lando mariadb main -e "show tables;"
Destroy tests
-------------
# Should do something else
lando exec appserver -- some-command
```

## Destroy tests

```bash
# Should be able to destroy our app
lando destroy -y
```
````

Note that the headers here are important. The _Start up tests_ header specifies things that should run before the main series of tests. _Verification commands_ is the main body of tests and is required. _Destroy tests_ specifies any needed clean up commands to run.

Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ description: Learn how to get started with the Lando LEMP recipe.
Before you get started with this recipe we assume that you have:

1. [Installed Lando](https://docs.lando.dev/getting-started/installation.html) and gotten familiar with [its basics](https://docs.lando.dev/cli/)
2. [Initialized](https://docs.lando.dev/cli/init.html) a [Landofile](https://docs.lando.dev/core/v3) for your codebase for use with this recipe
3. Read about the various [services](https://docs.lando.dev/core/v3/lando-service.html), [tooling](https://docs.lando.dev/core/v3/tooling.html), [events](https://docs.lando.dev/core/v3/events.html) and [routing](https://docs.lando.dev/core/v3/proxy.html) Lando offers.
2. [Initialized](https://docs.lando.dev/cli/init.html) a [Landofile](https://docs.lando.dev/landofile/) for your codebase for use with this recipe
3. Read about the various [services](https://docs.lando.dev/services/lando-3.html), [tooling](https://docs.lando.dev/landofile/tooling.html), [events](https://docs.lando.dev/landofile/events.html) and [routing](https://docs.lando.dev/landofile/proxy.html) Lando offers.

## Quick Start

Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ next: ./config.html

The LEMP stack is a common infrastructure designed to run PHP applications.

Lando offers a configurable [recipe](https://docs.lando.dev/core/v3/recipes.html) for developing LEMP apps.
Lando offers a configurable [recipe](https://docs.lando.dev/landofile/recipes.html) for developing LEMP apps.

Note that this recipe is for a generic LEMP stack. Definitely check out Lando's [other recipes](https://docs.lando.dev/core/v3/recipes.html) before you use this as there may be one designed specifically for use with your framework.
Note that this recipe is for a generic LEMP stack. Definitely check out Lando's [other recipes](https://docs.lando.dev/landofile/recipes.html) before you use this as there may be one designed specifically for use with your framework.

#### Features of this plugin:

Expand Down
6 changes: 3 additions & 3 deletions docs/team.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
description: Learn about the team that made the Lemp plugin.
description: Learn about the team that made the LEMP plugin.
layout: page
title: Team
---
Expand All @@ -10,7 +10,7 @@ title: Team
Team
</template>
<template #lead>
We are the people who brought Lemp to Lando.
We are the people who brought LEMP to Lando.
</template>
</VPLTeamPageTitle>
<VPLTeamMembers :members="members" size="small"/>
Expand All @@ -22,4 +22,4 @@ import {useTeam} from '@lando/vitepress-theme-default-plus';

const members = useTeam();

</script>
</script>
5 changes: 2 additions & 3 deletions examples/lemp-init/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LEMP Example
============
# LEMP Init Example

This example exists primarily to test the following documentation:

Expand All @@ -16,10 +15,10 @@ lando poweroff
# Should initialize the latest codeignitor codebase
rm -rf lemp && mkdir -p lemp && cd lemp
lando init --source remote --remote-url https://github.com/bcit-ci/CodeIgniter/archive/3.1.13.tar.gz --remote-options="--strip-components 1" --recipe lemp --webroot . --name lando-lemp --option composer_version=1.10.27
cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml

# Should start up successfully
cd lemp
cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml
lando start
```

Expand Down
3 changes: 1 addition & 2 deletions examples/lemp-mariadb-mysql/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LEMP MariaDB/MySQL Example
==========================
# LEMP MariaDB/MySQL Example

This example exists primarily to test the following documentation:

Expand Down
3 changes: 1 addition & 2 deletions examples/lemp-mariadb/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LEMP MariaDB Example
====================
# LEMP MariaDB Example

This example exists primarily to test the following documentation:

Expand Down
3 changes: 1 addition & 2 deletions examples/lemp-mysql8/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
LEMP MySQL 8 Example
====================
# LEMP MySQL 8 Example

This example exists primarily to test the following documentation:

Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
'use strict';

module.exports = lando => {};
module.exports = () => {};
Loading

0 comments on commit c0c7f09

Please sign in to comment.