vite-pug-static-builder 1.1.0 → 1.1.2

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,CAiDzB,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,CAgDzB,CAAA"}

package/dist/pug.js

@@ -55,10 +55,9 @@ export const compilePug = async (moduleGraph, url, pugPath, options, locals) =>
             compiledModule.file = pugPath;
             // Vite 7ではModuleGraphが自動的にfileToModulesMapを管理
         }
-        // モジュールが無効化されていない場合はスキップ
-        if (compiledModule.transformResult) {
-            return true;
-        }
+        // 開発モードではtransformResultの有無に関わらず常に最新のコンパイルを実行
+        // これによりファイル変更時の内容更新を確実にする
+        // （本番ビルド時はこの関数は使用されないため性能に影響しない）
         // コンパイル開始
         const map = null;
         const compiledTemplate = compileFile(pugPath, options);

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,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;AA+FrE;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,aAAa,KAAG,MAiC7D,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;AA+FrE;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,WAAW,aAAa,KAAG,MAuE7D,CAAA"}

package/dist/serve.js

@@ -85,21 +85,47 @@ export const vitePluginPugServe = (settings) => {
             server = _server;
             server.middlewares.use(createMiddleware(settings ?? {}, server));
         },
-        handleHotUpdate(context) {
-            const fileModules = server.moduleGraph.getModulesByFile(context.file);
+        // Vite 7の新しいhotUpdateフックを使用してより効率的な処理を実装
+        hotUpdate(context) {
+            const { file, timestamp } = context;
+            const { environment } = this;
+            // Pugファイル自体が変更された場合
+            if (path.extname(file) === '.pug') {
+                // 対応するHTMLモジュールのURLを生成
+                const parsedPath = path.parse(file);
+                const htmlUrl = path.posix.format({
+                    dir: parsedPath.dir.replace(server.config.root, '').replace(/\\/g, '/'),
+                    name: parsedPath.name,
+                    ext: '.html',
+                });
+                // Environment APIを使用してモジュールを取得・無効化（非同期処理を修正）
+                environment.moduleGraph.getModuleByUrl(htmlUrl).then((htmlModule) => {
+                    if (htmlModule) {
+                        // モジュールを適切に無効化（Vite 7の新しいAPI）
+                        environment.moduleGraph.invalidateModule(htmlModule, new Set(), timestamp, true // HMRフラグを明示的にtrue
+                        );
+                    }
+                }).catch(() => {
+                    // モジュールが見つからない場合は無視
+                });
+            }
+            // 従来のファイルモジュール無効化処理
+            const fileModules = environment.moduleGraph.getModulesByFile(file);
             if (fileModules) {
+                const invalidatedModules = new Set(); // 型を明示的に指定
                 for (const fileModule of fileModules) {
                     for (const importer of fileModule.importers) {
                         if (importer.file && path.extname(importer.file) === '.pug') {
-                            server.moduleGraph.invalidateModule(importer);
+                            environment.moduleGraph.invalidateModule(importer, invalidatedModules, timestamp, true);
                         }
                     }
                 }
             }
             // リロード設定に基づいてフルリロードを実行
             if (reload !== false) {
-                context.server.ws.send({ type: 'full-reload' });
+                environment.hot.send({ type: 'full-reload' });
             }
         },
+        // 古いhandleHotUpdateフックは削除（Vite 7では非推奨）
     };
 };

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "vite-pug-static-builder",
-  "version": "1.1.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 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"
-  }
-}
+{
+  "name": "vite-pug-static-builder",
+  "version": "1.1.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": "git+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.5",
+    "vitest": "^3.2.1"
+  }
+}