Move frontend workspace into packages Gradle module

.github/workflows/cd.yaml

@@ -15,6 +15,6 @@ jobs:
     with:
       node-version: "24"
       java-version: "21"
-      pnpm-version: ""
+      pnpm-version: "12.4.2"
       app-id: app-YXyaD
-      ui-path: "."
+      ui-path: "packages"

.github/workflows/ci.yaml

@@ -14,18 +14,24 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v5
+        with:
+          package_json_file: packages/package.json
       - uses: actions/setup-node@v6
         with:
           node-version: "24"
           cache: pnpm
+          cache-dependency-path: packages/pnpm-lock.yaml
       - run: pnpm install --frozen-lockfile
-      - run: pnpm -C packages/comment-widget exec playwright install --with-deps chromium
-      - run: pnpm -C packages/comment-widget test
+        working-directory: packages
+      - run: pnpm -C comment-widget exec playwright install --with-deps chromium
+        working-directory: packages
+      - run: pnpm -C comment-widget test
+        working-directory: packages
 
   ci:
     uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v4
     with:
       node-version: "24"
       java-version: "21"
-      pnpm-version: ""
-      ui-path: "."
+      pnpm-version: "12.4.2"
+      ui-path: "packages"

.github/workflows/release-npm.yaml

@@ -21,8 +21,12 @@ jobs:
           node-version: "24"
           registry-url: https://registry.npmjs.org/
       - uses: pnpm/action-setup@v5
+        with:
+          package_json_file: packages/package.json
       - run: pnpm install --frozen-lockfile
+        working-directory: packages
       - name: Upgrade npm
         run: npm i -g npm@latest
       - name: Publish to NPM
         run: pnpm run publish
+        working-directory: packages

.husky/pre-commit

@@ -1 +1 @@
-lint-staged
+pnpm -C packages exec lint-staged

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "io.freefair.lombok" version "9.2.0"
-    id "com.github.node-gradle.node" version "7.1.0"
+    id "com.github.node-gradle.node" version "7.1.0" apply false
     id "run.halo.plugin.devtools" version "0.8.0"
 }
 
@@ -37,25 +37,24 @@ test {
     useJUnitPlatform()
 }
 
-node {
-    pnpmVersion = '12.4.2'
-    nodeProjectDir = file("${project.projectDir}")
-}
-
-tasks.register('buildFrontend', PnpmTask) {
-    args = ['build']
-    dependsOn('installDepsForUI')
-}
+sourceSets.main.resources.exclude 'ui/**', 'static/**'
 
