vite-plugin-php 3.0.0-beta.1 → 3.0.0-beta.3

package/README.md

@@ -171,6 +171,21 @@ usePHP({
 });
 ```
 
+Since version 2.0.4 it is possible to point to some external files. Make sure the change URL points to an external origin:
+
+```js
+usePHP({
+	rewriteUrl(requestUrl) {
+		if (requestUrl.pathname.startsWith('/media/')) {
+			return new URL(
+				'https://nititech.de' +
+					requestUrl.toString().substring(requestUrl.origin.length),
+			);
+		}
+	},
+});
+```
+
 ⚠️ **Attention:** If using the rewriteUrl property you will need to exclude (_return undefined_) assets like CSS, JavaScript, Images, etc.., that match your transpiled php file names, on your own!
 
 #### Error logging

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(
@@ -10843,19 +10884,23 @@ const phpProxy = async (req, res, next) => {
       req.on("error", (error) => {
         throw error;
       });
-      const url = new URL(req.url, "http://localhost");
+      let url = new URL(req.url, "http://localhost");
       if (shared.viteConfig?.server.port) {
         url.port = shared.viteConfig.server.port.toString();
       }
-      const requestUrl = url.pathname;
+      const requestUrl = new URL(url);
       if (url.pathname.endsWith("/")) {
         url.pathname += "index.php";
       }
       const routedUrl = serve.rewriteUrl(url);
       if (routedUrl) {
-        url.pathname = routedUrl.pathname;
-        url.search = routedUrl.search;
-        url.hash = routedUrl.hash;
+        if (routedUrl.origin !== requestUrl.origin) {
+          res.writeHead(307, {
+            location: routedUrl.toString()
+          }).end();
+          return;
+        }
+        url = routedUrl;
       }
       const entryPathname = url.pathname.substring(1);
       const entry = shared.entries.find((file) => {
@@ -10870,7 +10915,7 @@ const phpProxy = async (req, res, next) => {
           url.searchParams.set(
             internalParam,
             new URLSearchParams({
-              $REQUEST_URI: requestUrl,
+              $REQUEST_URI: requestUrl.pathname,
               $PHP_SELF: "/" + entry,
               temp_dir: shared.tempDir,
               error_levels: shared.devConfig.errorLevels.toString()
@@ -10909,7 +10954,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 +10990,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 +11142,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(
@@ -10826,19 +10867,23 @@ const phpProxy = async (req, res, next) => {
       req.on("error", (error) => {
         throw error;
       });
-      const url = new URL(req.url, "http://localhost");
+      let url = new URL(req.url, "http://localhost");
       if (shared.viteConfig?.server.port) {
         url.port = shared.viteConfig.server.port.toString();
       }
-      const requestUrl = url.pathname;
+      const requestUrl = new URL(url);
       if (url.pathname.endsWith("/")) {
         url.pathname += "index.php";
       }
       const routedUrl = serve.rewriteUrl(url);
       if (routedUrl) {
-        url.pathname = routedUrl.pathname;
-        url.search = routedUrl.search;
-        url.hash = routedUrl.hash;
+        if (routedUrl.origin !== requestUrl.origin) {
+          res.writeHead(307, {
+            location: routedUrl.toString()
+          }).end();
+          return;
+        }
+        url = routedUrl;
       }
       const entryPathname = url.pathname.substring(1);
       const entry = shared.entries.find((file) => {
@@ -10853,7 +10898,7 @@ const phpProxy = async (req, res, next) => {
           url.searchParams.set(
             internalParam,
             new URLSearchParams({
-              $REQUEST_URI: requestUrl,
+              $REQUEST_URI: requestUrl.pathname,
               $PHP_SELF: "/" + entry,
               temp_dir: shared.tempDir,
               error_levels: shared.devConfig.errorLevels.toString()
@@ -10892,7 +10937,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 +10973,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 +11125,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.1",
+	"version": "3.0.0-beta.3",
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
 	"repository": {
 		"type": "git",