vite-pug-static-builder 1.0.2-beta.0 → 1.0.2

package/dist/build.d.ts

@@ -3,7 +3,7 @@ import type { Plugin } from 'vite';
 /**
  * Pugビルド設定
  */
-interface BuildSettings {
+export interface BuildSettings {
     /** Pugコンパイルオプション */
     readonly options?: Pug.Options;
     /** Pugローカル変数オブジェクト */
@@ -14,6 +14,5 @@ interface BuildSettings {
  * @param settings - ビルド設定
  * @returns Viteプラグイン
  */
-export declare const vitePluginPugBuild: (settings: BuildSettings) => Plugin;
-export {};
+export declare const vitePluginPugBuild: (settings?: BuildSettings) => Plugin;
 //# sourceMappingURL=build.d.ts.map

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;GAEG;AACH,UAAU,aAAa;IACrB,oBAAoB;IACpB,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IAC9B,sBAAsB;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CACnC;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,aAAa,KAAG,MA6D5D,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,oBAAoB;IACpB,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IAC9B,sBAAsB;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CACnC;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,aAAa,KAAG,MAmE7D,CAAA"}

package/dist/build.js

@@ -8,12 +8,16 @@ import { outputLog } from './utils.js';
  * @returns Viteプラグイン
  */
 export const vitePluginPugBuild = (settings) => {
-    const { options, locals } = settings;
+    const { options, locals } = settings ?? {};
     const pathMap = new Map();
+    let root = '';
     return {
         name: 'vite-plugin-pug-build',
         enforce: 'pre',
         apply: 'build',
+        configResolved(config) {
+            root = config.root;
+        },
         resolveId(source) {
             const parsedPath = path.parse(source);
             if (parsedPath.ext !== '.pug') {
@@ -35,9 +39,10 @@ export const vitePluginPugBuild = (settings) => {
                 // PugファイルのHTMLへの変換
                 if (pathMap.has(id)) {
                     const pugPath = pathMap.get(id);
-                    const compiledTemplate = compileFile(pugPath, options);
-                    const html = compiledTemplate(locals);
-                    outputLog('info', 'compiled:', path.relative(process.cwd(), pugPath));
+                    const pugOptions = { ...options, ...locals };
+                    const compiledTemplate = compileFile(pugPath, pugOptions);
+                    const html = compiledTemplate();
+                    outputLog('info', 'compiled:', path.relative(root, pugPath));
                     return html;
                 }
                 // 既存のHTMLファイルの読み込み

package/dist/index.d.ts

@@ -1,21 +1,13 @@
-import type Pug from 'pug';
-import type Picomatch from 'picomatch';
+import { type BuildSettings } from './build.js';
+import { type ServeSettings } from './serve.js';
 /**
  * プラグイン設定
  */
 interface Settings {
-    /** ビルド時のPugコンパイルオプション */
-    readonly buildOptions?: Pug.Options;
-    /** ビルド時のPugローカル変数 */
-    readonly buildLocals?: Pug.LocalsObject;
-    /** 開発サーバー時のPugコンパイルオプション */
-    readonly serveOptions?: Pug.Options;
-    /** 開発サーバー時のPugローカル変数 */
-    readonly serveLocals?: Pug.LocalsObject;
-    /** 無視パターン */
-    readonly ignorePattern?: Picomatch.Glob;
-    /** リロード設定 */
-    readonly reload?: boolean;
+    /** ビルド時の設定 */
+    readonly build?: BuildSettings;
+    /** 開発サーバー時の設定 */
+    readonly serve?: ServeSettings;
 }
 /**
  * Vite Pug静的サイトプラグイン

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,KAAK,SAAS,MAAM,WAAW,CAAA;AAKtC;;GAEG;AACH,UAAU,QAAQ;IAChB,yBAAyB;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACnC,qBAAqB;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IACvC,4BAA4B;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACnC,wBAAwB;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IACvC,aAAa;IACb,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC,IAAI,CAAA;IACvC,aAAa;IACb,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAC1B;AAID;;;;GAIG;AACH,QAAA,MAAM,mBAAmB,GAAI,eAAe,QAAQ,iCA2BnD,CAAA;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,YAAY,CAAA;AAEnE;;GAEG;AACH,UAAU,QAAQ;IAChB,cAAc;IACd,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAA;IAC9B,iBAAiB;IACjB,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAA;CAC/B;AAID;;;;GAIG;AACH,QAAA,MAAM,mBAAmB,GAAI,eAAe,QAAQ,iCAOnD,CAAA;AAED,eAAe,mBAAmB,CAAA"}

package/dist/index.js

@@ -11,18 +11,6 @@ const vitePluginPugStatic = (userSettings) => {
         ...defaultSettings,
         ...userSettings,
     };
-    const { buildOptions, buildLocals, serveOptions, serveLocals, ignorePattern, reload, } = settings;
-    return [
-        vitePluginPugBuild({
-            ...(buildOptions && { options: buildOptions }),
-            ...(buildLocals && { locals: buildLocals }),
-        }),
-        vitePluginPugServe({
-            ...(serveOptions && { options: serveOptions }),
-            ...(serveLocals && { locals: serveLocals }),
-            ...(ignorePattern && { ignorePattern }),
-            ...(reload !== undefined && { reload }),
-        }),
-    ];
+    return [vitePluginPugBuild(settings.build), vitePluginPugServe(settings.serve)];
 };
 export default vitePluginPugStatic;

package/dist/pug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pug.d.ts","sourceRoot":"","sources":["../src/pug.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,MAAM,CAAA;AA+CnD;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GACrB,aAAa,WAAW,EACxB,KAAK,MAAM,EACX,SAAS,MAAM,EACf,UAAU,GAAG,CAAC,OAAO,EACrB,SAAS,GAAG,CAAC,YAAY,KACxB,OAAO,CAAC,OAAO,GAAG,KAAK,CAsDzB,CAAA"}
+{"version":3,"file":"pug.d.ts","sourceRoot":"","sources":["../src/pug.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAE1B,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,MAAM,CAAA;AA+CnD;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GACrB,aAAa,WAAW,EACxB,KAAK,MAAM,EACX,SAAS,MAAM,EACf,UAAU,GAAG,CAAC,OAAO,EACrB,SAAS,GAAG,CAAC,YAAY,KACxB,OAAO,CAAC,OAAO,GAAG,KAAK,CAiDzB,CAAA"}

package/dist/pug.js

@@ -2,33 +2,33 @@ import path from 'node:path';
 import { compileFile } from 'pug';
 import { outputLog } from './utils.js';
 /**
- * モジュールグラフに祖先モジュールを反映
+ * 依存関係をモジュールグラフに登録
  * @param moduleGraph - モジュールグラフ
  * @param compiledModule - HTMLにコンパイルされるPugモジュール
- * @param ancestors - compiledModuleの祖先ファイルパス配列
+ * @param dependencies - compiledModuleの依存ファイルパス配列
  */
-const reflectAncestorsIntoModuleMap = (moduleGraph, compiledModule, ancestors) => {
+const registerDependencies = (moduleGraph, compiledModule, dependencies) => {
     // モジュールマップに祖先を追加
-    for (const ancestor of ancestors) {
+    for (const dependency of dependencies) {
         try {
-            const ancestorModules = moduleGraph.getModulesByFile(ancestor);
-            let ancestorModule;
-            if (ancestorModules && ancestorModules.size > 0) {
-                ancestorModule = [...ancestorModules][0];
+            const depModules = moduleGraph.getModulesByFile(dependency);
+            let depModule;
+            if (depModules && depModules.size > 0) {
+                depModule = [...depModules][0];
             }
             else {
                 // Vite 7では createFileOnlyEntry の代わりに ensureEntryFromUrl を使用
-                const ancestorUrl = ancestor.replace(process.cwd(), '').replace(/\\/g, '/');
-                ancestorModule = moduleGraph.getModuleById(ancestorUrl) || undefined;
+                const depUrl = dependency.replace(process.cwd(), '').replace(/\\/g, '/');
+                depModule = moduleGraph.getModuleById(depUrl) || undefined;
             }
-            if (ancestorModule) {
-                ancestorModule.importers.add(compiledModule); // TODO: 依存関係から削除された場合の処理
-                compiledModule.importedModules.add(ancestorModule); // オプション
+            if (depModule) {
+                depModule.importers.add(compiledModule); // TODO: 依存関係から削除された場合の処理
+                compiledModule.importedModules.add(depModule); // オプション
             }
         }
         catch (error) {
             // 祖先モジュールの処理に失敗した場合はログを出力して続行
-            outputLog('warn', 'ancestor module processing failed:', ancestor);
+            outputLog('warn', 'dependency module processing failed:', dependency);
         }
     }
 };
@@ -63,9 +63,9 @@ export const compilePug = async (moduleGraph, url, pugPath, options, locals) =>
         const map = null;
         const compiledTemplate = compileFile(pugPath, options);
         // Pugコンパイラから祖先情報を取得
-        const ancestors = compiledTemplate.dependencies;
-        if (ancestors.length > 0) {
-            reflectAncestorsIntoModuleMap(moduleGraph, compiledModule, ancestors);
+        const dependencies = compiledTemplate.dependencies;
+        if (dependencies.length > 0) {
+            registerDependencies(moduleGraph, compiledModule, dependencies);
         }
         // HTML生成
         const code = compiledTemplate(locals);
@@ -74,11 +74,7 @@ export const compilePug = async (moduleGraph, url, pugPath, options, locals) =>
         return true;
     }
     catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        outputLog('error', 'compilation failed:', pugPath, errorMessage);
-        if (error instanceof Error) {
-            return error;
-        }
-        return new Error(`Pug compilation failed: ${errorMessage}`);
+        outputLog('error', 'compilation failed:', pugPath, String(error));
+        return error instanceof Error ? error : new Error(String(error));
     }
 };

package/dist/serve.d.ts

@@ -5,7 +5,7 @@ import type Picomatch from 'picomatch';
 /**
  * 開発サーバー設定
  */
-interface ServeSettings {
+export interface ServeSettings {
     /** Pugコンパイルオプション */
     readonly options?: Pug.Options;
     /** Pugローカル変数オブジェクト */
@@ -24,6 +24,5 @@ export type Middleware = (req: Connect.IncomingMessage, res: http.ServerResponse
  * @param settings - サーブ設定
  * @returns Viteプラグイン
  */
-export declare const vitePluginPugServe: (settings: ServeSettings) => Plugin;
-export {};
+export declare const vitePluginPugServe: (settings?: ServeSettings) => Plugin;
 //# sourceMappingURL=serve.d.ts.map

package/dist/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAEjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAiB,OAAO,EAAE,MAAM,MAAM,CAAA;AAE1D,OAAO,KAAK,SAAS,MAAM,WAAW,CAAA;AAKtC;;GAEG;AACH,UAAU,aAAa;IACrB,oBAAoB;IACpB,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IAC9B,sBAAsB;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IAClC,4BAA4B;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC,IAAI,CAAA;IACvC,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,OAAO,CAAC,eAAe,EAC5B,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE,OAAO,CAAC,YAAY,KACvB,IAAI,GAAG,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;AA8FrE;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,aAAa,KAAG,MAiC5D,CAAA"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAEjC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAiB,OAAO,EAAE,MAAM,MAAM,CAAA;AAE1D,OAAO,KAAK,SAAS,MAAM,WAAW,CAAA;AAKtC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,oBAAoB;IACpB,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IAC9B,sBAAsB;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IAClC,4BAA4B;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,CAAC,IAAI,CAAA;IACvC,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,OAAO,CAAC,eAAe,EAC5B,GAAG,EAAE,IAAI,CAAC,cAAc,EACxB,IAAI,EAAE,OAAO,CAAC,YAAY,KACvB,IAAI,GAAG,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;AA8FrE;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,aAAa,KAAG,MAiC7D,CAAA"}

package/dist/serve.js

@@ -74,7 +74,7 @@ const createMiddleware = (settings, server) => {
  * @returns Viteプラグイン
  */
 export const vitePluginPugServe = (settings) => {
-    const { reload } = settings;
+    const { reload } = settings ?? {};
     let server;
     return {
         name: 'vite-plugin-pug-serve',
@@ -82,7 +82,7 @@ export const vitePluginPugServe = (settings) => {
         apply: 'serve',
         configureServer(_server) {
             server = _server;
-            server.middlewares.use(createMiddleware(settings, server));
+            server.middlewares.use(createMiddleware(settings ?? {}, server));
         },
         handleHotUpdate(context) {
             const fileModules = server.moduleGraph.getModulesByFile(context.file);

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "vite-pug-static-builder",
-  "version": "1.0.2-beta.0",
-  "description": "Vite + Pugを使用した静的サイトビルダー - 複数のPugファイルを静的HTMLとしてビルドするViteプラグイン",
-  "author": "maigo999",
-  "license": "MIT",
-  "homepage": "https://github.com/ozekimasaki/vite-pug-static-builder#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ozekimasaki/vite-pug-static-builder.git"
-  },
-  "bugs": {
-    "url": "https://github.com/ozekimasaki/vite-pug-static-builder/issues"
-  },
-  "keywords": [
-    "vite",
-    "vite-plugin",
-    "static",
-    "pug",
-    "static-site",
-    "site-builder",
-    "html-generator"
-  ],
-  "files": [
-    "dist"
-  ],
-  "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    }
-  },
-  "scripts": {
-    "clean": "rimraf ./dist",
-    "type-check": "tsc --noEmit -p .",
-    "test:vite6": "cross-env VITE_MAJOR_VERSION=6 vitest run",
-    "test:vite7": "cross-env VITE_MAJOR_VERSION=7 vitest run",
-    "test": "pnpm test:vite7",
-    "test:update": "vitest run -u",
-    "test:watch": "vitest",
-    "coverage": "cross-env VITE_MAJOR_VERSION=7 vitest run --coverage",
-    "tsc": "tsc -p .",
-    "build": "pnpm clean && pnpm tsc",
-    "prepublishOnly": "pnpm coverage && pnpm build"
-  },
-  "dependencies": {
-    "ansis": "^3.2.0",
-    "picomatch": "^4.0.2",
-    "pug": "^3.0.3"
-  },
-  "peerDependencies": {
-    "pug": "^3.0.0",
-    "vite": "^6.0.0 || ^7.0.0-beta.0"
-  },
-  "devDependencies": {
-    "@types/picomatch": "^2.3.3",
-    "@types/pug": "^2.0.10",
-    "@vitest/coverage-v8": "^3.2.1",
-    "axios": "^1.7.9",
-    "cross-env": "^7.0.3",
-    "fs-extra": "^11.3.0",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.6.3",
-    "vite": "^6.0.0",
-    "vitest": "^3.2.1"
-  }
-}
+{
+  "name": "vite-pug-static-builder",
+  "version": "1.0.2",
+  "description": "Vite + Pugを使用した静的サイトビルダー - 複数のPugファイルを静的HTMLとしてビルドするViteプラグイン",
+  "author": "maigo999",
+  "license": "MIT",
+  "homepage": "https://github.com/ozekimasaki/vite-pug-static-builder#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ozekimasaki/vite-pug-static-builder.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ozekimasaki/vite-pug-static-builder/issues"
+  },
+  "keywords": [
+    "vite",
+    "vite-plugin",
+    "static",
+    "pug",
+    "static-site",
+    "site-builder",
+    "html-generator"
+  ],
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "scripts": {
+    "clean": "rimraf ./dist",
+    "type-check": "tsc --noEmit -p .",
+    "test:vite6": "cross-env VITE_MAJOR_VERSION=6 vitest run",
+    "test:vite7": "cross-env VITE_MAJOR_VERSION=7 vitest run",
+    "test": "pnpm test:vite7",
+    "test:update": "vitest run -u",
+    "test:watch": "vitest",
+    "coverage": "cross-env VITE_MAJOR_VERSION=7 vitest run --coverage",
+    "tsc": "tsc -p .",
+    "build": "pnpm clean && pnpm tsc",
+    "prepublishOnly": "pnpm build"
+  },
+  "dependencies": {
+    "ansis": "^3.2.0",
+    "picomatch": "^4.0.2",
+    "pug": "^3.0.3"
+  },
+  "peerDependencies": {
+    "pug": "^3.0.0",
+    "vite": "^6.0.0 || ^7.0.0"
+  },
+  "devDependencies": {
+    "@types/picomatch": "^2.3.3",
+    "@types/pug": "^2.0.10",
+    "@vitest/coverage-v8": "^3.2.1",
+    "axios": "^1.7.9",
+    "cross-env": "^7.0.3",
+    "fs-extra": "^11.3.0",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.6.3",
+    "vite": "^7.0.0",
+    "vitest": "^3.2.1"
+  }
+}