Merge pull request #209 from nhsuk/feature/updates

NPM dep and basic auth cred updates
nhsuk-archive · Dec 6, 2019 · 8ff94cb · 8ff94cb
2 parents d09946c + 8b7eb1d
commit 8ff94cb
Show file tree

Hide file tree

Showing 4 changed files with 1,177 additions and 793 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.25.0 / TBC
+===================
+- Update npm dependencies
+- Update basic auth creds
+
 0.24.0 / 2019-09-26
 ===================
 - Add footer link to beta cookie policy page 

diff --git a/README.md b/README.md
@@ -48,18 +48,18 @@ application will fail to start and an appropriate message will be displayed.
 Environment variables are used to set application level settings for each
 environment.
 
-| Variable                       | Description                                                                                        | Default                                   | Required |
-| :----------------------------- | :------------------------------------------------------------------------------------------------- | :---------------------------------------- | :------- |
-| `ADOBE_TRACKING_URL`           | [Adobe Analytics](https://www.adobe.com/analytics/adobe-analytics.html) Dynamic Tag Management URL |                                           | No       |
-| `BASIC_AUTH`                   | An MD5 encrypted [htpasswd](https://httpd.apache.org/docs/2.4/misc/password_encryptions.html)      | test:test                                 | No       |
-| `COOKIEBOT_SCRIPT_URL`         | The URL for the in-house implementation of Cookiebot                                               | //assets.nhs.uk/scripts/cookie-consent.js | No       |
-| `HOTJAR_ANALYTICS_TRACKING_ID` | [Hotjar](https://www.hotjar.com/) tracking id                                                      |                                           | No       |
-| `LOG_LEVEL`                    | Numeric [log level](https://github.com/trentm/node-bunyan#levels)                                  | Depends on `NODE_ENV`                     | No       |
-| `NODE_ENV`                     | Node environment                                                                                   | development                               | Yes      |
-| `PORT`                         | Server port                                                                                        | 3000                                      | Yes      |
-| `SEARCH_API_HOST`              | Host name for the [NHS Developer API](https://developer.api.nhs.uk/)                               | api.nhs.uk                                | Yes      |
-| `SEARCH_API_KEY`               | `subscription-key` for the [NHS Developer API](https://developer.api.nhs.uk/)                      |                                           | Yes      |
-| `SEARCH_API_VERSION`           | Version of the [NHS Developer API](https://developer.api.nhs.uk/)                                  | 1                                         | Yes      |
+| Variable                       | Description                                                                                        | Default                                             | Required |
+| :----------------------------- | :------------------------------------------------------------------------------------------------- | :----------------------------------------           | :------- |
+| `ADOBE_TRACKING_URL`           | [Adobe Analytics](https://www.adobe.com/analytics/adobe-analytics.html) Dynamic Tag Management URL |                                                     | No       |
+| `BASIC_AUTH`                   | An MD5 encrypted [htpasswd](https://httpd.apache.org/docs/2.4/misc/password_encryptions.html)      | See value set in Vault for `BASIC_AUTH` in defaults | No       |
+| `COOKIEBOT_SCRIPT_URL`         | The URL for the in-house implementation of Cookiebot                                               | //assets.nhs.uk/scripts/cookie-consent.js           | No       |
+| `HOTJAR_ANALYTICS_TRACKING_ID` | [Hotjar](https://www.hotjar.com/) tracking id                                                      |                                                     | No       |
+| `LOG_LEVEL`                    | Numeric [log level](https://github.com/trentm/node-bunyan#levels)                                  | Depends on `NODE_ENV`                               | No       |
+| `NODE_ENV`                     | Node environment                                                                                   | development                                         | Yes      |
+| `PORT`                         | Server port                                                                                        | 3000                                                | Yes      |
+| `SEARCH_API_HOST`              | Host name for the [NHS Developer API](https://developer.api.nhs.uk/)                               | api.nhs.uk                                          | Yes      |
+| `SEARCH_API_KEY`               | `subscription-key` for the [NHS Developer API](https://developer.api.nhs.uk/)                      |                                                     | Yes      |
+| `SEARCH_API_VERSION`           | Version of the [NHS Developer API](https://developer.api.nhs.uk/)                                  | 1                                                   | Yes      |
 
 ## FAQ
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sexual-health-service-finder",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "Helping to connect people to sexual health services.",
   "main": "app.js",
   "scripts": {
@@ -84,14 +84,14 @@
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-nhsuk": "^0.19.0",
     "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-json": "^1.3.2",
+    "eslint-plugin-json": "^2.0.1",
     "eslint-plugin-mocha": "^6.0.0",
     "eslint-watch": "^6.0.0",
     "husky": "^3.0.0",
     "mocha": "^6.1.4",
     "mocha-junit-reporter": "^1.23.1",
-    "nock": "^10.0.6",
-    "nodemon": "^1.19.0",
+    "nock": "^11.0.0",
+    "nodemon": "^2.0.1",
     "nyc": "^14.1.1"
   }
 }