Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update deps and optimize for midcore #82

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-laravel-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/7.1
- examples/7.2
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Optimized for `midcore`
* Updated to [@lando/[email protected]](https://github.com/lando/mariadb/releases/tag/v1.6.3).
* Updated to [@lando/[email protected]](https://github.com/lando/mariadb/memcached/tag/v1.3.3).
* Updated to [@lando/[email protected]](https://github.com/lando/mssql/releases/tag/v1.4.3).
* Updated to [@lando/[email protected]](https://github.com/lando/mysql/releases/tag/v1.4.4).
* Updated to [@lando/[email protected]](https://github.com/lando/php/releases/tag/v1.6.3).
* Updated to [@lando/[email protected]](https://github.com/lando/postgres/releases/tag/v1.4.4).
* Updated to [@lando/[email protected]](https://github.com/lando/redis/releases/tag/v1.2.3).

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

* Updated the version index.md to get Docuverse page to build correctly.
Expand Down
4 changes: 2 additions & 2 deletions builders/laravel-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: 'laravel-mariadb',
parent: '_service',
builder: (parent, config) => class LaravelMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
builder: parent => class LaravelMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-memcached.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMemcached = require('@lando/memcached/builders/memcached.js');
module.exports = {
name: 'laravel-memcached',
parent: '_service',
builder: (parent, config) => class LaravelMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
builder: parent => class LaravelMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-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: 'laravel-mssql',
parent: '_service',
builder: (parent, config) => class LaravelMssql extends LandoMssql.builder(parent, LandoMssql.config) {
builder: parent => class LaravelMssql extends LandoMssql.builder(parent, LandoMssql.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-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: 'laravel-mysql',
parent: '_service',
builder: (parent, config) => class LaravelMysql extends LandoMysql.builder(parent, LandoMysql.config) {
builder: parent => class LaravelMysql extends LandoMysql.builder(parent, LandoMysql.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
2 changes: 1 addition & 1 deletion builders/laravel-nginx.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ module.exports = {
builder: (parent, config) => class LaravelNginx extends PhpNginx.builder(parent, PhpNginx.config) {
constructor(id, options = {}) {
super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-php.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ const loadScripts = options => {
module.exports = {
name: 'laravel-php',
parent: '_appserver',
builder: (parent, config) => class LaravelPhp extends LandoPhp.builder(parent, LandoPhp.config) {
builder: parent => class LaravelPhp extends LandoPhp.builder(parent, LandoPhp.config) {
constructor(id, options = {}, factory) {
loadScripts(options);
options.nginxServiceType = 'laravel-nginx';
super(id, options, factory);
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-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: 'laravel-postgres',
parent: '_service',
builder: (parent, config) => class LaravelPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
builder: parent => class LaravelPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/laravel-redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoRedis = require('@lando/redis/builders/redis.js');
module.exports = {
name: 'laravel-redis',
parent: '_service',
builder: (parent, config) => class LaravelRedis extends LandoRedis.builder(parent, LandoRedis.config) {
builder: parent => class LaravelRedis extends LandoRedis.builder(parent, LandoRedis.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
2 changes: 1 addition & 1 deletion builders/laravel.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,6 @@ module.exports = {

// Send downstream
super(id, _.merge({}, config, options));
};
}
},
};
2 changes: 1 addition & 1 deletion docs/.vitepress/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default defineConfig({
],
themeConfig: {
multiVersionBuild: {
satisfies: '>=1.6.0',
satisfies: '>=1.8.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 Laravel 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: laravel
Expand All @@ -26,13 +26,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 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.

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

```yaml
recipe: laravel
Expand Down
20 changes: 13 additions & 7 deletions docs/development.md
Original file line number Diff line number Diff line change
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 Laravel 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
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: Use Laravel on Lando for local development; powered by Docker and D

Laravel is The PHP Framework For Web Artisans.

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

#### Features of this plugin:

Expand Down
Empty file removed docs/public/.!78307!favicon.ico
Empty file.
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 = () => {};
4 changes: 0 additions & 4 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
skipPatterns = [ ".rss", ".gif", ".jpg" ]
checkExternal = true



# Sets our asset optimization
[build.processing.css]
bundle = true
Expand All @@ -41,8 +39,6 @@
[plugins.inputs.audits]
output_path = "reports/lighthouse.html"



# We need this so preview environments and the base site look ok on their own
[[redirects]]
from = "/"
Expand Down
Loading
Loading