Commit 689bb5a2 authored by 向偲彪's avatar 向偲彪
Browse files

Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

parents 4d70e3ce 32c5a68a

.github/workflows/ci_frontend.yml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ jobs: 
          cd dolphinscheduler-ui

          npm install node-sass --unsafe-perm

          npm install

          npm run lint

          npm run build



  License-check:

.github/workflows/ci_ut.yml

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ jobs: 
          -Dsonar.core.codeCoveragePlugin=jacoco

          -Dsonar.projectKey=apache-dolphinscheduler

          -Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682

          -Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js

        env:

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

dolphinscheduler-ui/.eslintrc

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
globals:

  $: true

  expect: true

rules:

  "no-new": "off"

  "no-labels": [2, {"allowLoop": true}]

dolphinscheduler-ui/.eslintrc.yml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#

# Licensed to the Apache Software Foundation (ASF) under one or more

# contributor license agreements.  See the NOTICE file distributed with

# this work for additional information regarding copyright ownership.

# The ASF licenses this file to You under the Apache License, Version 2.0

# (the "License"); you may not use this file except in compliance with

# the License.  You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



env:

  browser: true

  es6: true

  jquery: true

extends:

  - 'plugin:vue/essential'

  - standard

globals:

  Atomics: readonly

  SharedArrayBuffer: readonly

  PUBLIC_PATH: readonly

parserOptions:

  ecmaVersion: 2018

  sourceType: module

plugins:

  - vue

rules: {}

dolphinscheduler-ui/package.json

+8 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
    "dev": "cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.dev.js",

    "clean": "rimraf dist",

    "start": "npm run dev",

    "lint": "eslint ./src --fix",

    "build:release": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"

  },

  "dependencies": {
@@ -50,6 +51,13 @@ 
    "css-loader": "^0.28.8",

    "cssnano": "4.1.10",

    "env-parse": "^1.0.5",

    "eslint": "^6.8.0",

    "eslint-config-standard": "^14.1.1",

    "eslint-plugin-import": "^2.20.2",

    "eslint-plugin-node": "^11.1.0",

    "eslint-plugin-promise": "^4.2.1",

    "eslint-plugin-standard": "^4.0.1",

    "eslint-plugin-vue": "^6.2.2",

    "file-loader": "^5.0.2",

    "globby": "^8.0.1",

    "html-loader": "^0.5.5",