clarity-theme 0.1.0 → 0.1.2

package/nuxt.config.ts

@@ -1,225 +1,228 @@
-import { dirname, join } from 'node:path'
-import { arch, env, version as nodeVersion, platform } from 'node:process'
-import { fileURLToPath, pathToFileURL } from 'node:url'
-import { name as ciName, CLOUDFLARE_PAGES, GITHUB_ACTIONS, NETLIFY } from 'ci-info'
-import { Temporal } from 'temporal-polyfill'
-import { homepage, name as themeName, version as themeVersion } from './package.json'
-
-/** Theme 根目录（Layer 本地路径基准，兼容 npm 包 / git 包 / 本地目录安装） */
-const themeDir = dirname(fileURLToPath(import.meta.url))
-const toThemePath = (path: string) => join(themeDir, path).replaceAll('\\', '/')
-
+import { dirname, join } from 'node:path'
+import { arch, env, version as nodeVersion, platform } from 'node:process'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import { name as ciName, CLOUDFLARE_PAGES, GITHUB_ACTIONS, NETLIFY } from 'ci-info'
+import { Temporal } from 'temporal-polyfill'
+import { homepage, name as themeName, version as themeVersion } from './package.json'
+
+/** Theme 根目录（Layer 本地路径基准，兼容 npm 包 / git 包 / 本地目录安装） */
+const themeDir = dirname(fileURLToPath(import.meta.url))
+const toThemePath = (path: string) => join(themeDir, path).replaceAll('\\', '/')
+
 function pluginPath(path: string) {
 	// 插件必须是 .mjs：@nuxt/content 以 Node 原生方式加载，
 	// 不允许 node_modules 内的 TS 文件（TS 剥离限制）
-	return pathToFileURL(join(themeDir, 'remark-plugins', `${path}.mjs`)).href
+	return pathToFileURL(join(themeDir, 'src', 'remark-plugins', `${path}.mjs`)).href
 }
