diff --git a/.github/workflows/ci-ui.yml b/.github/workflows/ci-ui.yml deleted file mode 100644 index a8e035901..000000000 --- a/.github/workflows/ci-ui.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: ci-ui - -on: [ push, pull_request ] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 20.x - uses: actions/setup-node@v3 - with: - node-version: 20.x - - run: npm i - working-directory: ./ui - - run: npm run lint:ci - working-directory: ./ui diff --git a/alfred/ci.py b/alfred/ci.py index b91ddcb14..2789fbed5 100644 --- a/alfred/ci.py +++ b/alfred/ci.py @@ -7,6 +7,7 @@ def ci(): alfred.invoke_command("ci.mypy") alfred.invoke_command("ci.pytest") + alfred.invoke_command("npm.lint") alfred.invoke_command("npm.build") @@ -18,4 +19,4 @@ def ci_mypy(): @alfred.command("ci.pytest", help="run pytest on ./tests") def ci_test(): os.chdir("tests") - alfred.run("pytest") \ No newline at end of file + alfred.run("pytest") diff --git a/alfred/npm.py b/alfred/npm.py index c1d980e03..da94f37aa 100644 --- a/alfred/npm.py +++ b/alfred/npm.py @@ -1,6 +1,11 @@ import alfred import os +@alfred.command("npm.lint", help="lint check ui code") +def npm_lint(): + os.chdir("ui") + alfred.run("npm run lint:ci") + @alfred.command("npm.build", help="build ui code") def npm_build(): os.chdir("ui") @@ -9,4 +14,4 @@ def npm_build(): @alfred.command("npm.build_custom_components", help="build custom components") def ui_build_custom(): os.chdir("ui") - alfred.run("npm run custom.build") \ No newline at end of file + alfred.run("npm run custom.build") diff --git a/ui/src/builder/BuilderTreeBranch.vue b/ui/src/builder/BuilderTreeBranch.vue index 90212ef2a..4eba33455 100644 --- a/ui/src/builder/BuilderTreeBranch.vue +++ b/ui/src/builder/BuilderTreeBranch.vue @@ -1,6 +1,7 @@