vite-plugin-php 1.0.69 → 1.0.71

package/README.md

@@ -22,6 +22,8 @@ Check out the [starter repo](https://github.com/nititech/php-vite-starter) for a
 
 | Version | Feature                                                                                                     |
 | ------- | ----------------------------------------------------------------------------------------------------------- |
+| 1.0.71  | Fixed assets prepending for namespaced PHP-files                                                            |
+| 1.0.70  | Added include path override for relative PHP imports in dev mode                                            |
 | 1.0.69  | Using new token format to escape PHP in HTML                                                                |
 | 1.0.68  | Improved transpiled code evaluation (removed native `eval()`)                                               |
 | 1.0.67  | Removed whitespaces from PHP responses in dev mode                                                          |
@@ -29,8 +31,6 @@ Check out the [starter repo](https://github.com/nititech/php-vite-starter) for a
 | 1.0.65  | Fixed request body forwarding for all request methods                                                       |
 | 1.0.62  | HTML transforms are now only applied to HTML contents during dev                                            |
 | 1.0.60  | Fixed inline module transpiling -> PHP code is being properly inserted into transpiled inline module chunks |
-| 1.0.55  | Fixed pure PHP file processing                                                                              |
-| 1.0.50  | Using native Rollup pipeline to generate bundle -> proper error messages during build                       |
 | ...     | ...                                                                                                         |
 
 ## Write some PHP code in your `index.php`

package/dist/index.cjs

@@ -6977,6 +6977,19 @@ function consoleHijack(entries) {
   });
 }
 
+const namespacePattern = new RegExp(
+  /(.+?)(<\?(?:php|)\s+namespace\s\S+?(?:\s*;|\s*{).+)(<\/.+?>|<.+?\/>)(.+|$)/,
+  "si"
+);
+function processOutput(input) {
+  let out = input;
+  out = out.replace(
+    namespacePattern,
+    (match, assets, contents, lastTag, trailingContent) => contents + lastTag + "\r\n" + assets.trim() + trailingContent
+  );
+  return out;
+}
+
 const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
@@ -7246,6 +7259,7 @@ function usePHP(cfg = {}) {
                   escapedCode: item.source.toString(),
                   phpCodes: meta.phpCodes
                 });
+                item.source = processOutput(item.source);
               }
             } else if (item.type === "chunk" && item.facadeModuleId) {
               const meta = this.getModuleInfo(
@@ -7256,6 +7270,7 @@ function usePHP(cfg = {}) {
                   escapedCode: item.code,
                   phpCodes: meta.phpCodes
                 });
+                item.code = processOutput(item.code);
               }
             }
           });

package/dist/index.mjs

@@ -6964,6 +6964,19 @@ function consoleHijack(entries) {
   });
 }
 
+const namespacePattern = new RegExp(
+  /(.+?)(<\?(?:php|)\s+namespace\s\S+?(?:\s*;|\s*{).+)(<\/.+?>|<.+?\/>)(.+|$)/,
+  "si"
+);
+function processOutput(input) {
+  let out = input;
+  out = out.replace(
+    namespacePattern,
+    (match, assets, contents, lastTag, trailingContent) => contents + lastTag + "\r\n" + assets.trim() + trailingContent
+  );
+  return out;
+}
+
 const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
@@ -7233,6 +7246,7 @@ function usePHP(cfg = {}) {
                   escapedCode: item.source.toString(),
                   phpCodes: meta.phpCodes
                 });
+                item.source = processOutput(item.source);
               }
             } else if (item.type === "chunk" && item.facadeModuleId) {
               const meta = this.getModuleInfo(
@@ -7243,6 +7257,7 @@ function usePHP(cfg = {}) {
                   escapedCode: item.code,
                   phpCodes: meta.phpCodes
                 });
+                item.code = processOutput(item.code);
               }
             }
           });

package/dist/router.php

@@ -13,6 +13,15 @@ $_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'];
 $_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['SCRIPT_NAME'];
 $_SERVER['QUERY_STRING'] = http_build_query($_GET);
 
+ini_set(
+	'include_path',
+	implode(PATH_SEPARATOR, [
+		dirname($_SERVER['SCRIPT_FILENAME']),
+		$_SERVER['DOCUMENT_ROOT'],
+		ini_get('include_path'),
+	]),
+);
+
 $source = file_get_contents($sourceFile);
 
 $tokensFile = "$sourceFile.json";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vite-plugin-php",
-	"version": "1.0.69",
+	"version": "1.0.71",
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
 	"repository": {
 		"type": "git",