Skip to content

Commit

Permalink
npmify (#80)
Browse files Browse the repository at this point in the history
* npmify

* npmify part 2
  • Loading branch information
pirog authored Dec 5, 2023
1 parent 9103f2f commit 5d896f3
Show file tree
Hide file tree
Showing 14 changed files with 25,070 additions and 6,886 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr-core-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile
- name: Bundle Deps
uses: lando/prepare-release-action@v2
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr-db-tools-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
cache: npm
- name: Install dependencies
run: |
yarn install --prefer-offline --frozen-lockfile
npm clean-install --prefer-offline --frozen-lockfile
cd cli
yarn install --prefer-offline --frozen-lockfile
npm clean-install --prefer-offline --frozen-lockfile
# This block should eventually become use lando/actions-hyperdrive@v2
- name: Verify Docker dependencies
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
ls -lsa ./node_modules/@lando/core
ls -lsa ./node_modules/@lando/core | grep COPY_TEST
- name: Package CLI
run: cd /tmp/cli && yarn cli:build
run: cd /tmp/cli && npm run cli:build
- name: Replace source CLI with packaged one
run: sudo mv /tmp/cli/dist/@lando/cli /usr/local/bin/lando
- name: Verify we can run the packaged CLI
Expand All @@ -83,4 +83,4 @@ jobs:
# This block should eventually become use lando/actions-leia@v2
- name: Run leia tests
shell: bash
run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
run: npm run leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
10 changes: 5 additions & 5 deletions .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run tests
- name: Run linter
run: yarn docs:lint
run: npm run docs:lint
- name: Test build
run: yarn docs:build
run: npm run docs:build
8 changes: 4 additions & 4 deletions .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run the linter
- name: Run code linter
run: yarn lint
run: npm run lint
6 changes: 3 additions & 3 deletions .github/workflows/pr-plugin-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile
- name: Bundle Deps
uses: lando/prepare-release-action@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Run unit tests
- name: Run unit tests
run: yarn test:unit
run: npm run test:unit
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile
cache: npm
- name: Install dependencies
run: npm clean-install --prefer-offline --frozen-lockfile

# Let's do tests rq just to make sure we dont push something that is fundamentally broken
- name: Lint code
run: yarn lint
run: npm run lint
- name: Run unit tests
run: yarn test:unit
run: npm run test:unit
- name: Prepare Release
uses: lando/prepare-release-action@v2
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ docs/.vuepress/dist

# lando
.lando/id

# yarn
yarn.lock
4 changes: 2 additions & 2 deletions .lando.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
ports:
- 8080:8080
build:
- yarn install
- npm install
scanner: false
ssl: false
sslExpose: false
Expand All @@ -19,5 +19,5 @@ tooling:
service: cli
vuepress:
service: cli
yarn:
npm:
service: cli
40 changes: 39 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v3.21.0-alpha.1 - [December 4, 2023](https://github.com/lando/core/releases/tag/v3.21.0-alpha.1)
## v3.21.0-alpha.2 - [December 4, 2023](https://github.com/lando/core/releases/tag/v3.21.0-alpha.2)

> This will begin to set things right
Expand Down Expand Up @@ -28,13 +28,51 @@
* Removed lingering and dangling should-now-be-in-plugins code eg `_drupaly.js`
* Reorganized core to be more like `@lando/core-next` (eg Lando 4)
* Switched (fully, finally) from `github` to `@octokit/rest`
* Switched plugin package manager to `npm`
* Removed `github` dependency
* Removed `mkdirp` dependency

### DEPRECATIONS

* DEPRECATED `app.addWarning` in favor of `app.addMessage`

## v3.21.0-alpha.1 - [December 4, 2023](https://github.com/lando/core/releases/tag/v3.21.0-alpha.1)

> This will begin to set things right
### New Features

* Added `autostart` Docker Engine support to Linux
* Added `lando update` command so Lando and installed plugins can self-update
* Added hidden `lando setup` command to replace package installers
* Added hidden `lando plugin-add` command to install external plugins
* Added hidden `lando plugin-remove` command to remove external plugins
* Improved `lando version` to give more total version information

### Fixes

* Fixed broken Docker Compose|Desktop|Engine links
* Fixed bug causing `lando` services to report `Up` when they actually `Exited` non-zero
* Fixed longstanding bug causing some debug output to print to `stdout` instead of `stderr`
* Improved post-start status message granularity, they can one of `tip|info|warn|error` now
* Improved post-start status message accessibility
* Improved "Update Available" warning to be less **INTENSE**, is now a post-start info message

### Internal

* Added `app.addMessage` for more granular and accessible post-start app status reporting
* Bumped minimum `node` version to `18`
* Bumped supported Docker Desktop version to `>4 <4.26`
* Removed lingering and dangling should-now-be-in-plugins code eg `_drupaly.js`
* Reorganized core to be more like `@lando/core-next` (eg Lando 4)
* Switched (fully, finally) from `github` to `@octokit/rest`
* Switched plugin package manager to `npm`
* Removed `github` dependency
* Removed `mkdirp` dependency

### DEPRECATIONS

* DEPRECATED `app.addWarning` in favor of `app.addMessage`

## v3.20.4 - [October 6, 2023](https://github.com/lando/core/releases/tag/v3.20.4)

Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build]
base = "./"
publish = "./docs/.vuepress/dist"
command = "yarn docs:build"
command = "npm run docs:build"

# Sets our asset optimization
[build.processing.css]
Expand Down
Loading

0 comments on commit 5d896f3

Please sign in to comment.