Skip to content

Commit

Permalink
chore: improve the front-end infrastructure (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruibaby committed Jun 12, 2023
1 parent a9735da commit 0dc4919
Show file tree
Hide file tree
Showing 10 changed files with 767 additions and 839 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: pnpm/[email protected]
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
Expand Down
11 changes: 2 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.github.node-gradle.node" version "3.3.0"
id "com.github.node-gradle.node" version "5.0.0"
id "io.freefair.lombok" version "8.0.1"
id "run.halo.plugin.devtools" version "0.0.4"
}
Expand Down Expand Up @@ -31,18 +31,11 @@ node {
nodeProjectDir = file("${project.projectDir}/console")
}

task buildFrontend(type: NpxTask) {
command = 'pnpm'
task buildFrontend(type: PnpmTask) {
args = ['build']
}

task pnpmInstall(type: NpxTask) {
command = "pnpm"
args = ["install"]
}

build {
// build frontend before build
tasks.getByName('compileJava').dependsOn('buildFrontend')
tasks.getByName("buildFrontend").dependsOn("pnpmInstall")
}
57 changes: 0 additions & 57 deletions compose/README.md

This file was deleted.

40 changes: 0 additions & 40 deletions compose/application.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions compose/docker-compose.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion console/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require("@rushstack/eslint-patch/modern-module-resolution");
module.exports = {
root: true,
extends: [
"plugin:vue/vue3-essential",
"plugin:vue/vue3-recommended",
"eslint:recommended",
"@vue/eslint-config-typescript/recommended",
"@vue/eslint-config-prettier",
Expand Down
42 changes: 21 additions & 21 deletions console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,41 @@
"version": "1.0.0",
"private": true,
"scripts": {
"dev": "vite build --watch",
"dev": "vite build --watch --mode=development",
"build": "vite build",
"preview": "vite preview --port 4173",
"test:unit": "vitest --environment jsdom",
"type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},
"dependencies": {
"@halo-dev/components": "^1.0.0",
"@halo-dev/console-shared": "^2.0.0",
"@halo-dev/components": "^1.5.0",
"@halo-dev/console-shared": "^2.6.0",
"canvas-confetti": "^1.6.0",
"vue": "^3.2.41"
"vue": "^3.3.4"
},
"devDependencies": {
"@iconify/json": "^2.2.18",
"@rushstack/eslint-patch": "^1.2.0",
"@iconify/json": "^2.2.76",
"@rushstack/eslint-patch": "^1.3.1",
"@types/canvas-confetti": "^1.6.0",
"@types/jsdom": "^20.0.0",
"@types/node": "^16.18.0",
"@vitejs/plugin-vue": "^3.1.2",
"@vitejs/plugin-vue-jsx": "^2.0.1",
"@vue/eslint-config-prettier": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.2",
"@vue/test-utils": "^2.2.0",
"@types/jsdom": "^20.0.1",
"@types/node": "^16.18.35",
"@vitejs/plugin-vue": "^3.2.0",
"@vitejs/plugin-vue-jsx": "^2.1.1",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/test-utils": "^2.3.2",
"@vue/tsconfig": "^0.1.3",
"eslint": "^8.26.0",
"eslint-plugin-vue": "^9.6.0",
"eslint": "^8.42.0",
"eslint-plugin-vue": "^9.14.1",
"jsdom": "^19.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"sass": "^1.58.0",
"prettier": "^2.8.8",
"sass": "^1.63.3",
"typescript": "~4.7.4",
"unplugin-icons": "^0.15.2",
"vite": "^3.1.8",
"vitest": "^0.24.3",
"vue-tsc": "^1.0.9"
"unplugin-icons": "^0.15.3",
"vite": "^3.2.7",
"vitest": "^0.24.5",
"vue-tsc": "^1.6.5"
}
}
Loading

0 comments on commit 0dc4919

Please sign in to comment.