Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49978afd4c | ||
|
|
1079ae9df1 | ||
|
|
2145c0f703 | ||
|
|
b70d4d7b38 | ||
|
|
f0eb08b97a | ||
|
|
303e8e2dd2 | ||
|
|
c567a6a9d5 | ||
|
|
f92baf3b82 | ||
|
|
6680d464c3 | ||
|
|
b6a5460a04 | ||
|
|
84c408d149 | ||
|
|
53d366f6b6 | ||
|
|
6beca83fa3 |
@@ -7,17 +7,26 @@ concurrency:
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'main'
|
||||
- "main"
|
||||
paths:
|
||||
- '.github/workflows/deploy.yml'
|
||||
- 'package.json'
|
||||
- 'bun.lock'
|
||||
- 'src/**'
|
||||
- 'index.html'
|
||||
- 'vite.config.ts'
|
||||
- 'post-build.ts'
|
||||
- 'tsconfig.*'
|
||||
- 'env.d.ts'
|
||||
- 'vite.d.ts'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: "Build"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Setup Bun
|
||||
uses: https://github.com/oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
- name: Set up Bun
|
||||
uses: actions/setup-bun@v2
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
@@ -41,18 +50,16 @@ jobs:
|
||||
name: "Deploy to Stapler"
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
if: ${{ vars.STAPLER_TARGET != '' }}
|
||||
steps:
|
||||
- name: Download production files
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: production-files
|
||||
path: ./dist
|
||||
- name: Compress production files
|
||||
run: tar -czC dist -f dist.tar.gz .
|
||||
- name: Upload to Stapler server
|
||||
run: |
|
||||
curl -s -X PUT --data-binary "@dist.tar.gz" \
|
||||
-H 'X-Token: ${{ secrets.STAPLER_TOKEN }}' \
|
||||
${{ vars.STAPLER_CURL_ARGS }} \
|
||||
${{ vars.STAPLER_TARGET }}
|
||||
uses: actions/stapler-deploy@v1
|
||||
with:
|
||||
path: dist
|
||||
token: ${{ secrets.STAPLER_TOKEN }}
|
||||
target: ${{ github.repository }}
|
||||
extra_curl_args: ${{ vars.STAPLER_CURL_ARGS }}
|
||||
|
||||
+22
-15
@@ -4,17 +4,28 @@ concurrency:
|
||||
group: lint-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
on: [push, workflow_dispatch]
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
paths:
|
||||
- '.github/workflows/lint.yml'
|
||||
- 'package.json'
|
||||
- 'bun.lock'
|
||||
- 'src/**'
|
||||
- 'articles.example/**'
|
||||
- '.oxlintrc.json'
|
||||
- 'eslint.config.ts'
|
||||
- 'tsconfig.*'
|
||||
- 'env.d.ts'
|
||||
- 'vite.d.ts'
|
||||
|
||||
jobs:
|
||||
lint-eslint:
|
||||
name: 'ESLint'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Setup Bun
|
||||
uses: https://github.com/oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
- name: Set up Bun
|
||||
uses: actions/setup-bun@v2
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
@@ -28,10 +39,8 @@ jobs:
|
||||
name: 'Oxlint'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Setup Bun
|
||||
uses: https://github.com/oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
- name: Set up Bun
|
||||
uses: actions/setup-bun@v2
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
@@ -41,14 +50,12 @@ jobs:
|
||||
- name: Run Oxlint
|
||||
run: bun run lint:oxlint
|
||||
|
||||
type-check:
|
||||
name: Type Check
|
||||
tsc:
|
||||
name: 'TypeScript'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Setup Bun
|
||||
uses: https://github.com/oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
- name: Set up Bun
|
||||
uses: actions/setup-bun@v2
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Install dependencies
|
||||
|
||||
Vendored
-9
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"Vue.volar",
|
||||
"dbaeumer.vscode-eslint",
|
||||
"EditorConfig.EditorConfig",
|
||||
"oxc.oxc-vscode",
|
||||
"esbenp.prettier-vscode"
|
||||
]
|
||||
}
|
||||
@@ -31,8 +31,8 @@ node_modules: bun.lock
|
||||
.PHONY: install
|
||||
install: npm-install ## install project
|
||||
|
||||
.PHONY: install
|
||||
install: npm-update ## update project
|
||||
.PHONY: update
|
||||
update: npm-update ## update project
|
||||
|
||||
.PHONY: build
|
||||
build: npm-run-build ## build static site in "dist"
|
||||
@@ -59,3 +59,11 @@ npm-update: ## npm update
|
||||
.PHONY: npm-run-%
|
||||
npm-run-%: node_modules ## npm run (script)
|
||||
$(NPM) run $*
|
||||
|
||||
|
||||
.PHONY: release-%
|
||||
release-%: node_modules ## release major/minor/patch
|
||||
$(NPM) pm version $* --no-git-tag-version || true
|
||||
git add package.json
|
||||
git commit -m "chore: release $$(cat package.json | jq -r .version)"
|
||||
git tag "release/$$(cat package.json | jq -r .version)" -m "md-blog $$(cat package.json | jq -r .version)"
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
"published_on": "Published on",
|
||||
"updated_on": "Updated on",
|
||||
"authored": "By",
|
||||
"copyright": "<a style=\"text-decoration:none;color:inherit;\" target=_blank href=\"https://creativecommons.org/licenses/by-nc/4.0/\">CC BY-NC</a>"
|
||||
"copyright": "<a style=\"text-decoration:none;color:inherit;\" target=_blank href=\"https://creativecommons.org/licenses/by-nc/4.0/\">CC BY-NC</a>",
|
||||
"footer": ""
|
||||
}
|
||||
|
||||
+17
-16
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "md-blog",
|
||||
"version": "1.9.2",
|
||||
"version": "1.9.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"repository": "https://git.klemek.fr/klemek/md-blog",
|
||||
@@ -21,34 +21,35 @@
|
||||
"dependencies": {
|
||||
"@keithclark/shaderview": "https://github.com/keithclark/shaderview/archive/refs/tags/1.2.0.tar.gz",
|
||||
"highlight.js": "^11.11.1",
|
||||
"katex": "^0.16.45",
|
||||
"lucide": "^1.14.0",
|
||||
"mermaid": "^11.14.0",
|
||||
"vue": "^3.5.33",
|
||||
"vue-router": "^5.0.6"
|
||||
"katex": "^0.16.47",
|
||||
"lucide": "^1.25.0",
|
||||
"mermaid": "^11.16.0",
|
||||
"vue": "^3.5.40",
|
||||
"vue-router": "^5.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tsconfig/node24": "^24.0.4",
|
||||
"@types/node": "^24.12.2",
|
||||
"@vitejs/plugin-vue": "^6.0.6",
|
||||
"@types/node": "^24.13.3",
|
||||
"@vitejs/plugin-vue": "^6.0.8",
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.7.0",
|
||||
"@vue/eslint-config-typescript": "^14.9.0",
|
||||
"@vue/tsconfig": "^0.9.1",
|
||||
"eslint": "^10.3.0",
|
||||
"eslint": "^10.7.0",
|
||||
"eslint-plugin-oxlint": "~1.60.0",
|
||||
"eslint-plugin-vue": "~10.8.0",
|
||||
"feed": "^5.2.1",
|
||||
"jiti": "^2.6.1",
|
||||
"jiti": "^2.7.0",
|
||||
"npm-run-all2": "^8.0.4",
|
||||
"oxlint": "~1.60.0",
|
||||
"prettier": "3.8.3",
|
||||
"sass-embedded": "^1.99.0",
|
||||
"tsx": "^4.21.0",
|
||||
"sass-embedded": "^1.100.0",
|
||||
"tsx": "^4.23.1",
|
||||
"typescript": "~6.0.3",
|
||||
"vite": "^8.0.10",
|
||||
"vite": "^8.1.5",
|
||||
"vite-plugin-javascript-obfuscator": "^3.1.0",
|
||||
"vite-plugin-markdown": "^2.2.0",
|
||||
"vite-plugin-vue-devtools": "^8.1.1",
|
||||
"vue-tsc": "^3.2.7"
|
||||
"vite-plugin-vue-devtools": "^8.1.5",
|
||||
"vue-tsc": "^3.3.7"
|
||||
},
|
||||
"engines": {
|
||||
"node": "^20.19.0 || >=22.12.0"
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<script setup lang="ts">
|
||||
import { REPOSITORY, NAME, VERSION, TITLE, COPYRIGHT } from '@lib/config'
|
||||
import { REPOSITORY, NAME, VERSION, TITLE, COPYRIGHT, FOOTER } from '@lib/config'
|
||||
import { stripHTML } from '@lib/strings'
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<footer>
|
||||
{{ stripHTML(TITLE) }} © {{ new Date().getFullYear() }}, <span v-html="COPYRIGHT"></span> |
|
||||
Made with
|
||||
<a :href="REPOSITORY">{{ NAME }} {{ VERSION }}</a>
|
||||
{{ stripHTML(TITLE) }} © {{ new Date().getFullYear() }}, <span v-html="COPYRIGHT"></span>
|
||||
<span v-if="FOOTER"> | <span v-html="FOOTER"></span></span>
|
||||
| Made with <a :href="REPOSITORY">{{ NAME }} {{ VERSION }}</a>
|
||||
</footer>
|
||||
</template>
|
||||
|
||||
+18
-17
@@ -1,18 +1,19 @@
|
||||
import packageJson from '@/../package.json'
|
||||
import articlesConfig from '@articles/config.json'
|
||||
import packageJson from "@/../package.json";
|
||||
import articlesConfig from "@articles/config.json";
|
||||
|
||||
export const NAME: string = packageJson.name
|
||||
export const VERSION: string = packageJson.version
|
||||
export const REPOSITORY: string = packageJson.repository
|
||||
export const TITLE: string = articlesConfig.title
|
||||
export const SIGNATURE: string = articlesConfig.signature
|
||||
export const COPYRIGHT: string = articlesConfig.copyright
|
||||
export const RSS_LINK: string = articlesConfig.rss_link
|
||||
export const BACK_LINK: string = articlesConfig.back_link
|
||||
export const ABOUT_LINK: string = articlesConfig.about_link
|
||||
export const HOME_COUNT: number = articlesConfig.home_count
|
||||
export const PUBLISHED_ON: string = articlesConfig.published_on
|
||||
export const UPDATED_ON: string = articlesConfig.updated_on
|
||||
export const AUTHORED: string = articlesConfig.authored
|
||||
export const BASE_URL: string = import.meta.env.BASE_URL
|
||||
export const PROD: boolean = import.meta.env.PROD
|
||||
export const NAME: string = packageJson.name;
|
||||
export const VERSION: string = packageJson.version;
|
||||
export const REPOSITORY: string = packageJson.repository;
|
||||
export const TITLE: string = articlesConfig.title;
|
||||
export const SIGNATURE: string = articlesConfig.signature;
|
||||
export const COPYRIGHT: string = articlesConfig.copyright;
|
||||
export const FOOTER: string = articlesConfig.footer;
|
||||
export const RSS_LINK: string = articlesConfig.rss_link;
|
||||
export const BACK_LINK: string = articlesConfig.back_link;
|
||||
export const ABOUT_LINK: string = articlesConfig.about_link;
|
||||
export const HOME_COUNT: number = articlesConfig.home_count;
|
||||
export const PUBLISHED_ON: string = articlesConfig.published_on;
|
||||
export const UPDATED_ON: string = articlesConfig.updated_on;
|
||||
export const AUTHORED: string = articlesConfig.authored;
|
||||
export const BASE_URL: string = import.meta.env.BASE_URL;
|
||||
export const PROD: boolean = import.meta.env.PROD;
|
||||
|
||||
@@ -32,15 +32,15 @@ onUpdated(updateDynamicContent)
|
||||
<template v-if="!loading && !article">
|
||||
<NotFoundView />
|
||||
</template>
|
||||
<div v-if="!loading" class="article">
|
||||
<article v-if="!loading" class="article h-entry">
|
||||
<template v-if="!loading && article">
|
||||
<div class="article-header">
|
||||
<h1 class="article-title" v-html="article.metadata.title"></h1>
|
||||
<h1 class="article-title p-name" v-html="article.metadata.title"></h1>
|
||||
<div class="article-info">
|
||||
<span v-if="article.metadata.author"
|
||||
><span v-html="AUTHORED"></span> <span v-html="article.metadata.author"></span> —
|
||||
><span v-html="AUTHORED"></span> <span class="p-author h-card" v-html="article.metadata.author"></span> —
|
||||
</span>
|
||||
<span v-html="PUBLISHED_ON"></span> {{ simpleDateFormat(article.metadata.date) }}
|
||||
<span v-html="PUBLISHED_ON"></span> <time class="dt-published" :datetime="simpleDateFormat(article.metadata.date)">{{ simpleDateFormat(article.metadata.date) }}</time>
|
||||
<span v-if="article.metadata.updated"
|
||||
>— <span v-html="UPDATED_ON"></span>
|
||||
{{ simpleDateFormat(article.metadata.updated) }}</span
|
||||
@@ -53,9 +53,9 @@ onUpdated(updateDynamicContent)
|
||||
alt="thumbnail"
|
||||
/>
|
||||
</div>
|
||||
<div class="article-text" v-html="article.html"></div>
|
||||
<div class="article-text e-content" v-html="article.html"></div>
|
||||
<div class="article-signature" v-html="SIGNATURE"></div>
|
||||
<BackHomeButton />
|
||||
</template>
|
||||
</div>
|
||||
</article>
|
||||
</template>
|
||||
|
||||
@@ -26,10 +26,10 @@ onUpdated(updateDynamicContent)
|
||||
<div v-if="!loading" class="home">
|
||||
<template v-for="(metadata, index) in articles" :key="index">
|
||||
<div v-if="(!metadata.draft || !PROD) && metadata.path" class="article-item">
|
||||
<RouterLink :to="metadata.path">
|
||||
<h2 v-html="metadata.title"></h2>
|
||||
<RouterLink :to="metadata.path" class="h-entry">
|
||||
<h2 class="p-name" v-html="metadata.title"></h2>
|
||||
<span class="article-info"
|
||||
><span v-html="PUBLISHED_ON"></span> {{ simpleDateFormat(metadata.date) }}</span
|
||||
><span v-html="PUBLISHED_ON"></span> <time class="dt-published" :datetime="simpleDateFormat(metadata.date)">{{ simpleDateFormat(metadata.date) }}</time></span
|
||||
>
|
||||
<img
|
||||
v-if="metadata.thumbnail"
|
||||
|
||||
+47
-22
@@ -1,33 +1,58 @@
|
||||
import { fileURLToPath, URL } from 'node:url'
|
||||
import { defineConfig, loadEnv } from 'vite'
|
||||
import vue from '@vitejs/plugin-vue'
|
||||
import vueDevTools from 'vite-plugin-vue-devtools'
|
||||
import { plugin as mdPlugin, Mode } from 'vite-plugin-markdown'
|
||||
import { fileURLToPath, URL } from "node:url";
|
||||
import { defineConfig, loadEnv } from "vite";
|
||||
import vue from "@vitejs/plugin-vue";
|
||||
import vueDevTools from "vite-plugin-vue-devtools";
|
||||
import { plugin as mdPlugin, Mode } from "vite-plugin-markdown";
|
||||
import obfuscatorPlugin from "vite-plugin-javascript-obfuscator";
|
||||
|
||||
import articlesConfig from './articles/config.json'
|
||||
import articlesConfig from "./articles/config.json";
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default ({ mode }: { mode: string }) => {
|
||||
process.env = { ...process.env, ...loadEnv(mode, process.cwd()) }
|
||||
process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
|
||||
|
||||
process.env.VITE_BASE_URL = articlesConfig.base_url
|
||||
process.env.VITE_APP_TITLE = articlesConfig.title
|
||||
process.env.VITE_APP_TITLE_NO_HTML = articlesConfig.title.replace(/(<([^>]+)>)/gi, '').trim()
|
||||
process.env.VITE_APP_LANG = articlesConfig.lang
|
||||
process.env.VITE_CUSTOM_HEAD = articlesConfig.custom_head
|
||||
process.env.VITE_BASE_URL = articlesConfig.base_url;
|
||||
process.env.VITE_APP_TITLE = articlesConfig.title;
|
||||
process.env.VITE_APP_TITLE_NO_HTML = articlesConfig.title.replace(/(<([^>]+)>)/gi, "").trim();
|
||||
process.env.VITE_APP_LANG = articlesConfig.lang;
|
||||
process.env.VITE_CUSTOM_HEAD = articlesConfig.custom_head;
|
||||
|
||||
return defineConfig({
|
||||
plugins: [vue(), vueDevTools(), mdPlugin({ mode: [Mode.HTML] })],
|
||||
base: process.env.VITE_BASE_URL,
|
||||
server: {
|
||||
host: "0.0.0.0",
|
||||
},
|
||||
plugins: [
|
||||
vue(),
|
||||
vueDevTools(),
|
||||
mdPlugin({ mode: [Mode.HTML] }),
|
||||
obfuscatorPlugin({
|
||||
include: [/.*\.md/],
|
||||
options: { splitStrings: true, stringArrayThreshold: 1 },
|
||||
}),
|
||||
],
|
||||
resolve: {
|
||||
alias: {
|
||||
'@': fileURLToPath(new URL('./src', import.meta.url)),
|
||||
'@views': fileURLToPath(new URL('./src/views', import.meta.url)),
|
||||
'@lib': fileURLToPath(new URL('./src/lib', import.meta.url)),
|
||||
'@articles': fileURLToPath(new URL('./articles', import.meta.url)),
|
||||
'@interfaces': fileURLToPath(new URL('./src/interfaces.ts', import.meta.url)),
|
||||
'@components': fileURLToPath(new URL('./src/components', import.meta.url)),
|
||||
"@": fileURLToPath(new URL("./src", import.meta.url)),
|
||||
"@views": fileURLToPath(new URL("./src/views", import.meta.url)),
|
||||
"@lib": fileURLToPath(new URL("./src/lib", import.meta.url)),
|
||||
"@articles": fileURLToPath(new URL("./articles", import.meta.url)),
|
||||
"@interfaces": fileURLToPath(new URL("./src/interfaces.ts", import.meta.url)),
|
||||
"@components": fileURLToPath(new URL("./src/components", import.meta.url)),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
build: {
|
||||
rolldownOptions: {
|
||||
output: {
|
||||
codeSplitting: {
|
||||
groups: [
|
||||
{
|
||||
name: (moduleId: string) => (moduleId.includes("node_modules") ? "libs" : "app"),
|
||||
maxSize: 1024 * 1024,
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -2,26 +2,11 @@ declare module '*.md' {
|
||||
// "unknown" would be more detailed depends on how you structure frontmatter
|
||||
const attributes: Record<string, unknown>
|
||||
|
||||
// When "Mode.TOC" is requested
|
||||
const toc: { level: string; content: string }[]
|
||||
|
||||
// When "Mode.HTML" is requested
|
||||
const html: string
|
||||
|
||||
// When "Mode.RAW" is requested
|
||||
const raw: string
|
||||
|
||||
// When "Mode.React" is requested. VFC could take a generic like React.VFC<{ MyComponent: TypeOfMyComponent }>
|
||||
import React from 'react'
|
||||
const ReactComponent: React.VFC
|
||||
|
||||
// When "Mode.Vue" is requested
|
||||
import { ComponentOptions, Component } from 'vue'
|
||||
const VueComponent: ComponentOptions
|
||||
const VueComponentWith: (components: Record<string, Component>) => ComponentOptions
|
||||
|
||||
// Modify below per your usage
|
||||
export { attributes, toc, html, ReactComponent, VueComponent, VueComponentWith }
|
||||
export { html }
|
||||
}
|
||||
|
||||
declare module '*.vue'
|
||||
|
||||
Reference in New Issue
Block a user