vite-plugin-php 1.0.11 → 1.0.30

package/README.md

@@ -15,9 +15,17 @@ export default defineConfig({
 });
 ```
 
-Check out the starter repo for an easy and convenient start:
+Check out the [starter repo](https://github.com/nititech/php-vite-starter) for an easy and convenient start:
 <a href="https://github.com/nititech/php-vite-starter" target="_blank"><img src="https://nititech.de/kosmo-starter-button.png" alt="Starter Repo"></a>
 
+## ⚡ Latest changes
+
+| Version | Feature                  |
+| ------- | ------------------------ |
+| 1.0.30  | PHP header forwarding    |
+| 1.0.20  | URL rewrites             |
+| 1.0.11  | Improved Windows support |
+
 ## Write some PHP code in your `index.php`
 
 ```php
@@ -43,6 +51,21 @@ The plugin will serve you the processed `index.php` as usual, including all impo
 
 ## Configuration
 
+The configuration takes following properties:
+
+```ts
+type UsePHPConfig = {
+	binary?: string;
+	entry?: string | string[];
+	rewriteUrl?: (requestUrl: URL) => URL | undefined;
+	tempDir?: string;
+	cleanup?: {
+		dev?: boolean;
+		build?: boolean;
+	};
+};
+```
+
 By default the plugin is trying to access the system `php`-binary and load the `index.php` file as the main entry point.
 However you have the possibility to use an other binary or even compile multiple entry-points:
 
@@ -64,7 +87,6 @@ Should you have multiple entry-points, you will be able to access each one accor
 | shop/index.php    | `/shop/` `/shop/index.php`            | `shop/index.php`    |
 | ...               | ...                                   | ...                 |
 
