diff --git a/package-lock.json b/package-lock.json index 0c2336cb7dbb5cb9af8664b348d27480b266b5b6..db8dc3f01002d0bd2da9c58d9b184b07a9cb58e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -998,9 +998,9 @@ "dev": true }, "@types/node": { - "version": "12.6.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz", - "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==", + "version": "12.7.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.1.tgz", + "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==", "dev": true }, "@typescript-eslint/experimental-utils": { @@ -3826,9 +3826,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.215", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz", - "integrity": "sha512-ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg==", + "version": "1.3.220", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.220.tgz", + "integrity": "sha512-ZsaFWi+9J9Nsm4OmGM/BvZF3HEeZL4bte1+CcN9vHUcqdkOOVAXP4SeacPZ/W5uCQZEKPYBXg6yUjZx8/jpD0Q==", "dev": true }, "elliptic": { @@ -4326,9 +4326,9 @@ } }, "eslint-plugin-jest": { - "version": "22.14.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.14.1.tgz", - "integrity": "sha512-mpLjhADl+HjagrlaGNx95HIji089S18DhnU/Ee8P8VP+dhEnuEzb43BXEaRmDgQ7BiSUPcSCvt1ydtgPkjOF/Q==", + "version": "22.15.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.15.0.tgz", + "integrity": "sha512-hgnPbSqAIcLLS9ePb12hNHTRkXnkVaCfOwCt2pzQ8KpOKPWGA4HhLMaFN38NBa/0uvLfrZpcIRjT+6tMAfr58Q==", "dev": true, "requires": { "@typescript-eslint/experimental-utils": "^1.13.0" @@ -10177,9 +10177,9 @@ } }, "postcss-value-parser": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.1.tgz", - "integrity": "sha512-3Jk+/CVH0HBfgSSFWALKm9Hyzf4kumPjZfUxkRYZNcqFztELb2APKxv0nlX8HCdc1/ymePmT/nFf1ST6fjWH2A==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", + "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==", "dev": true }, "prelude-ls": { diff --git a/package.json b/package.json index 994940e0da60e09f4a880c514a37500695d90d5d..7485f169178aae6df9ce3a1cf590b4149c29030a 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "eslint": "^5.0.1", "eslint-config-scratch": "^5.0.0", "eslint-import-resolver-webpack": "^0.11.1", - "eslint-plugin-import": "^2.8.0", + "eslint-plugin-import": "^2.18.2", "eslint-plugin-jest": "^22.14.1", "eslint-plugin-react": "^7.12.4", "file-loader": "2.0.0", diff --git a/src/.eslintrc.js b/src/.eslintrc.js index 611f84044e940cf4a76fe2b8ba8d801deb02f283..3165dae95a924046a0ae380bfb883ba8b2428907 100644 --- a/src/.eslintrc.js +++ b/src/.eslintrc.js @@ -1,3 +1,4 @@ +const path = require('path'); module.exports = { root: true, extends: ['scratch', 'scratch/es6', 'scratch/react', 'plugin:import/errors'], @@ -22,15 +23,8 @@ module.exports = { version: '16.2' // Prevent 16.3 lifecycle method errors }, 'import/resolver': { - 'webpack': { - 'config': { - 'resolve': { - 'extensions': [ - '.js', - '.jsx' - ] - } - } + webpack: { + config: path.resolve(__dirname, '../webpack.config.js') } } }