diff --git a/frontend/package.json b/frontend/package.json index 5b19819d..a8f8d757 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -80,12 +80,9 @@ "css-loader": "^0.26.2", "enzyme": "^2.7.1", "eslint": "^3.16.1", - "eslint-config-react-app": "^0.5.2", "eslint-config-semistandard": "^7.0.0", "eslint-config-standard": "^7.0.0", - "eslint-loader": "^1.6.3", "eslint-plugin-babel": "^4.1.0", - "eslint-plugin-flowtype": "^2.30.0", "eslint-plugin-import": "^2.2.0", "eslint-plugin-jsx-a11y": "^4.0.0", "eslint-plugin-promise": "^3.5.0", @@ -103,10 +100,10 @@ "redux-ava": "^2.2.0", "require-hacker": "^2.1.4", "simple-mock": "^0.7.3", + "style-loader": "^0.13.2", "stylelint": "^7.9.0", "stylelint-config-standard": "^16.0.0", "stylelint-processor-styled-components": "^0.0.4", - "style-loader": "^0.13.2", "tap-xunit": "^1.7.0", "thenify": "^3.2.1", "url-loader": "^0.5.8", diff --git a/frontend/webpack/.eslintrc b/frontend/webpack/.eslintrc deleted file mode 100644 index 9846d9c2..00000000 --- a/frontend/webpack/.eslintrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": [ - "react-app" - ], - "rules": { - "import/no-webpack-loader-syntax": 1 - } -} diff --git a/frontend/webpack/base.js b/frontend/webpack/base.js index 57ef7e83..72e850aa 100644 --- a/frontend/webpack/base.js +++ b/frontend/webpack/base.js @@ -68,7 +68,7 @@ module.exports = { include: [ FRONTEND, UI - ], + ] }, { test: /\.(eot|svg|ttf|woff|woff2)$/, loader: 'file-loader', diff --git a/frontend/webpack/development.js b/frontend/webpack/development.js index 8776ef56..00980836 100644 --- a/frontend/webpack/development.js +++ b/frontend/webpack/development.js @@ -1,13 +1,6 @@ // const graphql = require('../../cloudapi-graphql/src/endpoint'); const plugins = require('./plugins'); const base = require('./base'); -const paths = require('./paths'); - -const { - FRONTEND, - UI, - ESLINT -} = paths; const devServer = { hot: true, @@ -33,22 +26,6 @@ module.exports = Object.assign(base, { 'react-dev-utils/webpackHotDevClient', base.entry ], - module: { - rules: base.module.rules.concat([{ - test: /js?$/, - enforce: 'pre', - use: [{ - loader: 'eslint-loader', - options: { - configFile: ESLINT - } - }], - include: [ - FRONTEND, - UI - ] - }]) - }, plugins: base.plugins.concat([ plugins['hot-module-replacement'](), plugins['watch-missing-node-modules']() diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 915598b7..219ad449 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2884,10 +2884,6 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-config-react-app@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.5.2.tgz#15c558d1365323e0a23ed2dda7fbd4c9ef65706c" - eslint-config-semistandard@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz#f803493f56a5172f7f59c35ae648360b41f2ff71" @@ -2904,15 +2900,6 @@ eslint-import-resolver-node@^0.2.0: object-assign "^4.0.1" resolve "^1.1.6" -eslint-loader@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.6.3.tgz#52fdcb32e9e8355108f8380dad4efe51a28986f9" - dependencies: - find-cache-dir "^0.1.1" - loader-utils "^1.0.2" - object-assign "^4.0.1" - object-hash "^1.1.4" - eslint-module-utils@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce" @@ -2924,12 +2911,6 @@ eslint-plugin-babel@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.0.tgz#837a74c092ad4d74f9fc74aed43f750906adc827" -eslint-plugin-flowtype@^2.30.0: - version "2.30.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.30.0.tgz#3054a265f9c8afe3046c3d41b72d32a736f9b4ae" - dependencies: - lodash "^4.15.0" - eslint-plugin-import@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e" @@ -4704,7 +4685,7 @@ lodash@^3.5.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, "lodash@>=3.5 <5": +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, "lodash@>=3.5 <5": version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -5152,10 +5133,6 @@ object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" -object-hash@^1.1.4: - version "1.1.6" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.6.tgz#826fd161372e826bd124a85b7e67710d14146f65" - object-is@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"