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 #118

Merged
merged 7 commits into from
Dec 11, 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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Drupal Tests
name: Acquia Tests

on:
pull_request:
Expand All @@ -12,6 +12,7 @@ jobs:
ACQUIA_API_SECRET: ${{ secrets.ACQUIA_API_SECRET }}
RUN_ID: ${{ github.sha }}${{ github.run_id }}${{ github.run_number }}
strategy:
fail-fast: false
matrix:
leia-tests:
- acquia-custom
Expand All @@ -26,11 +27,11 @@ jobs:
- acquia-default
- acquia-xdebug
lando-version:
- 3-edge-slim
- 3-edge
os:
- ubuntu-24.04
node-version:
- '18'
- '20'

steps:
# Install deps and cache
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
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 @@ -13,7 +13,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
1 change: 0 additions & 1 deletion .tool-versions

This file was deleted.

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Optimized for `midcore`
* Updated to [@lando/[email protected]](https://github.com/lando/mailhog/releases/tag/v1.2.3).
* Updated to [@lando/[email protected]](https://github.com/lando/memcached/releases/tag/v1.3.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).

## v1.6.0 - [December 11, 2024](https://github.com/lando/acquia/releases/tag/v1.6.0)

* Optimized for `midcore`
Expand Down
14 changes: 0 additions & 14 deletions actions-lando-config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion builders/acquia-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,6 @@ module.exports = {

// Send downstream
super(id, _.merge({}, config, options));
};
}
},
};
4 changes: 2 additions & 2 deletions builders/acquia-mailhog.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const LandoMailhog = require('@lando/mailhog/builders/mailhog.js');
module.exports = {
name: 'acquia-mailhog',
parent: '_service',
builder: (parent, config) => class AcquiaMailhog extends LandoMailhog.builder(parent, LandoMailhog.config) {
builder: parent => class AcquiaMailhog extends LandoMailhog.builder(parent, LandoMailhog.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/acquia-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: 'acquia-memcached',
parent: '_service',
builder: (parent, config) => class AcquiaMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
builder: parent => class AcquiaMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
4 changes: 2 additions & 2 deletions builders/acquia-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: 'acquia-mysql',
parent: '_service',
builder: (parent, config) => class AcquiaMysql extends LandoMysql.builder(parent, LandoMysql.config) {
builder: parent => class AcquiaMysql extends LandoMysql.builder(parent, LandoMysql.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
2 changes: 1 addition & 1 deletion builders/acquia-php.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module.exports = {
options = _.merge({}, config, options);
loadScripts(options);
super(id, options, factory);
};
}
},
};
4 changes: 2 additions & 2 deletions builders/acquia-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: 'acquia-postgres',
parent: '_service',
builder: (parent, config) => class AcquiaPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
builder: parent => class AcquiaPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
constructor(id, options = {}) {
super(id, options, {services: _.set({}, options.name)});
};
}
},
};
2 changes: 1 addition & 1 deletion builders/acquia.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ module.exports = {
'push': getAcquiaPush({key, secret, account, appUuid}, keys),
};
super(id, 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.0.0',
satisfies: '>=1.5.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 Acquia 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. 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. 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: acquia
Expand All @@ -24,9 +24,9 @@ config:
xdebug: false
```

If you do not already have a [Landofile](https://docs.lando.dev/core/v3) for your Acquia site, we highly recommend you use [`lando init`](https://docs.lando.dev/cli/init.html) to get one as that will automatically populate the `ah_application_uuid`, `ah_site_group` and `php` version for you. Manually creating a Landofile with these things set correctly can be difficult and is *highly discouraged.*
If you do not already have a [Landofile](https://docs.lando.dev/landofile/) for your Acquia site, we highly recommend you use [`lando init`](https://docs.lando.dev/cli/init.html) to get one as that will automatically populate the `ah_application_uuid`, `ah_site_group` and `php` version for you. Manually creating a Landofile with these things set correctly can be difficult and is *highly discouraged.*

Note that if the above config options are not enough, all Lando recipes can be further [extended and overridden](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 overridden](https://docs.lando.dev/landofile/recipes.html#extending-and-overriding-recipes).

## Choosing a composer version

Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ description: Learn how to get started with the Lando Acquia 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
Empty file removed examples/.gitkeep
Empty file.
2 changes: 2 additions & 0 deletions examples/.lando.upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plugins:
"@lando/acquia": ../../..
9 changes: 3 additions & 6 deletions examples/acquia-7.4/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ This example exists primarily to test the following documentation:

* [Acquia Recipe](https://docs.lando.dev/acquia/config.html)

Start up tests
--------------
## Start up tests

Run the following commands to get up and running with this example.

Expand All @@ -15,8 +14,7 @@ lando poweroff
lando start
```

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

Run the following commands to validate things are rolling as they should.

Expand Down Expand Up @@ -47,8 +45,7 @@ lando ssh -s appserver -c "curl -L localhost" | grep "Hello Lando!"
lando ssh -s appserver -c "curl -L localhost/site-environment.php" | grep "LANDO"
```

Destroy tests
-------------
## Destroy tests

Run the following commands to trash this app like nothing ever happened.

Expand Down
9 changes: 3 additions & 6 deletions examples/acquia-8.0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ This example exists primarily to test the following documentation:

* [Acquia Recipe](https://docs.lando.dev/acquia/config.html)

Start up tests
--------------
## Start up tests

Run the following commands to get up and running with this example.

Expand All @@ -15,8 +14,7 @@ lando poweroff
lando start
```

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

Run the following commands to validate things are rolling as they should.

Expand Down Expand Up @@ -47,8 +45,7 @@ lando ssh -s appserver -c "curl -L localhost" | grep "Hello Lando!"
lando ssh -s appserver -c "curl -L localhost/site-environment.php" | grep "LANDO"
```

Destroy tests
-------------
## Destroy tests

Run the following commands to trash this app like nothing ever happened.

Expand Down
9 changes: 3 additions & 6 deletions examples/acquia-8.1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ This example exists primarily to test the following documentation:

* [Acquia Recipe](https://docs.lando.dev/acquia/config.html)

Start up tests
--------------
## Start up tests

Run the following commands to get up and running with this example.

Expand All @@ -15,8 +14,7 @@ lando poweroff
lando start
```

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

Run the following commands to validate things are rolling as they should.

Expand Down Expand Up @@ -47,8 +45,7 @@ lando ssh -s appserver -c "curl -L localhost" | grep "Hello Lando!"
lando ssh -s appserver -c "curl -L localhost/site-environment.php" | grep "LANDO"
```

Destroy tests
-------------
## Destroy tests

Run the following commands to trash this app like nothing ever happened.

Expand Down
9 changes: 3 additions & 6 deletions examples/acquia-8.2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ This example exists primarily to test the following documentation:

* [Acquia Recipe](https://docs.lando.dev/acquia/config.html)

Start up tests
--------------
## Start up tests

Run the following commands to get up and running with this example.

Expand All @@ -15,8 +14,7 @@ lando poweroff
lando start
```

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

Run the following commands to validate things are rolling as they should.

Expand Down Expand Up @@ -47,8 +45,7 @@ lando ssh -s appserver -c "curl -L localhost" | grep "Hello Lando!"
lando ssh -s appserver -c "curl -L localhost/site-environment.php" | grep "LANDO"
```

Destroy tests
-------------
## Destroy tests

Run the following commands to trash this app like nothing ever happened.

Expand Down
Loading
Loading