From ee1500dc5d1b432c9be3fdc4afd1a70d1c7ef8e1 Mon Sep 17 00:00:00 2001 From: mama Date: Wed, 3 Jan 2018 16:32:20 +0100 Subject: [PATCH] Ajout d'une configuration prettier --- source/.eslintrc.yaml => .eslintrc | 3 + .prettierrc | 3 + package.json | 210 ++++++++++++++--------------- 3 files changed, 110 insertions(+), 106 deletions(-) rename source/.eslintrc.yaml => .eslintrc (91%) create mode 100644 .prettierrc diff --git a/source/.eslintrc.yaml b/.eslintrc similarity index 91% rename from source/.eslintrc.yaml rename to .eslintrc index 9e967408a..d6a43aa63 100644 --- a/source/.eslintrc.yaml +++ b/.eslintrc @@ -11,6 +11,9 @@ rules: quotes: - 1 - single + jsx-quotes: + - 1 + - prefer-double no-unused-vars: 1 no-console: 1 no-global-assign: 0 diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..07d3f7ff0 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,3 @@ +useTabs: true +semi: false +singleQuote: true diff --git a/package.json b/package.json index c3f673500..0b4aeb954 100644 --- a/package.json +++ b/package.json @@ -1,108 +1,106 @@ { - "name": "syso", - "version": "0.0.1", - "license": "AGPL-3.0", - "repository": { - "type": "git", - "url": "git@github.com:laem/syso.git" - }, - "description": "Expérimentation sur les prélèvements sociaux en code", - "engines": { - "node": ">=6.2.0 <10.0.0" - }, - "dependencies": { - "@babel/polyfill": "^7.0.0-beta.34", - "classnames": "^2.2.5", - "dedent-js": "^1.0.1", - "deep-assign": "^2.0.0", - "flow": "^0.2.3", - "global": "^4.3.2", - "ignore-loader": "^0.1.2", - "install": "^0.10.1", - "js-yaml": "^3.9.1", - "marked": "^0.3.7", - "nearley": "^2.9.2", - "npm": "^5.3.0", - "ramda": "0.24.1", - "react": "^16.2.0", - "react-addons-css-transition-group": "^15.6.2", - "react-burger-menu": "^2.1.11", - "react-dom": "^16.2.0", - "react-helmet": "^5.2.0", - "react-redux": "^5.0.6", - "react-router": "^4.2.0", - "react-router-dom": "^4.2.2", - "react-scroll": "^1.7.3", - "react-select": "^1.0.0-rc.10", - "react-select-fast-filter-options": "^0.2.3", - "react-transition-group": "^2.2.1", - "react-virtualized": "^9.10.1", - "react-virtualized-select": "^3.1.0", - "reduce-reducers": "^0.1.2", - "redux": "^3.7.2", - "redux-form": "6.8.0", - "redux-saga": "^0.15.3", - "reselect": "^3.0.1", - "whatwg-fetch": "^2.0.3", - "yaml-loader": "^0.5.0" - }, - "devDependencies": { - "@babel/core": "^7.0.0-beta.34", - "@babel/plugin-proposal-decorators": "=7.0.0-beta.34", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.34", - "@babel/plugin-syntax-decorators": "^7.0.0-beta.34", - "@babel/preset-env": "^7.0.0-beta.34", - "@babel/preset-react": "^7.0.0-beta.34", - "akh": "^3.1.2", - "autoprefixer": "^7.2.1", - "babel-eslint": "^8.0.3", - "babel-loader": "8.0.0-beta.0", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-plugin-transform-class-properties": "^6.24.1", - "babel-plugin-transform-decorators": "^6.24.1", - "babel-plugin-transform-do-expressions": "^6.22.0", - "babel-plugin-webpack-alias": "^2.1.2", - "chai": "^4.0.2", - "chokidar": "^1.7.0", - "core-js": "^2.4.1", - "css-loader": "^0.28.1", - "csv-loader": "^2.1.1", - "daggy": "^1.1.0", - "eslint": "^4.12.1", - "eslint-plugin-react": "^7.5.1", - "express": "^4.15.3", - "fantasy-combinators": "0.0.1", - "fantasy-land": "^3.3.0", - "fantasy-tuples": "^1.0.0", - "file-loader": "^1.1.5", - "html-loader": "^0.5.1", - "img-loader": "^2.0.0", - "jsdom": "^11.0.0", - "json-loader": "^0.5.4", - "mocha": "^4.0.1", - "mocha-webpack": "^0.7.0", - "nearley-loader": "0.0.2", - "postcss-loader": "^2.0.5", - "ramda-fantasy": "^0.8.0", - "react-hot-loader": "^3.1.3", - "redux-devtools": "^3.4.1", - "redux-devtools-dock-monitor": "^1.1.2", - "redux-devtools-log-monitor": "^1.4.0", - "source-map-support": "^0.5.0", - "style-loader": "^0.19.0", - "url-loader": "^0.6.2", - "webpack": "^3.10.0", - "webpack-dev-server": "^2.9.5" - }, - "scripts": { - "start": "node source/server.js", - "compile": "NODE_ENV='production' webpack --config source/webpack.config.js", - "surge": "npm run compile && surge --domain scientific-wish.surge.sh -p ./ && rm -rf dist/", - "test": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/**/*.test.js\"", - "test-watch": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/**/*.test.js\" --watch", - "test-meca": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js test/mecanisms.test.js --watch", - "test-rules": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js test/real-rules.test.js --watch", - "heroku-postbuild": "npm install --dev && webpack --config source/webpack.config.js --progress", - "test-inversions": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/inversion.test.js\" --watch" - } + "name": "syso", + "version": "0.0.1", + "license": "AGPL-3.0", + "repository": { + "type": "git", + "url": "git@github.com:laem/syso.git" + }, + "description": "Expérimentation sur les prélèvements sociaux en code", + "engines": { + "node": ">=6.2.0 <10.0.0" + }, + "dependencies": { + "@babel/polyfill": "^7.0.0-beta.34", + "classnames": "^2.2.5", + "dedent-js": "^1.0.1", + "deep-assign": "^2.0.0", + "flow": "^0.2.3", + "global": "^4.3.2", + "ignore-loader": "^0.1.2", + "js-yaml": "^3.9.1", + "marked": "^0.3.9", + "nearley": "^2.9.2", + "npm": "^5.3.0", + "ramda": "0.24.1", + "react": "^16.2.0", + "react-addons-css-transition-group": "^15.6.2", + "react-dom": "^16.2.0", + "react-helmet": "^5.2.0", + "react-redux": "^5.0.6", + "react-router": "^4.2.0", + "react-router-dom": "^4.2.2", + "react-scroll": "^1.7.3", + "react-select": "^1.0.0-rc.10", + "react-select-fast-filter-options": "^0.2.3", + "react-transition-group": "^2.2.1", + "react-virtualized": "^9.10.1", + "react-virtualized-select": "^3.1.0", + "reduce-reducers": "^0.1.2", + "redux": "^3.7.2", + "redux-form": "6.8.0", + "redux-saga": "^0.15.3", + "reselect": "^3.0.1", + "whatwg-fetch": "^2.0.3", + "yaml-loader": "^0.5.0" + }, + "devDependencies": { + "@babel/core": "^7.0.0-beta.34", + "@babel/plugin-proposal-decorators": "=7.0.0-beta.34", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.34", + "@babel/plugin-syntax-decorators": "^7.0.0-beta.34", + "@babel/preset-env": "^7.0.0-beta.34", + "@babel/preset-react": "^7.0.0-beta.34", + "akh": "^3.1.2", + "autoprefixer": "^7.2.4", + "babel-eslint": "^8.1.2", + "babel-loader": "8.0.0-beta.0", + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-plugin-transform-do-expressions": "^6.22.0", + "babel-plugin-webpack-alias": "^2.1.2", + "chai": "^4.0.2", + "chokidar": "^1.7.0", + "core-js": "^2.4.1", + "css-loader": "^0.28.1", + "csv-loader": "^2.1.1", + "daggy": "^1.1.0", + "eslint": "^4.14.0", + "eslint-plugin-react": "^7.5.1", + "express": "^4.15.3", + "fantasy-combinators": "0.0.1", + "fantasy-land": "^3.3.0", + "fantasy-tuples": "^1.0.0", + "file-loader": "^1.1.5", + "html-loader": "^0.5.1", + "img-loader": "^2.0.0", + "jsdom": "^11.0.0", + "json-loader": "^0.5.4", + "mocha": "^4.0.1", + "mocha-webpack": "^0.7.0", + "nearley-loader": "0.0.2", + "postcss-loader": "^2.0.5", + "ramda-fantasy": "^0.8.0", + "react-hot-loader": "^3.1.3", + "redux-devtools": "^3.4.1", + "redux-devtools-dock-monitor": "^1.1.2", + "redux-devtools-log-monitor": "^1.4.0", + "source-map-support": "^0.5.0", + "style-loader": "^0.19.0", + "url-loader": "^0.6.2", + "webpack": "^3.10.0", + "webpack-dev-server": "^2.9.5" + }, + "scripts": { + "start": "node source/server.js", + "compile": "NODE_ENV='production' webpack --config source/webpack.config.js", + "surge": "npm run compile && surge --domain scientific-wish.surge.sh -p ./ && rm -rf dist/", + "test": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/**/*.test.js\"", + "test-watch": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/**/*.test.js\" --watch", + "test-meca": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js test/mecanisms.test.js --watch", + "test-rules": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js test/real-rules.test.js --watch", + "heroku-postbuild": "npm install --dev && webpack --config source/webpack.config.js --progress", + "test-inversions": "mocha-webpack --webpack-config source/webpack.test.config.js --require source-map-support/register --require test/helpers/browser.js \"test/inversion.test.js\" --watch" + } }