-tasks.register('installDepsForUI', PnpmTask) {
-    args = ['install']
+tasks.named('processResources', Copy) {
+    dependsOn project(':packages').tasks.named('pnpmBuild')
+    from(project(':packages').layout.projectDirectory.dir('ui/build/dist')) {
+        into 'ui'
+    }
+    from(project(':packages').layout.projectDirectory.dir('widget/build/dist')) {
+        into 'static'
+    }
+    doFirst {
+        delete layout.buildDirectory.dir('resources/main/ui'),
+            layout.buildDirectory.dir('resources/main/static')
+    }
 }
 
-build {
-    // build frontend before build
-    tasks.named('compileJava').configure {
-        dependsOn('buildFrontend')
-    }
+tasks.named('clean') {
+    dependsOn project(':packages').tasks.named('clean')
 }
 
 halo {

biome.json → packages/biome.json

@@ -3,11 +3,12 @@
   "vcs": {
     "enabled": true,
     "clientKind": "git",
-    "useIgnoreFile": true
+    "useIgnoreFile": true,
+    "root": "../"
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/generated", "!src/main/resources"]
+    "includes": ["**", "!**/generated"]
   },
   "formatter": {
     "enabled": true,

packages/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+    id 'base'
+    id 'com.github.node-gradle.node'
+}
+
+node {
+    pnpmVersion = '12.4.2'
+    nodeProjectDir = projectDir
+}
+
+tasks.register('pnpmBuild', PnpmTask) {
+    group = 'build'
+    args = ['run', 'build']
+    dependsOn tasks.named('pnpmInstall')
+    inputs.files(fileTree(projectDir) {
+        include 'comment-widget/**', 'ui/**', 'widget/**'
+        include 'package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml', 'tsconfig.json'
+        exclude '**/node_modules/**', '**/dist/**', '**/build/**', '**/coverage/**'
+    })
+    inputs.file(rootProject.layout.projectDirectory.file('src/main/resources/plugin.yaml'))
+    outputs.dir('comment-widget/dist')
+    outputs.dir('ui/build/dist')
+    outputs.dir('widget/build/dist')
+}
+
+tasks.named('assemble') {
+    dependsOn tasks.named('pnpmBuild')
+}
+
+tasks.named('clean') {
+    delete 'comment-widget/dist', 'ui/build', 'widget/build'
+}

packages/comment-widget/tests/README.md

@@ -1,11 +1,11 @@
 # Tests
 
-Run from the repository root:
+Run from the `packages` directory:
 
 ```sh
 pnpm install
-pnpm -C packages/comment-widget exec playwright install chromium
-pnpm -C packages/comment-widget test
+pnpm -C comment-widget exec playwright install chromium
+pnpm -C comment-widget test
 ```
 
 Vitest runs unit tests in Node and `*.browser.test.js` in headless Chromium.
@@ -14,9 +14,9 @@ Browser tests import the widget source directly; no build or manual HTTP server
 To run only one project:
 
 ```sh
-pnpm -C packages/comment-widget test --project unit
-pnpm -C packages/comment-widget test --project browser
+pnpm -C comment-widget test --project unit
+pnpm -C comment-widget test --project browser
 ```
 
 On Linux CI, install browser system dependencies with
-`pnpm -C packages/comment-widget exec playwright install --with-deps chromium`.
+`pnpm -C comment-widget exec playwright install --with-deps chromium`.

packages/example/tsconfig.json

@@ -1,4 +1,4 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "include": ["env.d.ts", "src"]
 }

package.json → packages/package.json

@@ -14,8 +14,8 @@
   "scripts": {
     "build": "pnpm -r run build",
     "check": "biome check --write",
-    "example:dev": "pnpm -C packages/example dev",
-    "prepare": "husky",
+    "example:dev": "pnpm -C example dev",
+    "prepare": "cd .. && packages/node_modules/.bin/husky",
     "publish": "pnpm -r publish --access public --no-git-checks"
   },
   "lint-staged": {

pnpm-workspace.yaml → packages/pnpm-workspace.yaml

@@ -1,5 +1,8 @@
 packages:
-  - packages/**
+  - comment-widget
+  - example
+  - ui
+  - widget
 allowBuilds:
   core-js: true
   esbuild: true

packages/ui/vite.config.mjs

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { viteConfig } from '@halo-dev/ui-plugin-bundler-kit/vite';
 
 const MANIFEST_PATH = '../../src/main/resources/plugin.yaml';
-const OUT_DIR_PROD = '../../src/main/resources/ui';
+const OUT_DIR_PROD = 'build/dist';
 const OUT_DIR_DEV = '../../build/resources/main/ui';
 
 export default viteConfig({

packages/widget/rslib.config.mjs

@@ -26,9 +26,7 @@ export default defineConfig({
     },
     publicPath: `/plugins/${PLUGIN_NAME}/assets/static/`,
     distPath: {
-      root: fileURLToPath(
-        new URL('../../src/main/resources/static', import.meta.url)
-      ),
+      root: fileURLToPath(new URL('./build/dist', import.meta.url)),
     },
   },
 });

packages/widget/tsconfig.json

@@ -1,4 +1,4 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "include": ["src"]
 }

settings.gradle

@@ -1 +1,2 @@
 rootProject.name = 'plugin-comment-widget'
+include 'packages'