Skip to content

Commit

Permalink
Upgrade npm, install concurrently (#779)
Browse files Browse the repository at this point in the history
Use concurrently to stop react-scripts from
hiding log messages before the server starts
  • Loading branch information
zakpatterson committed Dec 15, 2021
1 parent 86a49b0 commit 1668ddc
Show file tree
Hide file tree
Showing 11 changed files with 29,316 additions and 83 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: ['16']

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tauri-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 16
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::__VERSION__
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: ['16']

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.7.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM rust:1.51-slim-buster

RUN apt-get update && apt-get -y upgrade && apt-get install -y curl

# Install nvm, node, npm, and yarn
# Install nvm, node, npm
ARG NVM_DIR="/root/.nvm"
ARG NODE_VERSION=14.6.0
RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.38.0/install.sh | bash
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ To stop and remove running containers, run `docker-compose down`.

### Desktop application

To run, `npm run desktop` or `yarn run desktop`. This requires [rust and cargo][cargo-docs] to be available on PATH. To avoid a browser window being spawned in addition to the desktop window, just set the BROWSER environment variable as in: `BROWSER=none npm run desktop` or `BROWSER=none yarn desktop`.
To run, `npm run desktop`. This requires [rust and cargo][cargo-docs] to be available on PATH. To avoid a browser window being spawned in addition to the desktop window, just set the BROWSER environment variable as in: `BROWSER=none npm run desktop`.

To release, run `npm run desktop-release` or `yarn desktop-release`. This will produce executables for your current environment.

Expand Down
2 changes: 1 addition & 1 deletion docs/ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thank you for your interest in this project. The below should summarize the gene

## Stack and developer requirements

This project uses TypeScript and is built with [NPM 6][npm-install].
This project uses TypeScript and is built with [NPM 8][npm-install].

## Desktop application requirements

Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Before contributing please make sure to take a moment to read through the [Code

First, [join our Discord server](https://discord.gg/dAaz472mPz) and let us know that you want to contribute. This way we can point you in the right direction and help ensure your contribution will be as helpful as possible.

1. To set up your machine for development, review the [Architecture doc](ARCHITECTURE.md), for required links to set up NPM 6 and Rust.
1. To set up your machine for development, review the [Architecture doc](ARCHITECTURE.md), for required links to set up NPM 8 and Rust.

1. Next, fork and clone this repo.

Expand Down
Loading

0 comments on commit 1668ddc

Please sign in to comment.