-**⚡️ New feature:** Wildcard selectors!\
 Since version 1.0.6 you can specify wildcard entry points:
 
 ```js
@@ -82,6 +104,29 @@ usePHP({
 
 These entries will also render according to the routing table above.
 
+##### Rewrite urls
+
+If you are using some sort of Apaches _mod_rewrite_ magic or nginx rewrite rules you can simulate them with the newly added in `rewriteUrl` property.
+The rewriteUrl function has one parameter - the requested URL given as URL object - and return either a modified URL object or undefined:
+
+```js
+usePHP({
+	entry: ['index.php', 'partials/**/*.php'],
+	rewriteUrl(requestUrl) {
+		if (['.js', '.css'].some((s) => requestUrl.pathname.includes(s))) {
+			return;
+		}
+
+		requestUrl.search = '_request_=' + requestUrl.pathname;
+		requestUrl.pathname = 'index.php';
+
+		return requestUrl;
+	},
+});
+```
+
+⚠️ **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!
+
 ## Known issues
 
 Vite won't be able to process PHP-computed styles, scripts or images:

package/dist/index.cjs

@@ -104,6 +104,10 @@ const phpServer = {
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
 var tasks = {};
 
 var utils$k = {};
@@ -6819,10 +6823,14 @@ function assertPatternsInput(input) {
 }
 var out = FastGlob;
 
+const fastGlob = /*@__PURE__*/getDefaultExportFromCjs(out);
+
+const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
     binary = "php",
     entry = "index.php",
+    rewriteUrl = (requestUrl) => requestUrl,
     tempDir = ".php-tmp",
     cleanup = {}
   } = cfg;
@@ -6867,7 +6875,7 @@ function usePHP(cfg = {}) {
           writeFile(gitIgnoreFile, "*\n**/*.php.html");
         }
         entries = entries.flatMap(
-          (entry2) => out.globSync(entry2, {
+          (entry2) => fastGlob.globSync(entry2, {
             dot: true,
             onlyFiles: true,
             unique: true,
@@ -6895,53 +6903,74 @@ function usePHP(cfg = {}) {
         phpServer.start(viteServer?.config.root);
         server.middlewares.use(async (req, res, next) => {
           try {
-            if (req.url) {
-              const url = new URL(
-                req.url,
-                "http://localhost:" + phpServer.port
-              );
-              let requestUrl = url.pathname;
-              if (requestUrl.endsWith("/")) {
-                requestUrl += "index.php";
+            if (req.url && !["/@vite", "/@fs"].some(
+              (path) => req.url.startsWith(path)
+            )) {
+              const url = new URL(req.url, "http://localhost");
+              if (config?.server.port) {
+                url.port = config.server.port.toString();
+              }
+              const requestUrl = url.pathname;
+              if (url.pathname.endsWith("/")) {
+                url.pathname += "index.php";
               }
-              requestUrl = requestUrl.substring(1);
+              const routedUrl = rewriteUrl(url);
+              if (routedUrl) {
+                url.pathname = routedUrl.pathname;
+                url.search = routedUrl.search;
+                url.hash = routedUrl.hash;
+              }
+              const entryPathname = url.pathname.substring(1);
               const entry2 = entries.find((file) => {
-                return file === requestUrl || file.substring(0, file.lastIndexOf(".")) === requestUrl;
+                return file === entryPathname || file.substring(0, file.lastIndexOf(".")) === entryPathname;
               });
               if (entry2) {
                 const tempFile = `${tempDir}/${entry2}.html`;
                 if (require$$0.existsSync(require$$0$1.resolve(tempFile))) {
                   url.pathname = tempFile;
-                  const phpResult = await new Promise(
-                    (resolve2, reject) => {
-                      const chunks = [];
-                      http__default.request(
-                        url.toString(),
-                        {
-                          method: req.method,
-                          headers: req.headers
-                        },
-                        (msg) => {
-                          msg.on(
-                            "data",
-                            (data) => chunks.push(data)
-                          );
-                          msg.on("end", () => {
-                            const result = Buffer.concat(
-                              chunks
-                            ).toString("utf8");
-                            resolve2(result);
-                          });
-                        }
-                      ).on("error", reject).end();
-                    }
+                  url.port = phpServer.port.toString();
+                  url.searchParams.set(
+                    internalParam,
+                    new URLSearchParams({
+                      REQUEST_URI: requestUrl,
+                      PHP_SELF: "/" + entry2
+                    }).toString()
                   );
-                  let out = phpResult.toString();
-                  out = await server.transformIndexHtml(
-                    requestUrl || "/",
-                    out
+                  const phpResult = await new Promise((resolve2, reject) => {
+                    const chunks = [];
+                    http__default.request(
+                      url.toString(),
+                      {
+                        method: req.method,
+                        headers: req.headers
+                      },
+                      (msg) => {
+                        msg.on(
+                          "data",
+                          (data) => chunks.push(data)
+                        );
+                        msg.on("end", () => {
+                          const content = Buffer.concat(
+                            chunks
+                          ).toString("utf8");
+                          resolve2({
+                            statusCode: msg.statusCode,
+                            headers: msg.headers,
+                            content
+                          });
+                        });
+                      }
+                    ).on("error", reject).end();
+                  });
+                  const out = await server.transformIndexHtml(
+                    entryPathname || "/",
+                    phpResult.content,
+                    req.originalUrl
                   );
-                  res.end(out);
+                  res.writeHead(phpResult.statusCode || 200, {
+                    ...req.headers,
+                    ...phpResult.headers
+                  }).end(out);
                   return;
                 }
               }

package/dist/index.d.cts

@@ -3,6 +3,7 @@ import { Plugin } from 'vite';
 type UsePHPConfig = {
     binary?: string;
     entry?: string | string[];
+    rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;
     cleanup?: {
         dev?: boolean;

package/dist/index.d.mts

@@ -3,6 +3,7 @@ import { Plugin } from 'vite';
 type UsePHPConfig = {
     binary?: string;
     entry?: string | string[];
+    rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;
     cleanup?: {
         dev?: boolean;

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { Plugin } from 'vite';
 type UsePHPConfig = {
     binary?: string;
     entry?: string | string[];
+    rewriteUrl?: (requestUrl: URL) => URL | undefined;
     tempDir?: string;
     cleanup?: {
         dev?: boolean;

package/dist/index.mjs

@@ -91,6 +91,10 @@ const phpServer = {
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+
 var tasks = {};
 
 var utils$k = {};
@@ -6806,10 +6810,14 @@ function assertPatternsInput(input) {
 }
 var out = FastGlob;
 
+const fastGlob = /*@__PURE__*/getDefaultExportFromCjs(out);
+
+const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
     binary = "php",
     entry = "index.php",
+    rewriteUrl = (requestUrl) => requestUrl,
     tempDir = ".php-tmp",
     cleanup = {}
   } = cfg;
@@ -6854,7 +6862,7 @@ function usePHP(cfg = {}) {
           writeFile(gitIgnoreFile, "*\n**/*.php.html");
         }
         entries = entries.flatMap(
-          (entry2) => out.globSync(entry2, {
+          (entry2) => fastGlob.globSync(entry2, {
             dot: true,
             onlyFiles: true,
             unique: true,
@@ -6882,53 +6890,74 @@ function usePHP(cfg = {}) {
         phpServer.start(viteServer?.config.root);
         server.middlewares.use(async (req, res, next) => {
           try {
-            if (req.url) {
-              const url = new URL(
-                req.url,
-                "http://localhost:" + phpServer.port
-              );
-              let requestUrl = url.pathname;
-              if (requestUrl.endsWith("/")) {
-                requestUrl += "index.php";
+            if (req.url && !["/@vite", "/@fs"].some(
+              (path) => req.url.startsWith(path)
+            )) {
+              const url = new URL(req.url, "http://localhost");
+              if (config?.server.port) {
+                url.port = config.server.port.toString();
+              }
+              const requestUrl = url.pathname;
+              if (url.pathname.endsWith("/")) {
+                url.pathname += "index.php";
               }
-              requestUrl = requestUrl.substring(1);
+              const routedUrl = rewriteUrl(url);
+              if (routedUrl) {
+                url.pathname = routedUrl.pathname;
+                url.search = routedUrl.search;
+                url.hash = routedUrl.hash;
+              }
+              const entryPathname = url.pathname.substring(1);
               const entry2 = entries.find((file) => {
-                return file === requestUrl || file.substring(0, file.lastIndexOf(".")) === requestUrl;
+                return file === entryPathname || file.substring(0, file.lastIndexOf(".")) === entryPathname;
               });
               if (entry2) {
                 const tempFile = `${tempDir}/${entry2}.html`;
                 if (existsSync(resolve(tempFile))) {
                   url.pathname = tempFile;
-                  const phpResult = await new Promise(
-                    (resolve2, reject) => {
-                      const chunks = [];
-                      http.request(
-                        url.toString(),
-                        {
-                          method: req.method,
-                          headers: req.headers
-                        },
-                        (msg) => {
-                          msg.on(
-                            "data",
-                            (data) => chunks.push(data)
-                          );
-                          msg.on("end", () => {
-                            const result = Buffer.concat(
-                              chunks
-                            ).toString("utf8");
-                            resolve2(result);
-                          });
-                        }
-                      ).on("error", reject).end();
-                    }
+                  url.port = phpServer.port.toString();
+                  url.searchParams.set(
+                    internalParam,
+                    new URLSearchParams({
+                      REQUEST_URI: requestUrl,
+                      PHP_SELF: "/" + entry2
+                    }).toString()
                   );
-                  let out = phpResult.toString();
-                  out = await server.transformIndexHtml(
-                    requestUrl || "/",
-                    out
+                  const phpResult = await new Promise((resolve2, reject) => {
+                    const chunks = [];
+                    http.request(
+                      url.toString(),
+                      {
+                        method: req.method,
+                        headers: req.headers
+                      },
+                      (msg) => {
+                        msg.on(
+                          "data",
+                          (data) => chunks.push(data)
+                        );
+                        msg.on("end", () => {
+                          const content = Buffer.concat(
+                            chunks
+                          ).toString("utf8");
+                          resolve2({
+                            statusCode: msg.statusCode,
+                            headers: msg.headers,
+                            content
+                          });
+                        });
+                      }
+                    ).on("error", reject).end();
+                  });
+                  const out = await server.transformIndexHtml(
+                    entryPathname || "/",
+                    phpResult.content,
+                    req.originalUrl
                   );
-                  res.end(out);
+                  res.writeHead(phpResult.statusCode || 200, {
+                    ...req.headers,
+                    ...phpResult.headers
+                  }).end(out);
                   return;
                 }
               }

package/dist/router.php

@@ -1,6 +1,18 @@
 <?php
 $sourceFile = $_SERVER['SCRIPT_FILENAME'];
 
+$internal_param = '__314159265359__';
+parse_str($_GET[$internal_param], $internal_vars);
+
+foreach ($internal_vars as $key => $value) {
+	$_SERVER[$key] = $value;
+}
+unset($_GET[$internal_param]);
+
+$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'];
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['SCRIPT_NAME'];
+$_SERVER['QUERY_STRING'] = http_build_query($_GET);
+
 $source = file_get_contents($sourceFile);
 $codeTokens = json_decode(file_get_contents("$sourceFile.json"), true);
 
@@ -10,10 +22,11 @@ $source = str_replace(
 	$source,
 );
 
-die((function ($__SOURCE) {
+(function () {
 	try {
-		return eval("?> $__SOURCE <?php");
+		eval('?> ' . func_get_arg(0) . ' <?php');
+		die();
 	} catch (\Throwable $th) {
-		return $th->getMessage();
+		die($th->getMessage());
 	}
-})($source));
+})($source);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vite-plugin-php",
-	"version": "1.0.11",
-	"description": "Precompile PHP-files with the speed of Vite",
+	"version": "1.0.30",
+	"description": "Process PHP-files with the speed and tools of Vite",
 	"keywords": [
 		"vite",
 		"vite-plugin",
@@ -12,7 +12,14 @@
 		"php",
 		"php-loader",
 		"php-compiler",
-		"loader"
+		"php processing",
+		"php transpilation",
+		"php-vite",
+		"vite-php",
+		"loader",
+		"url rewrite",
+		"url router",
+		"mod_rewrite"
 	],
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
 	"license": "MIT",