Skip to content

Commit

Permalink
Merge pull request #140 from hmcts/update-dependencies-to-remove-vuln…
Browse files Browse the repository at this point in the history
…s-etc

Bumped minor versions and tidied up code
  • Loading branch information
John O'Neill authored Jan 30, 2020
2 parents 1afa93c + 33f8732 commit 14dbc2c
Show file tree
Hide file tree
Showing 6 changed files with 748 additions and 749 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ bash:
$(call compose, run --service-ports dev bash)

test lint:
$(call yarn, $@)
$(call yarn, $@)
20 changes: 9 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GOV.UK look and feel as a single easy import (at least that's the goal).

To use look-and-feel first add it to your `package.json`:

> yarn add @hmcts/look-and-feel
yarn add @hmcts/look-and-feel

Then configure it in your `app.js`:

Expand All @@ -27,18 +27,16 @@ Then configure it in your `app.js`:

All documentation is stored in the [docs] folder.

## Development
## Verification

We use the [Dockerfile] and [docker-compose.yml] to create a development
container used for running tests, etc.
Run tests:

yarn test

To start the container run:
Run Eslint:

```
make
```
yarn lint

Once complete you will be dropped in to a shell where you can run `yarn`.
Check for Vulnerabilities:

[Dockerfile]:https://github.com/hmcts/nodejs-one-per-page/blob/master/Dockerfile
[docker-compose.yml]:https://github.com/hmcts/nodejs-one-per-page/blob/master/docker-compose.yml
yarn audit
7 changes: 0 additions & 7 deletions docs/README.markdown

This file was deleted.

58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "@hmcts/look-and-feel",
"description": "One question per page apps made easy",
"version": "4.0.5",
"description": "One Question Per Page apps made easy",
"version": "4.1.0",
"main": "./src/main.js",
"engines": {
"node": ">=6.0"
},
"scripts": {
"lint": "eslint .",
"test": "NODE_PATH=. NODE_ENV=testing mocha 'test/**/*.test.js'"
},
"license": "MIT",
"publishConfig": {
"access": "public"
},
"dependencies": {
"babel-core": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"babel-preset-env": "^1.7.0",
"check-types": "^7.3.0",
"colors": "^1.1.2",
"colors": "^1.4.0",
"config": "^1.26.1",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"deepmerge": "2.0.1",
"diff-so-fancy": "^1.1.1",
"diff-so-fancy": "^1.2.7",
"exports-loader": "^0.7.0",
"express": "^4.15.3",
"express": "^4.17.1",
"express-nunjucks": "^2.2.3",
"extract-text-webpack-plugin": "^3.0.0",
"extract-text-webpack-plugin": "^3.0.2",
"govuk-frontend": "^2.6.0",
"hard-source-webpack-plugin": "^0.13.1",
"imports-loader": "github:webpack-contrib/imports-loader#abea1c24f84b1343f9a277e33c8d89c83c013274",
"jquery": "^3.2.1",
"js-yaml": "^3.9.1",
"node-sass": "^4.12.0",
"nunjucks": "^3.1.7",
"jquery": "^3.4.1",
"js-yaml": "^3.13.1",
"node-sass": "^4.13.1",
"nunjucks": "^3.2.0",
"sass-loader": "^6.0.6",
"serve-static": "^1.13.2",
"serve-static": "^1.14.1",
"style-loader": "^0.20.1",
"webpack": "^3.4.1",
"webpack": "^4.41.5",
"webpack-dev-middleware": "^2.0.4"
},
"devDependencies": {
"@hmcts/eslint-config": "^1.0.4",
"chai": "^4.1.1",
"@hmcts/eslint-config": "^1.4.0",
"chai": "^4.2.0",
"chai-fs": "^2.0.0",
"eslint": "^4.4.1",
"mocha": "^5.0.0"
},
"engines": {
"node": ">=6.0"
},
"scripts": {
"lint": "eslint .",
"test": "NODE_PATH=. NODE_ENV=testing mocha 'test/**/*.test.js'"
},
"license": "MIT",
"publishConfig": {
"access": "public"
}
}
1 change: 0 additions & 1 deletion src/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const browserSupport = require('./webpack/rules/browserSupport');
const govukFrontend = require('./sources/govukFrontend');
const lookAndFeel = require('./sources/lookAndFeel');
const path = require('path');
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');

const isDefined = obj => typeof obj !== 'undefined';
const defaultIfUndefined = (obj, _default) => {
Expand Down
Loading

0 comments on commit 14dbc2c

Please sign in to comment.