-
-/**
- * Clarity Theme Layer 配置
- *
- * 站点数据（SEO、favicon、scripts 等）由 modules/clarity-config
- * 读取消费项目的 clarity.config.ts 后统一注入，此处仅包含 Theme 自身能力。
- */
-export default defineNuxtConfig({
-	app: {
-		head: {
-			meta: [
-				{ name: 'color-scheme', content: 'light dark' },
-				{ 'name': 'generator', 'content': `Clarity Theme ${themeVersion}`, 'data-github-repo': homepage },
-				{ name: 'mobile-web-app-capable', content: 'yes' },
-			],
-			link: [
-				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/katex@0.16.44/dist/katex.min.css' },
-				// "InterVariable", "Inter"
-				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/inter-ui@4.1.1/inter-variable.css' },
-				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/inter-ui@4.1.1/inter.css' },
-				// "JetBrains Mono", 思源宋体 "Noto Serif SC"
-				{ rel: 'preconnect', href: 'https://fonts.gstatic.cn', crossorigin: '' },
-				{ rel: 'stylesheet', href: 'https://fonts.googleapis.cn/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=Noto+Serif+SC:wght@200..900&display=swap' },
-			],
-			templateParams: {
-				separator: '|',
-			},
-		},
-		rootAttrs: {
-			id: 'blog-root',
-		},
-	},
-
-	compatibilityDate: '2024-08-03',
-
-	components: [
-		{ path: toThemePath('app/components/partial'), prefix: 'Z' },
-		toThemePath('app/components'),
-	],
-
-	// @keep-sorted
-	css: [
-		toThemePath('app/assets/css/animation.scss'),
-		toThemePath('app/assets/css/article.scss'),
-		toThemePath('app/assets/css/color.scss'),
-		toThemePath('app/assets/css/font.scss'),
-		toThemePath('app/assets/css/main.scss'),
-		toThemePath('app/assets/css/reusable.scss'),
-	],
-
-	// @keep-sorted
-	experimental: {
-		extractAsyncDataHandlers: true,
-		typescriptPlugin: true,
-	},
-
-	// @keep-sorted
-	modules: [
-		'@bikariya/image-viewer',
-		'@bikariya/modals',
-		'@bikariya/shiki',
-		'@nuxt/content',
-		'@nuxt/icon',
-		'@nuxt/image',
-		'@nuxtjs/color-mode',
+
+/**
+ * Clarity Theme Layer 配置
+ *
+ * 站点数据（SEO、favicon、scripts 等）由 src/modules/clarity-config
+ * 读取消费项目的 clarity.config.ts 后统一注入，此处仅包含 Theme 自身能力。
+ */
+export default defineNuxtConfig({
+	app: {
+		head: {
+			meta: [
+				{ name: 'color-scheme', content: 'light dark' },
+				{ 'name': 'generator', 'content': `Clarity Theme ${themeVersion}`, 'data-github-repo': homepage },
+				{ name: 'mobile-web-app-capable', content: 'yes' },
+			],
+			link: [
+				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/katex@0.16.44/dist/katex.min.css' },
+				// "InterVariable", "Inter"
+				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/inter-ui@4.1.1/inter-variable.css' },
+				{ rel: 'stylesheet', href: 'https://s4.zstatic.net/npm/inter-ui@4.1.1/inter.css' },
+				// "JetBrains Mono", 思源宋体 "Noto Serif SC"
+				{ rel: 'preconnect', href: 'https://fonts.gstatic.cn', crossorigin: '' },
+				{ rel: 'stylesheet', href: 'https://fonts.googleapis.cn/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=Noto+Serif+SC:wght@200..900&display=swap' },
+			],
+			templateParams: {
+				separator: '|',
+			},
+		},
+		rootAttrs: {
+			id: 'blog-root',
+		},
+	},
+
+	compatibilityDate: '2024-08-03',
+
+	components: [
+		{ path: toThemePath('src/components/partial'), prefix: 'Z' },
+		toThemePath('src/components'),
+	],
+
+	// @keep-sorted
+	css: [
+		toThemePath('src/assets/css/animation.scss'),
+		toThemePath('src/assets/css/article.scss'),
+		toThemePath('src/assets/css/color.scss'),
+		toThemePath('src/assets/css/font.scss'),
+		toThemePath('src/assets/css/main.scss'),
+		toThemePath('src/assets/css/reusable.scss'),
+	],
+
+	// @keep-sorted
+	experimental: {
+		extractAsyncDataHandlers: true,
+		typescriptPlugin: true,
+	},
+
+	// @keep-sorted
+	modules: [
+		// 必须最先运行：把 src/ 仅应用到 Clarity 自身 layer，避免静态
+		// srcDir / serverDir / dir.* 经 c12 合并泄漏到 consumer root 配置。
+		toThemePath('src/modules/clarity-source-layout'),
+		'@bikariya/image-viewer',
+		'@bikariya/modals',
+		'@bikariya/shiki',
+		'@nuxt/content',
+		'@nuxt/icon',
+		'@nuxt/image',
+		'@nuxtjs/color-mode',
 		'@nuxtjs/seo',
 		'@pinia/nuxt',
 		'@vueuse/nuxt',
 		// Layer 配置中的相对 module 路径会以消费项目为基准解析，必须使用绝对路径；
 		// 且 clarity-config 必须先于 nuxt-llms 运行：后者在 setup 时读取注入的 llms 站点配置
-		toThemePath('modules/clarity-config'),
+		toThemePath('src/modules/clarity-config'),
 		'nuxt-llms',
 	],
-
-	nitro: {
-		prerender: {
-			// 修复部分平台会在文章路径后添加 `/`，导致闪现 404 错误
-			// https://github.com/nuxt/content/issues/2378
-			autoSubfolderIndex: CLOUDFLARE_PAGES || GITHUB_ACTIONS || NETLIFY ? false : undefined,
-		},
-	},
-
-	runtimeConfig: {
-		// @keep-sorted
-		public: {
-			arch,
-			buildTime: Temporal.Now.zonedDateTimeISO().toString(),
-			// EdgeOne 检测暂时不可用
-			ci: env.TENCENTCLOUD_RUNENV === 'SCF' ? 'EdgeOne' : ciName || '',
-			nodeVersion,
-			platform,
-		},
-	},
-
-	typescript: {
-		nodeTsConfig: {
-			// @keep-sorted
-			include: [
-				'../config/**/*.ts',
-				'../remark-plugins/**/*.ts',
-			],
-		},
-	},
-
-	vite: {
-		css: {
-			preprocessorOptions: {
-				scss: {
-					additionalData: `@use "${toThemePath('app/assets/css/_variable.scss')}" as *;`,
-				},
-			},
-		},
-		// @keep-sorted
-		optimizeDeps: {
-			include: ['@shikijs/colorized-brackets', '@shikijs/transformers', '@unhead/schema-org/vue', '@vue/devtools-core', '@vue/devtools-kit', 'embla-carousel-autoplay', 'embla-carousel-vue', 'embla-carousel-wheel-gestures', 'es-toolkit/array', 'es-toolkit/math', 'es-toolkit/object', 'es-toolkit/promise', 'es-toolkit/string', 'minisearch', 'parse-domain', 'plain-shiki', 'shiki/themes/catppuccin-latte.mjs', 'shiki/themes/one-dark-pro.mjs', 'temporal-polyfill', 'vue-tippy'],
-		},
-		server: {
-			allowedHosts: true,
-		},
-	},
-
-	colorMode: {
-		preference: 'system',
-		fallback: 'light',
-		classSuffix: '',
-	},
-
-	content: {
-		build: {
-			markdown: {
-				highlight: false,
-				// @keep-sorted
-				remarkPlugins: {
-					[pluginPath('remark-code-component')]: {
-						options: {
-							'mermaid': { component: 'mermaid', prop: 'code' },
-							'music-abc': { component: 'music-score', prop: 'abc' },
-						},
-					},
-					'remark-math': {},
-					'remark-reading-time': {},
-				},
-				// @keep-sorted
-				rehypePlugins: {
-					[pluginPath('rehype-meta-slots')]: {},
-					'rehype-katex': {},
-				},
-				toc: { depth: 4, searchDepth: 4 },
-			},
-		},
-		experimental: {
-			sqliteConnector: 'native',
-		},
-	},
-
-	dxup: {
-		features: {
-			// 页面通过 <template #aside> 向布局具名插槽传参
-			namedLayoutSlots: true,
-		},
-	},
-
-	hooks: {
-		ready: () => {
-			console.info(`
-================================
-${themeName} ${themeVersion}
-${homepage}
-================================
-`)
-		},
-	},
-
-	icon: {
-		customCollections: [
-			{ prefix: 'clarity', dir: toThemePath('app/assets/icons') },
-		],
-		clientBundle: {
-			scan: {
-				globInclude: ['**\/*.{vue,jsx,tsx,ts,md,mdc,mdx}'],
-			},
-		},
-	},
-
-	image: {
-		densities: [1, 1.5, 2],
-		format: ['avif', 'webp'],
-		// Netlify 下 netlify 处理器无法显示站外图片，ipx 处理器无法显示站内图片，需彻底禁用
-		// https://github.com/nuxt/image/issues/1353
-		provider: NETLIFY ? 'none' : undefined,
-	},
-
-	linkChecker: {
-		// @keep-sorted
-		skipInspections: [
-			'no-baseless',
-			'no-non-ascii-chars',
-			'no-uppercase-chars',
-		],
-	},
-
-	ogImage: {
-		enabled: false,
-	},
-
-	robots: {
-		disableNuxtContentIntegration: true,
-	},
-})
+
+	nitro: {
+		prerender: {
+			// 修复部分平台会在文章路径后添加 `/`，导致闪现 404 错误
+			// https://github.com/nuxt/content/issues/2378
+			autoSubfolderIndex: CLOUDFLARE_PAGES || GITHUB_ACTIONS || NETLIFY ? false : undefined,
+		},
+	},
+
+	runtimeConfig: {
+		// @keep-sorted
+		public: {
+			arch,
+			buildTime: Temporal.Now.zonedDateTimeISO().toString(),
+			// EdgeOne 检测暂时不可用
+			ci: env.TENCENTCLOUD_RUNENV === 'SCF' ? 'EdgeOne' : ciName || '',
+			nodeVersion,
+			platform,
+		},
+	},
+
+	typescript: {
+		nodeTsConfig: {
+			// @keep-sorted
+			include: [
+				'../src/config/**/*.ts',
+				'../src/remark-plugins/**/*.ts',
+			],
+		},
+	},
+
+	vite: {
+		css: {
+			preprocessorOptions: {
+				scss: {
+					additionalData: `@use "${toThemePath('src/assets/css/_variable.scss')}" as *;`,
+				},
+			},
+		},
+		// @keep-sorted
+		optimizeDeps: {
+			include: ['@shikijs/colorized-brackets', '@shikijs/transformers', '@unhead/schema-org/vue', '@vue/devtools-core', '@vue/devtools-kit', 'embla-carousel-autoplay', 'embla-carousel-vue', 'embla-carousel-wheel-gestures', 'es-toolkit/array', 'es-toolkit/math', 'es-toolkit/object', 'es-toolkit/promise', 'es-toolkit/string', 'minisearch', 'parse-domain', 'plain-shiki', 'shiki/themes/catppuccin-latte.mjs', 'shiki/themes/one-dark-pro.mjs', 'temporal-polyfill', 'vue-tippy'],
+		},
+		server: {
+			allowedHosts: true,
+		},
+	},
+
+	colorMode: {
+		preference: 'system',
+		fallback: 'light',
+		classSuffix: '',
+	},
+
+	content: {
+		build: {
+			markdown: {
+				highlight: false,
+				// @keep-sorted
+				remarkPlugins: {
+					[pluginPath('remark-code-component')]: {
+						options: {
+							'mermaid': { component: 'mermaid', prop: 'code' },
+							'music-abc': { component: 'music-score', prop: 'abc' },
+						},
+					},
+					'remark-math': {},
+					'remark-reading-time': {},
+				},
+				// @keep-sorted
+				rehypePlugins: {
+					[pluginPath('rehype-meta-slots')]: {},
+					'rehype-katex': {},
+				},
+				toc: { depth: 4, searchDepth: 4 },
+			},
+		},
+		experimental: {
+			sqliteConnector: 'native',
+		},
+	},
+
+	dxup: {
+		features: {
+			// 页面通过 <template #aside> 向布局具名插槽传参
+			namedLayoutSlots: true,
+		},
+	},
+
+	hooks: {
+		ready: () => {
+			console.info(`
+================================
+${themeName} ${themeVersion}
+${homepage}
+================================
+`)
+		},
+	},
+
+	icon: {
+		customCollections: [
+			{ prefix: 'clarity', dir: toThemePath('src/assets/icons') },
+		],
+		clientBundle: {
+			scan: {
+				globInclude: ['**\/*.{vue,jsx,tsx,ts,md,mdc,mdx}'],
+			},
+		},
+	},
+
+	image: {
+		densities: [1, 1.5, 2],
+		format: ['avif', 'webp'],
+		// Netlify 下 netlify 处理器无法显示站外图片，ipx 处理器无法显示站内图片，需彻底禁用
+		// https://github.com/nuxt/image/issues/1353
+		provider: NETLIFY ? 'none' : undefined,
+	},
+
+	linkChecker: {
+		// @keep-sorted
+		skipInspections: [
+			'no-baseless',
+			'no-non-ascii-chars',
+			'no-uppercase-chars',
+		],
+	},
+
+	ogImage: {
+		enabled: false,
+	},
+
+	robots: {
+		disableNuxtContentIntegration: true,
+	},
+})

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "clarity-theme",
   "type": "module",
-  "version": "0.1.0",
-  "packageManager": "pnpm@12.4.1",
+  "version": "0.1.2",
   "description": "Clarity Theme — 从 blog-v3 提取的可复用 Nuxt 4 Layer 博客主题",
   "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
   "homepage": "https://github.com/iicemeta/clarity-theme",
   "repository": {
     "type": "git",
@@ -16,59 +18,33 @@
   "exports": {
     ".": "./nuxt.config.ts",
     "./config": {
-      "types": "./config/index.d.mts",
-      "default": "./config/index.mjs"
+      "types": "./src/config/index.d.mts",
+      "default": "./src/config/index.mjs"
     },
     "./content": {
-      "types": "./config/content.d.mts",
-      "default": "./config/content.mjs"
+      "types": "./src/config/content.d.mts",
+      "default": "./src/config/content.mjs"
     },
     "./img": {
-      "types": "./img/index.d.mts",
-      "default": "./img/index.mjs"
+      "types": "./src/img/index.d.mts",
+      "default": "./src/img/index.mjs"
     },
     "./schema": {
-      "types": "./config/schema.d.mts",
-      "default": "./config/schema.mjs"
+      "types": "./src/config/schema.d.mts",
+      "default": "./src/config/schema.mjs"
     }
   },
   "main": "./nuxt.config.ts",
   "files": [
     "LICENSE",
     "README.md",
-    "app",
-    "config",
-    "img",
-    "modules",
     "nuxt.config.ts",
     "package.json",
-    "public",
-    "remark-plugins",
-    "server",
-    "shared"
+    "src"
   ],
   "engines": {
     "node": "^22.19 || ^24.11 || >=26"
   },
-  "scripts": {
-    "dev": "pnpm --dir playground dev",
-    "build": "pnpm --dir playground build",
-    "generate": "pnpm --dir playground generate",
-    "lint": "eslint && stylelint \"app/**/*.{vue,scss}\" \"playground/app/**/*.vue\"",
-    "lint:fix": "eslint --fix && stylelint \"app/**/*.{vue,scss}\" \"playground/app/**/*.vue\" --fix",
-    "typecheck": "pnpm --dir playground typecheck",
-    "verify": "node scripts/verify-theme.mjs",
-    "test:sync": "node --test tests/sync-upstream.test.mjs",
-    "test:migration": "node --test tests/migration-skill.test.mjs",
-    "test:contract": "node scripts/test-compatibility.mjs --contract-only",
-    "test:release": "pnpm verify && pnpm test:consumer && pnpm test:compatibility",
-    "test:consumer": "node scripts/test-consumer.mjs",
-    "test:compatibility": "node scripts/test-compatibility.mjs",
-    "sync:check": "node scripts/sync-upstream.mjs check",
-    "sync:diff": "node scripts/sync-upstream.mjs diff",
-    "sync:apply": "node scripts/sync-upstream.mjs apply",
-    "sync:verify": "node scripts/sync-upstream.mjs verify"
-  },
   "peerDependencies": {
     "nuxt": "^4.5.2",
     "vue": "^3.5.42"
@@ -129,6 +105,7 @@
     "@nuxt/hints": "^1.1.4",
     "@stylistic/stylelint-plugin": "^5.2.1",
     "@types/hast": "^3.0.5",
+    "@types/mdast": "^4.0.4",
     "@zinkawaii/stylelint-config": "^0.5.2",
     "cspell": "^10.2.2",
     "eslint": "^10.10.0",
@@ -144,5 +121,26 @@
     "typescript": "^6.0.3",
     "vue": "^3.5.42",
     "vue-router": "^5.3.1"
+  },
+  "scripts": {
+    "dev": "pnpm --dir playground dev",
+    "build": "pnpm --dir playground build",
+    "generate": "pnpm --dir playground generate",
+    "lint": "eslint && stylelint \"src/**/*.{vue,scss}\" \"playground/app/**/*.vue\"",
+    "lint:fix": "eslint --fix && stylelint \"src/**/*.{vue,scss}\" \"playground/app/**/*.vue\" --fix",
+    "typecheck": "pnpm --dir playground typecheck",
+    "verify": "node scripts/verify-theme.mjs",
+    "test:sync": "node --test tests/sync-upstream.test.mjs",
+    "test:migration": "node --test tests/migration-skill.test.mjs",
+    "test:contract": "node scripts/test-compatibility.mjs --contract-only",
+    "test:release": "pnpm verify && pnpm test:consumer && pnpm test:compatibility",
+    "test:consumer": "node scripts/test-consumer.mjs",
+    "test:compatibility": "node scripts/test-compatibility.mjs",
+    "test:registry-consumer": "node scripts/test-registry-consumer.mjs",
+    "release:check": "node scripts/release-check.mjs",
+    "sync:check": "node scripts/sync-upstream.mjs check",
+    "sync:diff": "node scripts/sync-upstream.mjs diff",
+    "sync:apply": "node scripts/sync-upstream.mjs apply",
+    "sync:verify": "node scripts/sync-upstream.mjs verify"
   }
 }