vite-plugin-php 3.0.0-beta.0 → 3.0.0-beta.2

package/dist/index.cjs

@@ -10835,6 +10835,47 @@ const handleExit = {
   }
 };
 
+const assetsPattern = new RegExp(
+  `^(.+?)(${phpStartPattern}\\s+namespace\\s\\S+?(?:\\s*;|\\s*{).+)$`,
+  "si"
+);
+const viteClientInjection = '<script type="module" src="/@vite/client"><\/script>\n';
+const viteClientInjectionPattern = new RegExp(
+  '<script.+?src="/@vite/client".+?<\/script>(\r\n|\n|\r)',
+  "si"
+);
+const lastTagPattern = new RegExp(`^(.+(?:</.+?>|<.+?/>))(.+|)$`, "si");
+const closingPattern = new RegExp(`^(.+)(${phpStartPattern}.+)$`, "si");
+function fixAssetsInjection(input) {
+  let out = input;
+  let assets = "";
+  out = out.replace(assetsPattern, (match, p1, p2) => {
+    assets = p1.trim();
+    return p2;
+  });
+  const injectAssets = (_, part1, part2) => {
+    let a = assets;
+    if (!(part1.endsWith("\n") || part1.endsWith("\r"))) {
+      a = "\r\n" + a;
+    }
+    if (!(part2.startsWith("\n") || part2.startsWith("\r"))) {
+      a += "\r\n";
+    }
+    assets = "";
+    return `${part1}${a}${part2}`;
+  };
+  if (assets) {
+    out = out.replace(lastTagPattern, injectAssets);
+  }
+  if (assets) {
+    out = out.replace(closingPattern, injectAssets);
+  }
+  if (assets) {
+    out += assets;
+  }
+  return out;
+}
+
 const phpProxy = async (req, res, next) => {
   try {
     if (req.url && !["/@vite", "/@fs", "/@id/__x00__", "/node_modules"].some(
@@ -10909,7 +10950,15 @@ const phpProxy = async (req, res, next) => {
             ).on("error", (error) => {
               reject(error);
             }).on("close", () => {
-              const content = Buffer.concat(chunks).toString("utf8");
+              let content = Buffer.concat(chunks).toString("utf8");
+              if (incomingHeaders["content-type"]?.includes(
+                "text/html"
+              ) && !viteClientInjectionPattern.test(content)) {
+                content = viteClientInjection + content;
+                if (incomingHeaders["content-length"]) {
+                  incomingHeaders["content-length"] = `${content.length}`;
+                }
+              }
               resolve2({
                 statusCode,
                 headers: incomingHeaders,
@@ -10937,42 +10986,6 @@ const phpProxy = async (req, res, next) => {
   next();
 };
 
-const assetsPattern = new RegExp(
-  `^(.+?)(${phpStartPattern}\\s+namespace\\s\\S+?(?:\\s*;|\\s*{).+)$`,
-  "si"
-);
-const lastTagPattern = new RegExp(`^(.+(?:</.+?>|<.+?/>))(.+|)$`, "si");
-const closingPattern = new RegExp(`^(.+)(${phpStartPattern}.+)$`, "si");
-function fixAssetsInjection(input) {
-  let out = input;
-  let assets = "";
-  out = out.replace(assetsPattern, (match, p1, p2) => {
-    assets = p1.trim();
-    return p2;
-  });
-  const injectAssets = (_, part1, part2) => {
-    let a = assets;
-    if (!(part1.endsWith("\n") || part1.endsWith("\r"))) {
-      a = "\r\n" + a;
-    }
-    if (!(part2.startsWith("\n") || part2.startsWith("\r"))) {
-      a += "\r\n";
-    }
-    assets = "";
-    return `${part1}${a}${part2}`;
-  };
-  if (assets) {
-    out = out.replace(lastTagPattern, injectAssets);
-  }
-  if (assets) {
-    out = out.replace(closingPattern, injectAssets);
-  }
-  if (assets) {
-    out += assets;
-  }
-  return out;
-}
-
 const serve = {
   rewriteUrl: (url) => url
 };
@@ -11125,6 +11138,12 @@ const servePlugin = [
             php.code = PHP_Code.unescape(php.code, escapes);
           }
           php.code = fixAssetsInjection(php.code);
+          if (!php.code.includes("</head>")) {
+            php.code = php.code.replace(
+              new RegExp(viteClientInjectionPattern, "gsi"),
+              ""
+            );
+          }
           php.write(tempName(entry));
           return php.code;
         }

package/dist/index.mjs

@@ -10818,6 +10818,47 @@ const handleExit = {
   }
 };
 
+const assetsPattern = new RegExp(
+  `^(.+?)(${phpStartPattern}\\s+namespace\\s\\S+?(?:\\s*;|\\s*{).+)$`,
+  "si"
+);
+const viteClientInjection = '<script type="module" src="/@vite/client"><\/script>\n';
+const viteClientInjectionPattern = new RegExp(
+  '<script.+?src="/@vite/client".+?<\/script>(\r\n|\n|\r)',
+  "si"
+);
+const lastTagPattern = new RegExp(`^(.+(?:</.+?>|<.+?/>))(.+|)$`, "si");
+const closingPattern = new RegExp(`^(.+)(${phpStartPattern}.+)$`, "si");
+function fixAssetsInjection(input) {
+  let out = input;
+  let assets = "";
+  out = out.replace(assetsPattern, (match, p1, p2) => {
+    assets = p1.trim();
+    return p2;
+  });
+  const injectAssets = (_, part1, part2) => {
+    let a = assets;
+    if (!(part1.endsWith("\n") || part1.endsWith("\r"))) {
+      a = "\r\n" + a;
+    }
+    if (!(part2.startsWith("\n") || part2.startsWith("\r"))) {
+      a += "\r\n";
+    }
+    assets = "";
+    return `${part1}${a}${part2}`;
+  };
+  if (assets) {
+    out = out.replace(lastTagPattern, injectAssets);
+  }
+  if (assets) {
+    out = out.replace(closingPattern, injectAssets);
+  }
+  if (assets) {
+    out += assets;
+  }
+  return out;
+}
+
 const phpProxy = async (req, res, next) => {
   try {
     if (req.url && !["/@vite", "/@fs", "/@id/__x00__", "/node_modules"].some(
@@ -10892,7 +10933,15 @@ const phpProxy = async (req, res, next) => {
             ).on("error", (error) => {
               reject(error);
             }).on("close", () => {
-              const content = Buffer.concat(chunks).toString("utf8");
+              let content = Buffer.concat(chunks).toString("utf8");
+              if (incomingHeaders["content-type"]?.includes(
+                "text/html"
+              ) && !viteClientInjectionPattern.test(content)) {
+                content = viteClientInjection + content;
+                if (incomingHeaders["content-length"]) {
+                  incomingHeaders["content-length"] = `${content.length}`;
+                }
+              }
               resolve2({
                 statusCode,
                 headers: incomingHeaders,
@@ -10920,42 +10969,6 @@ const phpProxy = async (req, res, next) => {
   next();
 };
 
-const assetsPattern = new RegExp(
-  `^(.+?)(${phpStartPattern}\\s+namespace\\s\\S+?(?:\\s*;|\\s*{).+)$`,
-  "si"
-);
-const lastTagPattern = new RegExp(`^(.+(?:</.+?>|<.+?/>))(.+|)$`, "si");
-const closingPattern = new RegExp(`^(.+)(${phpStartPattern}.+)$`, "si");
-function fixAssetsInjection(input) {
-  let out = input;
-  let assets = "";
-  out = out.replace(assetsPattern, (match, p1, p2) => {
-    assets = p1.trim();
-    return p2;
-  });
-  const injectAssets = (_, part1, part2) => {
-    let a = assets;
-    if (!(part1.endsWith("\n") || part1.endsWith("\r"))) {
-      a = "\r\n" + a;
-    }
-    if (!(part2.startsWith("\n") || part2.startsWith("\r"))) {
-      a += "\r\n";
-    }
-    assets = "";
-    return `${part1}${a}${part2}`;
-  };
-  if (assets) {
-    out = out.replace(lastTagPattern, injectAssets);
-  }
-  if (assets) {
-    out = out.replace(closingPattern, injectAssets);
-  }
-  if (assets) {
-    out += assets;
-  }
-  return out;
-}
-
 const serve = {
   rewriteUrl: (url) => url
 };
@@ -11108,6 +11121,12 @@ const servePlugin = [
             php.code = PHP_Code.unescape(php.code, escapes);
           }
           php.code = fixAssetsInjection(php.code);
+          if (!php.code.includes("</head>")) {
+            php.code = php.code.replace(
+              new RegExp(viteClientInjectionPattern, "gsi"),
+              ""
+            );
+          }
           php.write(tempName(entry));
           return php.code;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vite-plugin-php",
-	"version": "3.0.0-beta.0",
+	"version": "3.0.0-beta.2",
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
 	"repository": {
 		"type": "git",
@@ -20,8 +20,6 @@
 	},
 	"exports": {
 		".": {
-			"types": "./dist/index.d.ts",
-			"default": "./dist/index.mjs",
 			"require": {
 				"types": "./dist/index.d.cts",
 				"default": "./dist/index.cjs"
@@ -29,7 +27,9 @@
 			"import": {
 				"types": "./dist/index.d.mts",
 				"default": "./dist/index.mjs"
-			}
+			},
+			"types": "./dist/index.d.ts",
+			"default": "./dist/index.mjs"
 		}
 	},
 	"bugs": {