From e34199195e7ef9725c0b15851f181d32a8eefb8c Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Mon, 27 Jun 2022 15:01:28 +0800 Subject: [PATCH] chore: add buildFrontend task for gradle Signed-off-by: Ryan Wang --- admin-frontend/pnpm-lock.yaml | 49 +++++++++++++++++------------------ build.gradle | 15 +++++++++++ 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/admin-frontend/pnpm-lock.yaml b/admin-frontend/pnpm-lock.yaml index f24c229..c2b6da7 100644 --- a/admin-frontend/pnpm-lock.yaml +++ b/admin-frontend/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: '@halo-dev/admin-shared': link:/Users/ryanwang/Workspace/github/ruibaby/halo-admin-next/packages/shared @@ -24,8 +24,8 @@ specifiers: vue-tsc: ^0.35.2 dependencies: - '@halo-dev/admin-shared': link:../../../../../ryanwang/Workspace/github/ruibaby/halo-admin-next/packages/shared - '@halo-dev/components': link:../../../../../ryanwang/Workspace/github/ruibaby/halo-admin-next/packages/components + '@halo-dev/admin-shared': link:../../../ruibaby/halo-admin-next/packages/shared + '@halo-dev/components': link:../../../ruibaby/halo-admin-next/packages/components vue: 3.2.37 devDependencies: @@ -34,8 +34,8 @@ devDependencies: '@types/node': 16.11.38 '@vitejs/plugin-vue': 2.3.3_vite@2.9.10+vue@3.2.37 '@vitejs/plugin-vue-jsx': 1.3.10 - '@vue/eslint-config-prettier': 7.0.0_eslint@8.17.0+prettier@2.6.2 - '@vue/eslint-config-typescript': 10.0.0_77f16daacf2783bf5a1937336883d0a6 + '@vue/eslint-config-prettier': 7.0.0_ddjd75dz7x3czaucyvuaamiqdi + '@vue/eslint-config-typescript': 10.0.0_o7yw3kwpe6b36wqzg4zwra6quy '@vue/test-utils': 2.0.0_vue@3.2.37 '@vue/tsconfig': 0.1.3_@types+node@16.11.38 eslint: 8.17.0 @@ -484,7 +484,7 @@ packages: resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==} dev: true - /@typescript-eslint/eslint-plugin/5.27.1_043f48e0ee10c350c28cdede89899bc7: + /@typescript-eslint/eslint-plugin/5.27.1_aq7uryhocdbvbqum33pitcm3y4: resolution: {integrity: sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -495,10 +495,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.27.1_eslint@8.17.0+typescript@4.7.3 + '@typescript-eslint/parser': 5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4 '@typescript-eslint/scope-manager': 5.27.1 - '@typescript-eslint/type-utils': 5.27.1_eslint@8.17.0+typescript@4.7.3 - '@typescript-eslint/utils': 5.27.1_eslint@8.17.0+typescript@4.7.3 + '@typescript-eslint/type-utils': 5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4 + '@typescript-eslint/utils': 5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4 debug: 4.3.4 eslint: 8.17.0 functional-red-black-tree: 1.0.1 @@ -511,7 +511,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.27.1_eslint@8.17.0+typescript@4.7.3: + /@typescript-eslint/parser/5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4: resolution: {integrity: sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -539,7 +539,7 @@ packages: '@typescript-eslint/visitor-keys': 5.27.1 dev: true - /@typescript-eslint/type-utils/5.27.1_eslint@8.17.0+typescript@4.7.3: + /@typescript-eslint/type-utils/5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4: resolution: {integrity: sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -549,7 +549,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.27.1_eslint@8.17.0+typescript@4.7.3 + '@typescript-eslint/utils': 5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4 debug: 4.3.4 eslint: 8.17.0 tsutils: 3.21.0_typescript@4.7.3 @@ -584,7 +584,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.27.1_eslint@8.17.0+typescript@4.7.3: + /@typescript-eslint/utils/5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4: resolution: {integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -720,7 +720,7 @@ packages: '@vue/compiler-dom': 3.2.37 '@vue/shared': 3.2.37 - /@vue/eslint-config-prettier/7.0.0_eslint@8.17.0+prettier@2.6.2: + /@vue/eslint-config-prettier/7.0.0_ddjd75dz7x3czaucyvuaamiqdi: resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==} peerDependencies: eslint: '>= 7.28.0' @@ -728,25 +728,29 @@ packages: dependencies: eslint: 8.17.0 eslint-config-prettier: 8.5.0_eslint@8.17.0 - eslint-plugin-prettier: 4.0.0_a088652d234d3f0e6595b5f3073e25de + eslint-plugin-prettier: 4.0.0_ucegkljdju7q4zmvwxzqoprf3y prettier: 2.6.2 dev: true - /@vue/eslint-config-typescript/10.0.0_77f16daacf2783bf5a1937336883d0a6: + /@vue/eslint-config-typescript/10.0.0_o7yw3kwpe6b36wqzg4zwra6quy: resolution: {integrity: sha512-F94cL8ug3FaYXlCfU5/wiGjk1qeadmoBpRGAOBq+qre3Smdupa59dd6ZJrsfRODpsMPyTG7330juMDsUvpZ3Rw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 eslint-plugin-vue: ^8.0.1 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.27.1_043f48e0ee10c350c28cdede89899bc7 - '@typescript-eslint/parser': 5.27.1_eslint@8.17.0+typescript@4.7.3 + '@typescript-eslint/eslint-plugin': 5.27.1_aq7uryhocdbvbqum33pitcm3y4 + '@typescript-eslint/parser': 5.27.1_ud6rd4xtew5bv4yhvkvu24pzm4 eslint: 8.17.0 eslint-plugin-vue: 8.7.1_eslint@8.17.0 + typescript: 4.7.3 vue-eslint-parser: 8.3.0_eslint@8.17.0 transitivePeerDependencies: - supports-color - - typescript dev: true /@vue/reactivity-transform/3.2.37: @@ -768,7 +772,6 @@ packages: dependencies: '@vue/reactivity': 3.2.37 '@vue/shared': 3.2.37 - dev: false /@vue/runtime-dom/3.2.37: resolution: {integrity: sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==} @@ -776,7 +779,6 @@ packages: '@vue/runtime-core': 3.2.37 '@vue/shared': 3.2.37 csstype: 2.6.20 - dev: false /@vue/server-renderer/3.2.37_vue@3.2.37: resolution: {integrity: sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==} @@ -786,7 +788,6 @@ packages: '@vue/compiler-ssr': 3.2.37 '@vue/shared': 3.2.37 vue: 3.2.37 - dev: false /@vue/shared/3.2.37: resolution: {integrity: sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==} @@ -1074,7 +1075,6 @@ packages: /csstype/2.6.20: resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} - dev: false /data-urls/3.0.2: resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} @@ -1439,7 +1439,7 @@ packages: eslint: 8.17.0 dev: true - /eslint-plugin-prettier/4.0.0_a088652d234d3f0e6595b5f3073e25de: + /eslint-plugin-prettier/4.0.0_ucegkljdju7q4zmvwxzqoprf3y: resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==} engines: {node: '>=6.0.0'} peerDependencies: @@ -2866,7 +2866,6 @@ packages: '@vue/runtime-dom': 3.2.37 '@vue/server-renderer': 3.2.37_vue@3.2.37 '@vue/shared': 3.2.37 - dev: false /w3c-hr-time/1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} diff --git a/build.gradle b/build.gradle index 40cc994..bbb1b5a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.springframework.boot' version '3.0.0-M3' id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id "com.github.node-gradle.node" version "3.3.0" id 'java' } @@ -49,3 +50,17 @@ dependencies { test { useJUnitPlatform() } + +node { + nodeProjectDir = file("${project.projectDir}/admin-frontend") +} + +task buildFrontend(type: NpxTask) { + command = 'pnpm' + args = ['build'] +} + +build { + // build frontend before build + tasks.getByName('compileJava').dependsOn('buildFrontend') +} \ No newline at end of file