diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 90c3ea3b5754b79953b2bc40aa87dd831dfce4af..5bbe28b0f742e39b177283fbe548da988b1438fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@ Contribuer au projet
Documentation haut-niveau, décrivant le projet du point de vue développeur de façon globale, sans rentrer dans le détail du code.
-Une documentation plus précise, générée par JSDoc à partir des commentaires dans le code-même, [est disponible dans ./doc](./doc/index.html). Pour la générer, exécuter `npm run doc`.
+Il y a aussi une documentation plus précise, générée par JSDoc à partir des commentaires dans le code-même. Pour la générer, exécuter `npm run doc`. Elle sera alors [disponible dans ./doc](./doc/index.html).
## Description et actualité des branches
@@ -154,12 +154,10 @@ Il est ~~préférable~~ nécessaire de l'installer **globalement** avec `npm ins
Lors d'une validation ESLint, un ensemble de règles de style sont appliquées, elles sont configurables dans le fichier `.eslintrc.json`. Par exemple, actuellement, la config ESLint impose d'utiliser quatre espaces pour les indentations et d'utiliser des points-virgule en fin de ligne.
Les options de configuration sont bien expliquées dans la [doc dédiée](https://eslint.org/docs/rules/).
- Pour faire valider les fichiers source par ESLint, utiliser `npm run lint` [^lint-script]. L'option `--fix` permet de corriger les fichiers.
+ Pour faire valider les fichiers source par ESLint, utiliser `npm run lint` (raccourci pour `eslint --ext .js --ext .ts src/ `). L'option `--fix` permet de corriger les fichiers : `npm run lint -- --fix`.
Les différentes façon d'exécuter une validation sont bien expliquées dans la [doc dédiée](https://eslint.org/docs/user-guide/command-line-interface).
-[^lint-script]: qui fait appel au script `eslint --ext .js --ext .ts src/ `, comme défini dans le [`package.json`](./package.json)
-
-Sinon, si vous utilisez Atom ou Visual Studio Code pour éditer votre code, il existe des plugins qui font tourner ESLint en _live_ sur le code et vérifient que tout est en ordre.
+Sinon, si vous utilisez Atom ou Visual Studio Code pour éditer votre code, il existe des plugins qui font tourner ESLint _en live_ sur le code et vous préviennent quand il y a une faute de style.
### nodemon
diff --git a/package-lock.json b/package-lock.json
index f3fec69d13ae57600500bf3a2475495ef242efbf..0737626720b90a0c81643266eab5ea0d51ca1528 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,9 +23,9 @@
}
},
"@apollographql/graphql-playground-html": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.4.tgz",
- "integrity": "sha512-gwvaQO6/Hv4DEwhDLmmu2tzCU9oPjC5Xl9Kk8Yd0IxyKhYLlLalmkMMjsZLzU5H3fGaalLD96OYfxHL0ClVUDQ=="
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz",
+ "integrity": "sha512-lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ=="
},
"@babel/cli": {
"version": "7.1.5",
@@ -2908,12 +2908,22 @@
}
},
"apollo-cache-control": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.2.tgz",
- "integrity": "sha512-/fhgCWGEoTsgyA83usy/1NvJWi6hbD4rSGO5jvyNNtMZ9ledOvKUvIdzSQ1r5hxK5yds/eehWXhMJ4Pu200qrQ==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.3.tgz",
+ "integrity": "sha512-X6JhKfIaMLfl2jpsK/880BflXA+2lmm2sAsOZL4Bn2VrMsDtOssI1Ij9vNRbch9k9cA4WJvKed7Sql/wUIa1Eg==",
"requires": {
"apollo-server-env": "2.2.0",
- "graphql-extensions": "0.3.2"
+ "graphql-extensions": "0.3.3"
+ },
+ "dependencies": {
+ "graphql-extensions": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.3.tgz",
+ "integrity": "sha512-pudOaHq7Ok+rh1ElzlqFaoYZWGefUNsqn/jX6eKns7rl0VHuB4qZBfhpVLTpquJpM6Y19/hsCYZNPfnUVMFIiA==",
+ "requires": {
+ "@apollographql/apollo-tools": "^0.2.6"
+ }
+ }
}
},
"apollo-codegen": {
@@ -3078,24 +3088,34 @@
}
},
"apollo-datasource": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.0.tgz",
- "integrity": "sha512-WJM9Ix3uogIfAG7mjL1NZQM9+45rcikn4mPWhE1Iuyw2+Y857J3uKJqQgF5h9Fg64SlCJh9u5WL3N7N5mg1fVw==",
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.1.tgz",
+ "integrity": "sha512-r185+JTa5KuF1INeTAk7AEP76zwMN6c8Ph1lmpzJMNwBUEzTGnLClrccCskCBx4SxfnkdKbuQdwn9JwCJUWrdg==",
"requires": {
- "apollo-server-caching": "0.2.0",
+ "apollo-server-caching": "0.2.1",
"apollo-server-env": "2.2.0"
}
},
"apollo-engine-reporting": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.2.tgz",
- "integrity": "sha512-W6zBTypI2ZLe9ZpMI4EasyXJP2WG8CpxYOU3Q4iuCKh8HYJqrQC5QVFXRF7TRBQTE6tc1seYnAHdgqv0ozxBrw==",
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.3.tgz",
+ "integrity": "sha512-VkjiifHMHIAxydXecT+ck0WtqpFIsMlylKnKeuNAXfIfAXHX/JYtLhbArTTyhDunLrphMiUewfFv9P0K+aX2jw==",
"requires": {
"apollo-engine-reporting-protobuf": "0.1.0",
"apollo-server-env": "2.2.0",
"async-retry": "^1.2.1",
- "graphql-extensions": "0.3.2",
+ "graphql-extensions": "0.3.3",
"lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "graphql-extensions": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.3.tgz",
+ "integrity": "sha512-pudOaHq7Ok+rh1ElzlqFaoYZWGefUNsqn/jX6eKns7rl0VHuB4qZBfhpVLTpquJpM6Y19/hsCYZNPfnUVMFIiA==",
+ "requires": {
+ "@apollographql/apollo-tools": "^0.2.6"
+ }
+ }
}
},
"apollo-engine-reporting-protobuf": {
@@ -3145,19 +3165,18 @@
}
},
"apollo-server-caching": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.0.tgz",
- "integrity": "sha512-/v7xWEcyyahs3hwX4baH/GekuHz3LRt9NoIYwg869G1eeqjuwY6NsowRIujZ100anJQwm9v5A9/sLtHBFvbgYg==",
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.1.tgz",
+ "integrity": "sha512-+U9F3X297LL8Gqy6ypfDNEv/DfV/tDht9Dr2z3AMaEkNW1bwO6rmdDL01zYxDuVDVq6Z3qSiNCSO2pXE2F0zmA==",
"requires": {
- "lru-cache": "^4.1.3"
+ "lru-cache": "^5.0.0"
},
"dependencies": {
"lru-cache": {
- "version": "4.1.4",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
- "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"requires": {
- "pseudomap": "^1.0.2",
"yallist": "^3.0.2"
}
},
@@ -3169,23 +3188,23 @@
}
},
"apollo-server-core": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.2.tgz",
- "integrity": "sha512-F6d4u5m1rJB4ucpLPGCoa9Dvo5OjGMIGdAzT9A35yOvlFWwvIR46jGmYmGmNp4Qx852rb1axSZVzNy7k/Dix0w==",
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.5.tgz",
+ "integrity": "sha512-obz6VSJI7vSR+pEAZFwqOe/HAOuF4l1fYU9WNtVcQvxaKhykDgcu+byO0sXrOf/iB7uUIyaFdhinwzuwkqB8XQ==",
"requires": {
"@apollographql/apollo-tools": "^0.2.6",
"@apollographql/apollo-upload-server": "^5.0.3",
- "@apollographql/graphql-playground-html": "^1.6.4",
+ "@apollographql/graphql-playground-html": "^1.6.6",
"@types/ws": "^6.0.0",
- "apollo-cache-control": "0.3.2",
- "apollo-datasource": "0.2.0",
- "apollo-engine-reporting": "0.1.2",
- "apollo-server-caching": "0.2.0",
+ "apollo-cache-control": "0.3.3",
+ "apollo-datasource": "0.2.1",
+ "apollo-engine-reporting": "0.1.3",
+ "apollo-server-caching": "0.2.1",
"apollo-server-env": "2.2.0",
"apollo-server-errors": "2.2.0",
- "apollo-server-plugin-base": "0.1.2",
- "apollo-tracing": "0.3.2",
- "graphql-extensions": "0.3.2",
+ "apollo-server-plugin-base": "0.1.5",
+ "apollo-tracing": "0.3.3",
+ "graphql-extensions": "0.3.5",
"graphql-subscriptions": "^1.0.0",
"graphql-tag": "^2.9.2",
"graphql-tools": "^4.0.0",
@@ -3248,18 +3267,18 @@
"integrity": "sha512-gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="
},
"apollo-server-express": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.2.tgz",
- "integrity": "sha512-DPxHOUd0Waztuix0r1ed6xfdlR7P7RzIXPmybhPXj1bZJtYHz5If0ngYNjtFqnXVrC8aSRtMz108SQUAnduYwA==",
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.5.tgz",
+ "integrity": "sha512-2SNlY8CNmYlbRJfn0iK4wesjqX3X9YIFhyok4sQ80n/gm24QMwZkFcPP+NLv+1lxvwyJYMwEFQPIBvkLRoUFXQ==",
"requires": {
"@apollographql/apollo-upload-server": "^5.0.3",
- "@apollographql/graphql-playground-html": "^1.6.4",
+ "@apollographql/graphql-playground-html": "^1.6.6",
"@types/accepts": "^1.3.5",
"@types/body-parser": "1.17.0",
"@types/cors": "^2.8.4",
"@types/express": "4.16.0",
"accepts": "^1.3.5",
- "apollo-server-core": "2.2.2",
+ "apollo-server-core": "2.2.5",
"body-parser": "^1.18.3",
"cors": "^2.8.4",
"graphql-subscriptions": "^1.0.0",
@@ -3318,17 +3337,27 @@
}
},
"apollo-server-plugin-base": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.2.tgz",
- "integrity": "sha512-+uicMcNctlP6YwIhzLLEycZzao/810OSzcxgPYKItXr5lGa1GuHD7sRIWldT3YoSdpw6Gal2lBuw6/DmnoDsPg=="
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.5.tgz",
+ "integrity": "sha512-be77TaN9l16ZVG1tBl8Re3lJfUZ6B2T3DdEXnu6fjQwUuBdu3Y4MQR6B1TLhbuTb9DUkcSKZ3h5C55dIjvb2Vg=="
},
"apollo-tracing": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.2.tgz",
- "integrity": "sha512-YwN1m1k0JJsxGh0QWsEM3OLnyem0GT2tZnGeO2OogCr6dH5lE0SjKPc6UzpcI/3fPyxRrx5QvpUiP+DJeehhTA==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.3.tgz",
+ "integrity": "sha512-gsTYgDVjtMlnomPq46aky7yk8XshCQfj9rxalCCismLlMomVW44fq+8GKQnZIkFOwiAsazRy4dzZ0cBbygA9sA==",
"requires": {
"apollo-server-env": "2.2.0",
- "graphql-extensions": "0.3.2"
+ "graphql-extensions": "0.3.3"
+ },
+ "dependencies": {
+ "graphql-extensions": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.3.tgz",
+ "integrity": "sha512-pudOaHq7Ok+rh1ElzlqFaoYZWGefUNsqn/jX6eKns7rl0VHuB4qZBfhpVLTpquJpM6Y19/hsCYZNPfnUVMFIiA==",
+ "requires": {
+ "@apollographql/apollo-tools": "^0.2.6"
+ }
+ }
}
},
"apollo-utilities": {
@@ -6813,9 +6842,9 @@
}
},
"graphql-extensions": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.2.tgz",
- "integrity": "sha512-eIAWwtZNlUAHtHF6uNP6+4M+GCksqUYfNBxW5rTAlCB4/ZcuIvchVtN1CgVM7MooW3akPM1Eci11WyeXvgOugQ==",
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.5.tgz",
+ "integrity": "sha512-jpWSUIr27iOTR5JYu+dEMz74oZhOj8Xy+6lNopluiIu+ObEVSHW0czb2Jlcy3rOSTEPcibnpStO4F4/64IBqeQ==",
"requires": {
"@apollographql/apollo-tools": "^0.2.6"
}
@@ -8816,16 +8845,16 @@
}
},
"nodemon": {
- "version": "1.18.6",
- "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.6.tgz",
- "integrity": "sha512-4pHQNYEZun+IkIC2jCaXEhkZnfA7rQe73i8RkdRyDJls/K+WxR7IpI5uNUsAvQ0zWvYcCDNGD+XVtw2ZG86/uQ==",
+ "version": "1.18.7",
+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.18.7.tgz",
+ "integrity": "sha512-xuC1V0F5EcEyKQ1VhHYD13owznQbUw29JKvZ8bVH7TmuvVNHvvbp9pLgE4PjTMRJVe0pJ8fGRvwR2nMiosIsPQ==",
"dev": true,
"requires": {
"chokidar": "^2.0.4",
"debug": "^3.1.0",
"ignore-by-default": "^1.0.1",
"minimatch": "^3.0.4",
- "pstree.remy": "^1.1.0",
+ "pstree.remy": "^1.1.2",
"semver": "^5.5.0",
"supports-color": "^5.2.0",
"touch": "^3.1.0",
@@ -11499,9 +11528,9 @@
"dev": true
},
"ts-loader": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.0.tgz",
- "integrity": "sha512-lGSNs7szRFj/rK9T1EQuayE3QNLg6izDUxt5jpmq0RG1rU2bapAt7E7uLckLCUPeO1jwxCiet2oRaWovc53UAg==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.1.tgz",
+ "integrity": "sha512-fDDgpBH3SR8xlt2MasLdz3Yy611PQ/UY/KGyo7TgXhTRU/6sS8uGG0nJYnU1OdFBNKcoYbId1UTNaAOUn+i41g==",
"dev": true,
"requires": {
"chalk": "^2.3.0",
@@ -12011,9 +12040,9 @@
}
},
"webpack": {
- "version": "4.26.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.26.0.tgz",
- "integrity": "sha512-J/dP9SJIc5OtX2FZ/+U9ikQtd6H6Mcbqt0xeXtmPwYGDKf8nkbOQQA9KL2Y0rJOsN1Al9Pdn+/j63X58ub8gvQ==",
+ "version": "4.26.1",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.26.1.tgz",
+ "integrity": "sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.7.11",
@@ -12059,9 +12088,9 @@
}
},
"tapable": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz",
- "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
+ "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
"dev": true
}
}
diff --git a/package.json b/package.json
index 8ad228be141383ec8234b77a04b0ef9b7e32008e..fb7fd511214a9ff398c0accb7c1414f80f0beb0a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"author": "Binet Réseau",
"license": "ISC",
"dependencies": {
- "apollo-server-express": "^2.2.2",
+ "apollo-server-express": "^2.2.5",
"body-parser": "^1.18.3",
"colors": "^1.3.2",
"connect-ensure-login": "^0.1.1",
@@ -76,10 +76,10 @@
"jsdoc": "^3.5.5",
"jsdoc-babel": "^0.4.0",
"jsdoc-to-markdown": "^4.0.1",
- "nodemon": "^1.18.6",
- "ts-loader": "^5.3.0",
+ "nodemon": "^1.18.7",
+ "ts-loader": "^5.3.1",
"typescript": "^3.1.6",
- "webpack": "^4.26.0",
+ "webpack": "^4.26.1",
"webpack-cli": "^3.1.2",
"webpack-graphql-loader": "^1.0.0",
"webpack-node-externals": "^1.7.2"