From 6778fc6d08a6d34715df7b057194f1c40cce8bca Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 15 Mar 2019 16:50:16 +0800 Subject: [PATCH] Fix linting errors --- package.json | 6 ------ postcss.config.js | 1 + resources/assets/src/js/layout.js | 1 - resources/assets/tests/setup.js | 1 + webpack.config.js | 1 + yarn.lock | 16 +--------------- 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f6e7fcc6..247ec37c 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "eslint": "^5.14.0", "eslint-config-gplane": "^5.1.3", "eslint-formatter-beauty": "^3.0.0", - "eslint-import-resolver-jest": "^2.1.1", "eslint-plugin-vue": "^5.2.2", "file-loader": "^3.0.1", "jest": "^24.1.0", @@ -101,11 +100,6 @@ "globals": { "blessing": "readonly" }, - "settings": { - "import/resolver": { - "jest": {} - } - }, "rules": { "camelcase": [ 2, diff --git a/postcss.config.js b/postcss.config.js index 224f5812..8728f4e4 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,3 +1,4 @@ +/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable global-require */ module.exports = { plugins: [ diff --git a/resources/assets/src/js/layout.js b/resources/assets/src/js/layout.js index daae3731..09706560 100644 --- a/resources/assets/src/js/layout.js +++ b/resources/assets/src/js/layout.js @@ -1,5 +1,4 @@ import './jquery' // jQuery first -import 'bootstrap' import 'admin-lte' import 'icheck' import Vue from 'vue' diff --git a/resources/assets/tests/setup.js b/resources/assets/tests/setup.js index 9ec0e3c3..7894cc5e 100644 --- a/resources/assets/tests/setup.js +++ b/resources/assets/tests/setup.js @@ -1,3 +1,4 @@ +/* eslint-disable import/no-extraneous-dependencies */ import 'jest-extended' import Vue from 'vue' diff --git a/webpack.config.js b/webpack.config.js index 15fcbcf5..5d669bf1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +/* eslint-disable import/no-extraneous-dependencies */ const webpack = require('webpack') const VueLoaderPlugin = require('vue-loader/lib/plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') diff --git a/yarn.lock b/yarn.lock index 75d90dce..671af90d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2839,15 +2839,6 @@ eslint-formatter-beauty@^3.0.0: code-excerpt "^2.1.1" log-symbols "^2.2.0" -eslint-import-resolver-jest@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.1.tgz#78c1934e3b5b77283326f036e089cc3b9fae6346" - integrity sha512-yzzZFN37CaMaCjmUZ4Zo7Pw5qCG/hDklVzxIeHYJZkbcdg0sL5MeLaOG8s3ndVBvv1PSdSq4jfkY0QXt/KPbTg== - dependencies: - find-root "^1.0.0" - micromatch "^3.1.6" - resolve "^1.5.0" - eslint-import-resolver-node@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" @@ -3356,11 +3347,6 @@ find-cache-dir@^2.0.0: make-dir "^1.0.0" pkg-dir "^3.0.0" -find-root@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -5224,7 +5210,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.6, micromatch@^3.1.8, micromatch@^3.1.9: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: