Skip to content

Commit

Permalink
chore: update halo dependencies to 2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
AirboZH committed Apr 13, 2024
1 parent 9839ff9 commit d0a837d
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 137 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: CI

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
ci:
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v1
with:
ui-path: "ui"
105 changes: 0 additions & 105 deletions .github/workflows/workflow.yaml

This file was deleted.

17 changes: 14 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {
}

dependencies {
implementation platform('run.halo.tools.platform:plugin:2.6.0-SNAPSHOT')
implementation platform('run.halo.tools.platform:plugin:2.11.0-SNAPSHOT')
compileOnly 'run.halo.app:api'

testImplementation 'run.halo.app:api'
Expand All @@ -35,11 +35,22 @@ node {
nodeProjectDir = file("${project.projectDir}/ui")
}

task buildFrontend(type: PnpmTask) {
tasks.register('buildFrontend', PnpmTask) {
args = ['build']
dependsOn('installDepsForUI')
}

tasks.register('installDepsForUI', PnpmTask) {
args = ['install']
}

build {
// build frontend before build
tasks.getByName('compileJava').dependsOn('buildFrontend')
tasks.named('compileJava').configure {
dependsOn('buildFrontend')
}
}

halo {
version = '2.11'
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ pluginManagement {
gradlePluginPortal()
}
}
rootProject.name = 'plugin-starter'
rootProject.name = 'plugin-share-widget'

6 changes: 3 additions & 3 deletions src/main/java/run/halo/starter/StarterPlugin.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package run.halo.starter;

import org.pf4j.PluginWrapper;
import org.springframework.stereotype.Component;
import run.halo.app.plugin.BasePlugin;
import run.halo.app.plugin.PluginContext;

/**
* <p>Plugin main class to manage the lifecycle of the plugin.</p>
Expand All @@ -15,8 +15,8 @@
@Component
public class StarterPlugin extends BasePlugin {

public StarterPlugin(PluginWrapper wrapper) {
super(wrapper);
public StarterPlugin(PluginContext pluginContext) {
super(pluginContext);
}

@Override
Expand Down
Binary file added src/main/resources/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/main/resources/plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: plugin.halo.run/v1alpha1
kind: Plugin
metadata:
# The name defines how the plugin is invoked,A unique name
name: PluginStarter
name: starter
spec:
enabled: true
requires: ">=2.5.0"
requires: ">=2.11.0"
author:
name: Halo OSS Team
name: Halo
website: https://github.com/halo-dev
logo: https://halo.run/logo
logo: logo.png
# 'homepage' usually links to the GitHub repository of the plugin
homepage: https://github.com/halo-dev/plugin-starter
# 'displayName' explains what the plugin does in only a few words
Expand Down
9 changes: 3 additions & 6 deletions ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"name": "@halo-dev/plugin-starter",
"version": "1.0.0",
"private": true,
"scripts": {
"dev": "vite build --watch --mode=development",
"build": "vite build",
Expand All @@ -11,13 +8,13 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},
"dependencies": {
"@halo-dev/components": "^1.10.0",
"@halo-dev/console-shared": "^2.11.0",
"@halo-dev/components": "^2.12.0",
"@halo-dev/console-shared": "^2.12.0",
"canvas-confetti": "^1.9.2",
"vue": "^3.3.12"
},
"devDependencies": {
"@halo-dev/ui-plugin-bundler-kit": "^1.0.0",
"@halo-dev/ui-plugin-bundler-kit": "^2.12.0",
"@iconify/json": "^2.2.159",
"@rushstack/eslint-patch": "^1.6.1",
"@types/canvas-confetti": "^1.6.4",
Expand Down
30 changes: 15 additions & 15 deletions ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d0a837d

Please sign in to comment.