Skip to content

Commit

Permalink
Merge pull request #113 from terwer/release-please--branches--main--c…
Browse files Browse the repository at this point in the history
…omponents--release-please-action

chore(main): release 1.5.0
  • Loading branch information
terwer authored Jun 21, 2023
2 parents 813e34c + 3c628d9 commit 3a90b75
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 30 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog

## [1.4.0](https://github.com/terwer/siyuan-plugin-blog/compare/v1.3.0...v1.4.0) (2023-06-21)
## [1.5.0](https://github.com/terwer/siyuan-plugin-blog/compare/v1.4.0...v1.5.0) (2023-06-21)
### Features
* 支持内部链接和外部链接 ([605abd8](https://github.com/terwer/siyuan-plugin-blog/commit/605abd89bdf7edd9762586ce30d00dd3241069c7))
* 支持任务列表
* 增加打开主页链接
## [1.4.0](https://github.com/terwer/siyuan-plugin-blog/compare/v1.3.0...v1.4.0) (2023-06-21)
* 支持设置自定义域名 ([bf17949](https://github.com/terwer/siyuan-plugin-blog/commit/bf179498a893c156511478dd7ccd46aa9728f09c))
### Bug Fixes
* 修复未打开浮窗时可能出现的报错问题 ([f379a9d](https://github.com/terwer/siyuan-plugin-blog/commit/f379a9d5ddae19b30a98865d227162ec9255d0c8))
Expand Down
33 changes: 7 additions & 26 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const generateDynamicV = () => {
}

const isDev = process.env.NODE_ENV === "development"
const appBase = "/plugins/siyuan-blog/"
const appBase = "/"
const staticV = generateDynamicV()

// https://nuxt.com/docs/api/configuration/nuxt-config
Expand All @@ -24,14 +24,7 @@ export default defineNuxtConfig({
},

// build modules
modules: [
"@vueuse/nuxt",
"@nuxtjs/i18n-edge",
"@element-plus/nuxt",
"@nuxtjs/color-mode",
"@pinia/nuxt",
"@nuxt/image",
],
modules: ["@vueuse/nuxt", "@nuxtjs/i18n", "@element-plus/nuxt", "@nuxtjs/color-mode", "@pinia/nuxt", "@nuxt/image"],

// vueuse
vueuse: {
Expand All @@ -54,7 +47,7 @@ export default defineNuxtConfig({
define: {
"process.env.DEV_MODE": `"${isDev}"`,
"process.env.APP_BASE": `"${appBase}"`,
"process.env.SSR": `"false"`,
"process.env.SSR": `"true"`,
},
plugins: [],
},
Expand All @@ -65,14 +58,6 @@ export default defineNuxtConfig({
themes: ["dark"],
},

// https://nuxt.com/docs/guide/going-further/custom-routing#hash-mode-spa
ssr: false,
router: {
options: {
hashMode: true,
},
},

css: ["~/assets/siyuan/style.styl", "~/assets/siyuan/index.styl"],

app: {
Expand Down Expand Up @@ -109,15 +94,11 @@ export default defineNuxtConfig({

// 环境变量
runtimeConfig: {
// siyuanAuthToken: process.env.NUXT_SIYUAN_AUTH_TOKEN,
siyuanAuthToken: "",
siyuanAuthToken: process.env.NUXT_SIYUAN_AUTH_TOKEN,
public: {
// defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE,
defaultType: "siyuan",
// siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL,
siyuanApiUrl: "",
// waitTime: process.env.NUXT_PUBLIC_WAIT_TIME,
waitTime: "0",
defaultType: process.env.NUXT_PUBLIC_DEFAULT_TYPE ?? "siyuan",
siyuanApiUrl: process.env.NUXT_PUBLIC_SIYUAN_API_URL ?? "http://127.0.0.1:6806",
waitTime: process.env.NUXT_PUBLIC_WAIT_TIME,
},
},
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "siyuan-blog",
"version": "1.4.0",
"version": "1.5.0",
"description": "The notions sharing function you want is here too",
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "siyuan-blog",
"author": "terwer",
"url": "https://github.com/terwer/siyuan-plugin-blog",
"version": "1.4.0",
"version": "1.5.0",
"minAppVersion": "2.9.0",
"backends": [
"windows",
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# 使用 Docker 构建配置
echo "Using Docker build config as SSR build."

APP_VERSION=1.4.0
APP_VERSION=1.5.0

# 兼容 node 的构建
pnpm nodeBuild
Expand Down

1 comment on commit 3a90b75

@vercel
Copy link

@vercel vercel bot commented on 3a90b75 Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.