Skip to content

Commit

Permalink
Merge pull request #1127 from alphagov/node-16
Browse files Browse the repository at this point in the history
Update to Node 16 and drop support for Node 10
  • Loading branch information
joelanman authored Nov 2, 2021
2 parents bc13e4b + e3d33b4 commit 31c8edd
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [12.x, 14.x, 16.x]
os: [macos-latest, windows-latest, ubuntu-latest]

name: Node v${{ matrix.node-version }} (${{ matrix.os }})
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
16.13.0
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Unreleased

## Breaking changes

- [Pull request #1127: Update to Node 16 and drop support for Node 10](https://github.com/alphagov/govuk-prototype-kit/pull/1127)

## Fixes

- [Pull request #1133: Remove express-writer from package file](https://github.com/alphagov/govuk-prototype-kit/pull/1133)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ If you already installed a previous version of the Prototype Kit, you can [updat

## Requirements

node.js - version 14.x.x
node.js - version 16.x.x

## Install dependencies

Expand Down
16 changes: 8 additions & 8 deletions docs/documentation/install/requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GDS staff can install the software themselves with the Self Service app.

You'll need:

* Node.js 14.x.x
* Node.js 16.x.x
* Git Bash (if you're using Windows, see below)

## Terminal
Expand All @@ -37,9 +37,9 @@ Download [Git Bash (direct download)](https://git-scm.com/download/win).

Install with all the default options.

## Node.js version 14 LTS
## Node.js version 16 LTS

The kit is designed to work with Node.js version 14 LTS. The kit works with any 14.x.x version.
The kit is designed to work with Node.js version 16 LTS. The kit works with any 16.x.x version.

### Check if you have Node.js

Expand All @@ -49,21 +49,21 @@ node --version
```
If it says `command not found` or `Error 0x2 starting node.exe --version` you don’t have Node and will need to download and install it.

If the version number starts with 14 you have the correct version installed.
If the version number starts with 16 you have the correct version installed.

If it says another number such as `0.12` or `5.x.x`, you need to download and install version 14.
If it says another number such as `0.12` or `5.x.x`, you need to download and install version 16.

### Download and install Node.js

#### Mac / Windows users

[Download version 14 from the Node.js website.](https://nodejs.org/en/)
[Download version 16 from the Node.js website.](https://nodejs.org/en/)

Run the installer with all default options.

#### Linux users

[Follow the Linux instructions on the Node.js. website.](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) Make sure you get version 14.
[Follow the Linux instructions on the Node.js. website.](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) Make sure you get version 16.

### Once Node is installed

Expand All @@ -74,6 +74,6 @@ To check it is installed correctly you can again run:
node --version
```

If it’s installed correctly it should show a number starting with 14.
If it’s installed correctly it should show a number starting with 16.

<a href="install-the-kit.md" class="button">Next (install the kit)</a>
2 changes: 1 addition & 1 deletion gulp/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

const gulp = require('gulp')
const sass = require('gulp-sass')
const sass = require('gulp-sass')(require('node-sass'))
const sourcemaps = require('gulp-sourcemaps')
const path = require('path')
const fs = require('fs')
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "9.15.0",
"private": true,
"engines": {
"node": ">=10.0.0 <16.0.0"
"node": ">=12.0.0 <17.0.0"
},
"scripts": {
"start": "node start.js",
Expand All @@ -25,17 +25,18 @@
"express": "^4.17.1",
"express-session": "^1.13.0",
"fancy-log": "^1.3.3",
"govuk-elements-sass": "^3.1.3",
"govuk-frontend": "^3.14.0",
"govuk_frontend_toolkit": "^7.5.0",
"govuk_template_jinja": "^0.24.1",
"govuk-elements-sass": "^3.1.3",
"govuk-frontend": "^3.14.0",
"gulp": "^4.0.0",
"gulp-nodemon": "^2.5.0",
"gulp-sass": "^4.0.1",
"gulp-sass": "^5.0.0",
"gulp-sourcemaps": "^2.6.0",
"inquirer": "^7.1.0",
"keypather": "^3.0.0",
"marked": "^2.0.0",
"node-sass": "^6.0.1",
"notifications-node-client": "^4.7.2",
"nunjucks": "^3.2.1",
"portscanner": "^2.1.1",
Expand All @@ -47,7 +48,6 @@
"devDependencies": {
"glob": "^7.1.4",
"jest": "^25.2.7",
"node-sass": "^4.14.1",
"standard": "^14.3.3",
"supertest": "^4.0.2"
}
Expand Down

0 comments on commit 31c8edd

Please sign in to comment.