Skip to content

Commit

Permalink
Merge pull request #21 from nhsevidence/dependency-updates
Browse files Browse the repository at this point in the history
Update outdated dependencies
  • Loading branch information
ediblecode committed Dec 8, 2017
2 parents 5d6e6b0 + 3c3e294 commit d658996
Show file tree
Hide file tree
Showing 42 changed files with 11,256 additions and 20,527 deletions.
21 changes: 11 additions & 10 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"presets": [ "es2015" ],
"passPerPreset": true,
"plugins": [
["typecheck", {
"disable": { "production": true }
}],
"syntax-flow",
"transform-flow-strip-types",
"transform-es3-member-expression-literals",
"transform-es3-property-literals"
"presets": [
["env", {
"loose": true,
"targets": {
"browsers": ["last 2 versions", "ie >= 8"]
}
}]
],
plugins: [
"transform-runtime",
"transform-flow-strip-types"
]
}
1 change: 0 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Start type checking here
z
2 changes: 1 addition & 1 deletion .grunt-tasks/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
},
options: {
ignorePath: "src/javascripts/.eslintignore",
configFile: "src/javascripts/.eslintrc.json",
configFile: "src/javascripts/.eslintrc",
quiet: false,
format: "table"
}
Expand Down
2 changes: 1 addition & 1 deletion .grunt-tasks/mochaTest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
test: {
src: ["src/**/*.test.js", "test/**/*.spec.js"],
src: ["src/**/*.test.js", "test/**/*.test.js"],
options: {
require: ["babel-core/register", "mocha-clean", "./test/_setup.js"]
}
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = grunt => {
});

grunt.log.header = (msg) => {
if(/^Running \"newer.*/.test(msg)) return;
if(/^Running "newer.*/.test(msg)) return;

let taskName = msg.match(/"(.*)"/)[1];
grunt.log.writeln();
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ See https://www.nice.org.uk/accessibility for more information on NICE's policy.
| [src](src) | The main source |
| - [src/assets](src/assets) | Common static assets |
| - [src/components](src/components) | Components (SASS/JS/Nunjucks view/test) |
| - [src/javascripts](src/javascripts) | Main JavaScript source + [JSDoc config](src/javascripts/.jsdoc.json) and [ESLint config](src/javascripts/.eslintrc.json) |
| - [src/javascripts](src/javascripts) | Main JavaScript source + [JSDoc config](src/javascripts/.jsdoc.json) and [ESLint config](src/javascripts/.eslintrc) |
| - [src/stylesheets](src/stylesheets) | Main SASS + [SASS Lint config](src/stylesheets/.sass-lint.yml) + [SASS Doc custom theme](src/stylesheets/.sassdoc-nice-theme.js) |
| [server](server) | Express dev server, views etc for testing and building components |
| [test](test) | Test setup and unit tests |
Expand Down
Loading

0 comments on commit d658996

Please sign in to comment.