Skip to content

Commit 9d39502

Browse files
committed
update deps and optimize for midcore
1 parent 97bb4ad commit 9d39502

27 files changed

+2239
-1907
lines changed

.eslintrc.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
11
{
22
"env": {
33
"node": true,
4-
"mocha": true
4+
"mocha": true,
5+
"es2021": true
56
},
67
"parser": "@babel/eslint-parser",
78
"parserOptions": {
89
"sourceType": "module",
910
"ecmaVersion": 8,
1011
"requireConfigFile": false
1112
},
12-
"extends": "google",
13+
"extends": [
14+
"eslint:recommended",
15+
"google"
16+
],
1317
"rules": {
1418
"arrow-parens": ["error",
1519
"as-needed"
1620
],
1721
"max-len": ["error", {
18-
"code": 120,
22+
"code": 140,
1923
"ignoreComments": true
2024
}],
25+
"no-empty": ["error", {
26+
"allowEmptyCatch": true
27+
}],
28+
"no-unused-vars": ["error", {
29+
"vars": "all",
30+
"args": "after-used",
31+
"ignoreRestSiblings": false
32+
}],
33+
2134
"require-jsdoc": ["error", {
2235
"require": {
2336
"FunctionDeclaration": true,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-24.04
1313
node-version:
14-
- '18'
14+
- '20'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
lando-version:
15-
- 3-edge-slim
15+
- 3-edge
1616
os:
1717
- ubuntu-24.04
1818
node-version:
19-
- '18'
19+
- '20'
2020
leia-test:
2121
- examples/7.1
2222
- examples/7.2

.github/workflows/pr-linter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-24.04
1313
node-version:
14-
- '18'
14+
- '20'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- ubuntu-24.04
1515
- macos-14
1616
node-version:
17-
- '18'
17+
- '20'
1818
steps:
1919
# Install deps and cache
2020
- name: Checkout code

.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

.npmignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.github
2+
.nyc_output
3+
coverage
24
docs
35
examples
46
guides

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
22

3+
* Optimized for `midcore`
4+
* Updated to [@lando/mariadb@1.6.3](https://github.com/lando/mariadb/releases/tag/v1.6.3).
5+
* Updated to [@lando/memcached@1.3.3](https://github.com/lando/mariadb/memcached/tag/v1.3.3).
6+
* Updated to [@lando/mssql@1.4.3](https://github.com/lando/mssql/releases/tag/v1.4.3).
7+
* Updated to [@lando/mysql@1.4.4](https://github.com/lando/mysql/releases/tag/v1.4.4).
8+
* Updated to [@lando/php@1.6.3](https://github.com/lando/php/releases/tag/v1.6.3).
9+
* Updated to [@lando/postgres@1.4.4](https://github.com/lando/postgres/releases/tag/v1.4.4).
10+
* Updated to [@lando/redis@1.2.3](https://github.com/lando/redis/releases/tag/v1.2.3).
11+
312
## v1.8.3 - [December 6, 2024](https://github.com/lando/laravel/releases/tag/v1.8.3)
413

514
* Updated the version index.md to get Docuverse page to build correctly.

builders/laravel-mariadb.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.
77
module.exports = {
88
name: 'laravel-mariadb',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
10+
builder: parent => class LaravelMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel-memcached.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoMemcached = require('@lando/memcached/builders/memcached.js');
77
module.exports = {
88
name: 'laravel-memcached',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
10+
builder: parent => class LaravelMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel-mssql.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoMssql = require('./../node_modules/@lando/mssql/builders/mssql.js');
77
module.exports = {
88
name: 'laravel-mssql',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelMssql extends LandoMssql.builder(parent, LandoMssql.config) {
10+
builder: parent => class LaravelMssql extends LandoMssql.builder(parent, LandoMssql.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel-mysql.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
77
module.exports = {
88
name: 'laravel-mysql',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelMysql extends LandoMysql.builder(parent, LandoMysql.config) {
10+
builder: parent => class LaravelMysql extends LandoMysql.builder(parent, LandoMysql.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel-nginx.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ module.exports = {
1313
builder: (parent, config) => class LaravelNginx extends PhpNginx.builder(parent, PhpNginx.config) {
1414
constructor(id, options = {}) {
1515
super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
16-
};
16+
}
1717
},
1818
};

builders/laravel-php.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ const loadScripts = options => {
2222
module.exports = {
2323
name: 'laravel-php',
2424
parent: '_appserver',
25-
builder: (parent, config) => class LaravelPhp extends LandoPhp.builder(parent, LandoPhp.config) {
25+
builder: parent => class LaravelPhp extends LandoPhp.builder(parent, LandoPhp.config) {
2626
constructor(id, options = {}, factory) {
2727
loadScripts(options);
2828
options.nginxServiceType = 'laravel-nginx';
2929
super(id, options, factory);
30-
};
30+
}
3131
},
3232
};

builders/laravel-postgres.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgr
77
module.exports = {
88
name: 'laravel-postgres',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
10+
builder: parent => class LaravelPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel-redis.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const LandoRedis = require('@lando/redis/builders/redis.js');
77
module.exports = {
88
name: 'laravel-redis',
99
parent: '_service',
10-
builder: (parent, config) => class LaravelRedis extends LandoRedis.builder(parent, LandoRedis.config) {
10+
builder: parent => class LaravelRedis extends LandoRedis.builder(parent, LandoRedis.config) {
1111
constructor(id, options = {}) {
1212
super(id, options, {services: _.set({}, options.name)});
13-
};
13+
}
1414
},
1515
};

builders/laravel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,6 @@ module.exports = {
300300

301301
// Send downstream
302302
super(id, _.merge({}, config, options));
303-
};
303+
}
304304
},
305305
};

docs/.vitepress/config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default defineConfig({
2020
],
2121
themeConfig: {
2222
multiVersionBuild: {
23-
satisfies: '>=1.6.0',
23+
satisfies: '>=1.8.0',
2424
},
2525
sidebar: sidebar(),
2626
},

docs/config.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ description: Learn how to configure the Lando Laravel recipe.
55

66
# Configuration
77

8-
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).
8+
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).
99

10-
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.
10+
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.
1111

1212
```yaml
1313
recipe: laravel
@@ -26,13 +26,13 @@ config:
2626
vhosts: SEE BELOW
2727
```
2828
29-
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).
29+
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).
3030
3131
## Choosing a php version
3232
3333
You can set `php` to any version that is available in our [php service](https://docs.lando.dev/plugins/php). However, you should consult the [Laravel requirements](https://laravel.com/docs/5.7/installation#web-server-configuration) to make sure that version is actually supported by Laravel itself.
3434

35-
The [recipe config](https://docs.lando.dev/core/v3/recipes.html#config) to set the Laravel recipe to use `php` version `7.1` is shown below:
35+
The [recipe config](https://docs.lando.dev/landofile/recipes.html#config) to set the Laravel recipe to use `php` version `7.1` is shown below:
3636

3737
```yaml
3838
recipe: laravel

docs/development.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,31 @@ npm run test:unit
9191

9292
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:
9393

94-
```md
95-
Start up tests
96-
--------------
94+
````md
95+
## Start up tests
9796

97+
```bash
9898
# Should start up successfully
9999
lando start
100+
```
100101

101-
Verification commands
102-
---------------------
102+
## Verification commands
103103

104+
```bash
104105
# Should be able to connect to all mariadb relationships
105106
lando mariadb main -e "show tables;"
106107
107-
Destroy tests
108-
-------------
108+
# Should do something else
109+
lando exec appserver -- some-command
110+
```
111+
112+
## Destroy tests
109113

114+
```bash
110115
# Should be able to destroy our app
111116
lando destroy -y
112117
```
118+
````
113119

114120
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.
115121

docs/getting-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ description: Learn how to get started with the Lando Laravel recipe.
99
Before you get started with this recipe, we assume that you have:
1010

1111
1. [Installed Lando](https://docs.lando.dev/getting-started/installation.html) and gotten familiar with [its basics](https://docs.lando.dev/cli/).
12-
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.
13-
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.
12+
2. [Initialized](https://docs.lando.dev/cli/init.html) a [Landofile](https://docs.lando.dev/landofile) for your codebase for use with this recipe.
13+
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.
1414

1515
## Quick Start
1616

docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Use Laravel on Lando for local development; powered by Docker and D
77

88
Laravel is The PHP Framework For Web Artisans.
99

10-
Lando offers a configurable [recipe](https://docs.lando.dev/core/v3/recipes.html) for developing [Laravel](https://laravel.com) apps.
10+
Lando offers a configurable [recipe](https://docs.lando.dev/landofile/recipes.html) for developing [Laravel](https://laravel.com) apps.
1111

1212
#### Features of this plugin:
1313

docs/public/.!78307!favicon.ico

Whitespace-only changes.

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict';
22

3-
module.exports = lando => {};
3+
module.exports = () => {};

netlify.toml

-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
skipPatterns = [ ".rss", ".gif", ".jpg" ]
1515
checkExternal = true
1616

17-
18-
1917
# Sets our asset optimization
2018
[build.processing.css]
2119
bundle = true
@@ -41,8 +39,6 @@
4139
[plugins.inputs.audits]
4240
output_path = "reports/lighthouse.html"
4341

44-
45-
4642
# We need this so preview environments and the base site look ok on their own
4743
[[redirects]]
4844
from = "/"

0 commit comments

Comments
 (0)