Merge pull request #214 from EmilyMei/development

fix: 修复 ESLint 版本依赖问题
TencentBlueKing · Dec 22, 2021 · 4c457c7 · 4c457c7
2 parents 2170f09 + 33935b4
commit 4c457c7
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/src/pages/.eslintrc.js b/src/pages/.eslintrc.js
@@ -1,15 +1,15 @@
 module.exports = {
   root: true,
-  extends: ['@bkui/eslint-config-bk/vue'],
+  extends: ['@blueking/eslint-config-bk/vue'],
   globals: {
     NODE_ENV: false,
   },
   parserOptions: {
     parser: 'babel-eslint',
     sourceType: 'module',
     ecmaFeatures: {
-        legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
 
   rules: {
@@ -21,5 +21,5 @@ module.exports = {
     'no-nested-ternary': 'off',
     'arrow-body-style': 'off',
     'no-restricted-properties': 'off',
- },
+  },
 };
diff --git a/src/pages/build/webpack.dev.conf.js b/src/pages/build/webpack.dev.conf.js
@@ -45,7 +45,13 @@ const webpackConfig = merge(baseConf, {
               },
             },
           },
-          'sass-loader',
+          {
+            loader: "sass-loader",
+            options: {
+              implementation: require("sass") //使用dart-sass代替node-sass
+            }
+          },
+          // 'sass-loader',
         ],
       },
     ],

diff --git a/src/pages/package.json b/src/pages/package.json
@@ -52,7 +52,6 @@
         "express-art-template": "1.0.1",
         "intl-tel-input": "16.0.0",
         "jsonp": "0.2.1",
-        "node-sass": "4.14.1",
         "query-string": "6.5.0",
         "sortablejs": "1.10.1",
         "url-parse": "1.4.7",
@@ -83,8 +82,8 @@
         "@babel/preset-env": "7.4.5",
         "@babel/register": "7.4.4",
         "@babel/runtime": "7.4.5",
-        "@bkui/eslint-config-bk": "^2.0.0",
-        "@bkui/stylelint-config-bk": "^2.0.0",
+        "@blueking/eslint-config-bk": "^2.0.1",
+        "@blueking/stylelint-config-bk": "^2.0.0",
         "@vue/babel-preset-jsx": "~1.2.4",
         "babel-core": "7.0.0-bridge.0",
         "babel-eslint": "10.0.2",
@@ -101,15 +100,9 @@
         "cors": "2.8.5",
         "cross-env": "5.2.0",
         "css-loader": "2.1.1",
-        "eslint": "^7.5.0",
-        "eslint-config-standard": "12.0.0",
+        "eslint": "7.29.0",
         "eslint-friendly-formatter": "4.0.1",
-        "eslint-loader": "2.1.2",
-        "eslint-plugin-import": "2.17.2",
-        "eslint-plugin-node": "9.0.1",
-        "eslint-plugin-promise": "4.1.1",
-        "eslint-plugin-standard": "4.0.0",
-        "eslint-plugin-vue": "7.7.0",
+        "eslint-loader": "^4.0.2",
         "eventsource-polyfill": "0.9.6",
         "faker": "4.1.0",
         "file-loader": "3.0.1",
@@ -141,13 +134,14 @@
         "postcss-property-lookup": "2.0.0",
         "postcss-url": "8.0.0",
         "rimraf": "2.6.3",
-        "sass-loader": "8.0.0",
+        "sass": "^1.45.1",
+        "sass-loader": "^8.0.0",
         "semver": "6.1.0",
         "shelljs": "0.8.3",
         "terser-webpack-plugin": "1.2.4",
         "transliteration": "2.1.3",
         "url-loader": "1.1.2",
-        "vue-eslint-parser": "~7.9.0",
+        "vue-eslint-parser": "~8.0.1",
         "vue-loader": "15.7.0",
         "vue-markdown-loader": "2.4.1",
         "vue-template-compiler": "2.5.22",

diff --git a/src/pages/src/api/index.js b/src/pages/src/api/index.js
@@ -50,7 +50,7 @@ axiosInstance.interceptors.request.use((config) => {
  */
 axiosInstance.interceptors.response.use(
   response => response.data,
-  error => Promise.reject(error)
+  error => Promise.reject(error),
 );
 
 const http = {

diff --git a/src/pages/src/components/authority/NoAuthority.vue b/src/pages/src/components/authority/NoAuthority.vue
@@ -199,7 +199,7 @@ export default {
     margin-bottom: 30px;
   }
 
-  /deep/ .king-table {
+  ::v-deep .king-table {
     margin-bottom: 12px;
 
     .bk-table-body-wrapper {

diff --git a/src/pages/src/views/audit/index.vue b/src/pages/src/views/audit/index.vue
@@ -468,7 +468,7 @@ export default {
     }
   }
 
-  /deep/ .audit-panel-class {
+  ::v-deep .audit-panel-class {
     margin-top: 20px;
 
     .bk-tab-section {

diff --git a/src/pages/src/views/catalog/PageAdd.vue b/src/pages/src/views/catalog/PageAdd.vue
@@ -57,12 +57,11 @@ export default {
     };
   },
   created() {
-    for (const item of this.catalogMetas) {
+    this.catalogMetas.map((item) => {
       if (item.authorized) {
         this.selectedItem = item;
-        break;
       }
-    }
+    });
   },
   methods: {
     handleSelectItem(item) {

diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
@@ -558,7 +558,7 @@ export default {
           {
             key: 'update_time',
             name: 'update_time',
-          }
+          },
         );
         this.userMessage.tableHeardList = tableHeardList;
       } catch (e) {

diff --git a/src/pages/src/views/organization/tree/OrganizationTree.vue b/src/pages/src/views/organization/tree/OrganizationTree.vue
@@ -700,7 +700,7 @@ li.tree-first-node {
       height: 32px;
       line-height: initial;
 
-      /deep/ .bk-form-input {
+      ::v-deep .bk-form-input {
         padding-left: 41px;
       }
     }