Skip to content

Commit d90c8af

Browse files
reynoldsalecreynoldsalec
committed
Merge branch 'main' into node-20
2 parents 844413e + 252f4e2 commit d90c8af

19 files changed

+9274
-4468
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-22.04
1313
node-version:
14-
- '16'
14+
- '18'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code
@@ -20,12 +20,12 @@ jobs:
2020
uses: actions/setup-node@v3
2121
with:
2222
node-version: ${{ matrix.node-version }}
23-
cache: yarn
24-
- name: Install Yarn dependencies
25-
run: yarn install --prefer-offline --frozen-lockfile
23+
cache: npm
24+
- name: Install NPM dependencies
25+
run: npm clean-install --prefer-offline --frozen-lockfile
2626

2727
# Run tests
2828
- name: Run linter
29-
run: yarn docs:lint
29+
run: npm run docs:lint
3030
- name: Test build
31-
run: yarn docs:build
31+
run: npm run docs:build

‎.github/workflows/pr-linter.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-22.04
1313
node-version:
14-
- '20'
14+
- '18'
1515
steps:
1616
# Install deps and cache
1717
- name: Checkout code
@@ -20,10 +20,10 @@ jobs:
2020
uses: actions/setup-node@v3
2121
with:
2222
node-version: ${{ matrix.node-version }}
23-
cache: yarn
24-
- name: Install Yarn dependencies
25-
run: yarn install --prefer-offline --frozen-lockfile
23+
cache: npm
24+
- name: Install NPM dependencies
25+
run: npm clean-install --prefer-offline --frozen-lockfile
2626

2727
# Run the linter
2828
- name: Run code linter
29-
run: yarn lint
29+
run: npm run lint

‎.github/workflows/pr-node-tests.yml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
- examples/10
1616
- examples/12
1717
- examples/14
18-
- examples/16
18+
- examples/18
1919
- examples/18
2020
- examples/19
2121
- examples/20
2222
lando-version:
23-
- 3-dev
23+
- 3-dev-slim
2424
os:
2525
- ubuntu-22.04
2626
node-version:
27-
- '20'
27+
- '18'
2828
steps:
2929
- name: Checkout code
3030
uses: actions/checkout@v3
@@ -33,20 +33,23 @@ jobs:
3333
with:
3434
node-version: ${{ matrix.node-version }}
3535
registry-url: https://registry.npmjs.org
36-
cache: yarn
37-
- name: Install Yarn dependencies
38-
run: yarn install --prefer-offline --frozen-lockfile
36+
cache: npm
37+
- name: Install NPM dependencies
38+
run: npm clean-install --prefer-offline --frozen-lockfile
39+
- name: Bundle Deps
40+
uses: lando/prepare-release-action@v3
41+
with:
42+
lando-plugin: true
43+
version: dev
44+
sync: false
3945
- name: Setup lando ${{ matrix.lando-version }}
4046
uses: lando/setup-lando@v2
4147
with:
4248
lando-version: ${{ matrix.lando-version }}
4349
config: |
44-
plugins.@lando/node=/home/runner/work/node/node
50+
setup.skipCommonPlugins=true
51+
setup.plugins.@lando/node=/home/runner/work/node/node
4552
telemetry: false
46-
- name: Verify Lando works and we are dogfooding this plugin for tests
47-
run: |
48-
lando version
49-
lando config --path plugins | grep node | grep /home/runner/work/node/node || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
5053
- name: Run Leia Tests
5154
uses: lando/run-leia-action@v2
5255
with:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- ubuntu-22.04
1414
- macos-12
1515
node-version:
16-
- '20'
16+
- '18'
1717
steps:
1818
# Install deps and cache
1919
- name: Checkout code
@@ -22,10 +22,10 @@ jobs:
2222
uses: actions/setup-node@v3
2323
with:
2424
node-version: ${{ matrix.node-version }}
25-
cache: yarn
26-
- name: Install Yarn dependencies
27-
run: yarn install --prefer-offline --frozen-lockfile
25+
cache: npm
26+
- name: Install NPM dependencies
27+
run: npm clean-install --prefer-offline --frozen-lockfile
2828

2929
# Run unit tests
3030
- name: Run unit tests
31-
run: yarn test:unit
31+
run: npm run test:unit

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
os:
1818
- ubuntu-22.04
1919
node-version:
20-
- '16'
20+
- '18'
2121
steps:
2222
# Install deps and cache
2323
- name: Checkout code
@@ -27,19 +27,19 @@ jobs:
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929
registry-url: https://registry.npmjs.org
30-
cache: yarn
31-
- name: Install Yarn dependencies
32-
run: yarn install --prefer-offline --frozen-lockfile
30+
cache: npm
31+
- name: Install NPM dependencies
32+
run: npm clean-install --prefer-offline --frozen-lockfile
3333

3434
# Let's do tests rq just to make sure we dont push something that is fundamentally broken
3535
- name: Lint code
36-
run: yarn lint
36+
run: npm run lint
3737
- name: Run unit tests
38-
run: yarn test:unit
38+
run: npm run test:unit
3939

4040
# Prepare release.
4141
- name: Prepare release
42-
uses: lando/prepare-release-action@v2
42+
uses: lando/prepare-release-action@v3
4343
with:
4444
lando-plugin: true
4545

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ _site
4040
docs/.vuepress/.cache
4141
docs/.vuepress/.temp
4242
docs/.vuepress/dist
43+
yarn.lock

‎.lando.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ services:
33
node:
44
type: node:18
55
build:
6-
- yarn install
6+
- npm install
77
scanner: false
88
ssl: false
99
sslExpose: false
1010
tooling:
1111
node:
1212
service: node
13-
yarn:
13+
npm:
1414
service: node

‎CHANGELOG.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
1-
## v0.9.1 - [Nov 1, 2023](https://github.com/lando/node/releases/tag/v0.9.0)
2-
* Add support for Node 20.
1+
## v1.1.0 - [January 2, 2023](https://github.com/lando/node/releases/tag/v1.1.0)
2+
* Added support for Node 20. [#47](https://github.com/lando/node/issues/47)
3+
4+
## v1.0.0 - [December 7, 2023](https://github.com/lando/node/releases/tag/v1.0.0)
5+
* Dialed fully for `lando update`
6+
7+
## v0.10.0 - [Dec 6, 2023](https://github.com/lando/node/releases/tag/v0.10.0)
8+
9+
* Refactored plugin structure and isolated. [#59](https://github.com/lando/node/pull/59)
10+
* Updated dependencies.
311

412
## v0.9.0 - [July 3, 2023](https://github.com/lando/node/releases/tag/v0.9.0)
13+
514
* Removed bundle-dependencies and version-bump-prompt from plugin.
615
* Updated package to use prepare-release-action.
716
* Updated documentation to reflect new release process.
817

918
## v0.8.1 - [January 26, 2023](https://github.com/lando/node/releases/tag/v0.8.1)
19+
1020
* Add support for Node 13/15/17.
1121

1222
## v0.8.0 - [January 26, 2023](https://github.com/lando/node/releases/tag/v0.8.0)
23+
1324
* Add support for Node 18 and 19.
1425

1526
## v0.7.0 - [December 12, 2022](https://github.com/lando/node/releases/tag/v0.7.0)
27+
1628
* Added bundle-dependencies to release process.
1729
* Fixed bug in plugin dogfooding test.
1830

services/node/builder.js renamed to builders/node.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
// Modules
44
const _ = require('lodash');
5-
const utils = require('./../../lib/utils');
65

76
// Constants
87
const supportedVersions = [
@@ -217,8 +216,8 @@ module.exports = {
217216
options.moreHttpPorts.push(options.port);
218217
// Add our npm things to run step
219218
if (!_.isEmpty(options.globals)) {
220-
const commands = utils.getInstallCommands(options.globals, pkger, ['npm', 'install', '-g']);
221-
utils.addBuildStep(commands, options._app, options.name);
219+
const commands = require('../utils/get-install-commands')(options.globals, pkger, ['npm', 'install', '-g']);
220+
require('../utils/add-build-step')(commands, options._app, options.name);
222221
}
223222
// Set the sport and moreHttpPorts if ssl is numeric
224223
if (options.ssl) {

‎docs/.vuepress/public/.!80031!favicon.ico‎

Whitespace-only changes.

0 commit comments

Comments
 (0)