Skip to content

Commit

Permalink
ISSUE-1616: Upgrade to node 16 (#1622)
Browse files Browse the repository at this point in the history
  • Loading branch information
keeler authored Jun 4, 2022
1 parent 0c02a92 commit 246785e
Show file tree
Hide file tree
Showing 8 changed files with 9,787 additions and 94 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
name: Run tests

strategy:
fail-fast: false
matrix:
node_version:
- 12
- 14
- 16

runs-on: ubuntu-latest

Expand All @@ -33,8 +34,13 @@ jobs:
with:
node-version: ${{matrix.node_version}}

# See https://github.com/npm/cli/issues/2610
- name: Workaround for Node 14
if: matrix.node_version == '14'
run: sed -i 's/git+ssh/git+https/g' package-lock.json

- name: Install
run: npm install
run: npm ci

- name: Test
run: npm test
Expand Down Expand Up @@ -78,10 +84,10 @@ jobs:
- name: Setup
uses: actions/setup-node@v2.5.1
with:
node-version: 12
node-version: 16

- name: Install
run: npm install --ignore-scripts
run: npm ci --ignore-scripts

- name: Run ESLint
run: npm run lint
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
16.15.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN chown dr4ftuser -R .
USER dr4ftuser

# Install the dependencies
RUN npm install
RUN npm ci

# Publish the port 1337
EXPOSE 1337
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ It supports all their features, and many more.

### Native

1) Install [Node.js](https://nodejs.org/en/download/) >= 12.0.0
1) Install [Node.js](https://nodejs.org/en/download/) >= 16.0.0. Alternatively, install [nvm](https://github.com/nvm-sh/nvm) and then run `nvm use` in this repo, which will install the correct Node version for this repo as defined in the `.nvmrc` file.
2) Run<br>
`$ npm install`<br>
`$ npm ci`<br>
`$ npm run build`<br>
`$ npm start`
3) Visit [http://localhost:1337](http://localhost:1337)
Expand Down Expand Up @@ -131,7 +131,7 @@ Breakpoints for the frontend should be set in your browser console.

Be a part of this project! You can run the test using the following.

1. Install dependencies from package.json by running `npm install`
1. Install dependencies from package.json by running `npm ci`
2. Run the test via `npm test`
3. Make some fun new modules!

Expand Down
2 changes: 1 addition & 1 deletion config/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const joi = require("@hapi/joi");
const joi = require("joi");

const envVarsSchema = joi.object({
PORT: joi.number()
Expand Down
2 changes: 1 addition & 1 deletion config/logger.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const joi = require("@hapi/joi");
const joi = require("joi");

const envVarsSchema = joi.object({
LOGGER_LEVEL: joi.string()
Expand Down
Loading

0 comments on commit 246785e

Please sign in to comment.