From 773141f8a2b839269022d539635547dae2f69ca2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:49:50 +0000 Subject: [PATCH 1/3] chore(main): release 1.5.0 --- CHANGELOG.md | 9 ++++++++- package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eb65a5a..56189fe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [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) ### Features * 支持设置自定义域名 ([bf17949](https://github.com/terwer/siyuan-plugin-blog/commit/bf179498a893c156511478dd7ccd46aa9728f09c)) @@ -80,4 +87,4 @@ * remove log ([1617a4e](https://github.com/terwer/siyuan-plugin-blog/commit/1617a4edf528028f70d0be8f2edd5b8354cdcf41)) * remove static preset ([2a1ef1b](https://github.com/terwer/siyuan-plugin-blog/commit/2a1ef1b4199a8e11535239b896281de998bade9e)) * set repo as a mirror ([609d383](https://github.com/terwer/siyuan-plugin-blog/commit/609d383e859861971188b200375d124e2fef698c)) -* 修改项目说明 ([c45182e](https://github.com/terwer/siyuan-plugin-blog/commit/c45182ed2303cbad4d8b1ce68932e13fc80ccf04)) \ No newline at end of file +* 修改项目说明 ([c45182e](https://github.com/terwer/siyuan-plugin-blog/commit/c45182ed2303cbad4d8b1ce68932e13fc80ccf04)) diff --git a/package.json b/package.json index a2359341..b7276df2 100644 --- a/package.json +++ b/package.json @@ -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": { From e0e17ef72467d1a4e7fd7fbeeb11993eec294e63 Mon Sep 17 00:00:00 2001 From: terwer Date: Wed, 21 Jun 2023 19:53:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=86=85?= =?UTF-8?q?=E9=83=A8=E9=93=BE=E6=8E=A5=E5=92=8C=E5=A4=96=E9=83=A8=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +------ nuxt.config.ts | 33 +++++++-------------------------- plugin.json | 2 +- scripts/docker.sh | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56189fe3..c8364d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,9 @@ # Changelog ## [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) -### Features * 支持设置自定义域名 ([bf17949](https://github.com/terwer/siyuan-plugin-blog/commit/bf179498a893c156511478dd7ccd46aa9728f09c)) ### Bug Fixes * 修复未打开浮窗时可能出现的报错问题 ([f379a9d](https://github.com/terwer/siyuan-plugin-blog/commit/f379a9d5ddae19b30a98865d227162ec9255d0c8)) @@ -87,4 +82,4 @@ * remove log ([1617a4e](https://github.com/terwer/siyuan-plugin-blog/commit/1617a4edf528028f70d0be8f2edd5b8354cdcf41)) * remove static preset ([2a1ef1b](https://github.com/terwer/siyuan-plugin-blog/commit/2a1ef1b4199a8e11535239b896281de998bade9e)) * set repo as a mirror ([609d383](https://github.com/terwer/siyuan-plugin-blog/commit/609d383e859861971188b200375d124e2fef698c)) -* 修改项目说明 ([c45182e](https://github.com/terwer/siyuan-plugin-blog/commit/c45182ed2303cbad4d8b1ce68932e13fc80ccf04)) +* 修改项目说明 ([c45182e](https://github.com/terwer/siyuan-plugin-blog/commit/c45182ed2303cbad4d8b1ce68932e13fc80ccf04)) \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index 2e078519..cc86dd5c 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -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 @@ -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: { @@ -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: [], }, @@ -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: { @@ -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, }, }, }) diff --git a/plugin.json b/plugin.json index 87e1968d..d046b9b1 100644 --- a/plugin.json +++ b/plugin.json @@ -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", diff --git a/scripts/docker.sh b/scripts/docker.sh index 345b2de3..2819712f 100644 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -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 From 3c628d95b867f01959a0be57c2721e96d9bbe8b0 Mon Sep 17 00:00:00 2001 From: terwer Date: Wed, 21 Jun 2023 19:54:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=86=85?= =?UTF-8?q?=E9=83=A8=E9=93=BE=E6=8E=A5=E5=92=8C=E5=A4=96=E9=83=A8=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8364d22..ce1fa040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## [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