vite-plugin-php 1.0.50 → 1.0.60

package/README.md

@@ -20,13 +20,15 @@ Check out the [starter repo](https://github.com/nititech/php-vite-starter) for a
 
 ## ⚡ Latest changes
 
-| Version | Feature                                                                               |
-| ------- | ------------------------------------------------------------------------------------- |
-| 1.0.50  | Using native Rollup pipeline to generate bundle -> proper error messages during build |
-| 1.0.40  | Vite's "HTML Env Replacement" feature in transpiled PHP files                         |
-| 1.0.30  | Proper PHP header forwarding during development                                       |
-| 1.0.20  | URL rewrite functionality to mimic mod_rewrite & friends                              |
-| 1.0.11  | Improved Windows support                                                              |
+| Version | Feature                                                                                                     |
+| ------- | ----------------------------------------------------------------------------------------------------------- |
+| 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                       |
+| 1.0.40  | Vite's "HTML Env Replacement" feature in transpiled PHP files                                               |
+| 1.0.30  | Proper PHP header forwarding during development                                                             |
+| 1.0.20  | URL rewrite functionality to mimic mod_rewrite & friends                                                    |
+| 1.0.11  | Improved Windows support                                                                                    |
 
 ## Write some PHP code in your `index.php`
 
@@ -129,7 +131,27 @@ usePHP({
 
 ⚠️ **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
+## Specific oddities
+
+#### Inline modules
+
+⚠️ PHP will work somehow unintuitive in inlined modules.
+E.g. you have a page with some variables:
+
+```php
+<?php
+$var = 'foo';
+?>
+
+<script type="module">
+	console.log('<?=$var; ?>');
+</script>
+```
+
+This will not work. `$var` will be undefined in the module since the script is being transpiled into a separate file and included separately.
+Same applies to other server variables like `$_GET`, `$_POST` and so on - they will not have the same value as the main PHP file.
+
+#### Dynamically included asset processing
 
 Vite won't be able to process PHP-computed styles, scripts or images:
 
@@ -137,6 +159,8 @@ Vite won't be able to process PHP-computed styles, scripts or images:
 <script src="./src/<?='dynamic_script_name';?>.js" type="module"></script>
 ```
 
+## Issues
+
 If you encounter any other bugs or need some other features feel free to open an [issue](https://github.com/donnikitos/vite-plugin-php/issues).
 
 ## Support

package/dist/index.cjs

@@ -7065,7 +7065,7 @@ function usePHP(cfg = {}) {
         phpServer.start(viteServer?.config.root);
         server.middlewares.use(async (req, res, next) => {
           try {
-            if (req.url && !["/@vite", "/@fs"].some(
+            if (req.url && !["/@vite", "/@fs", "/@id/__x00__"].some(
               (path) => req.url.startsWith(path)
             )) {
               const url = new URL(req.url, "http://localhost");
@@ -7125,9 +7125,9 @@ function usePHP(cfg = {}) {
                     ).on("error", reject).end();
                   });
                   const out = await server.transformIndexHtml(
-                    "/" + entryPathname,
+                    requestUrl,
                     phpResult.content,
-                    req.originalUrl
+                    "/" + entryPathname
                   );
                   res.writeHead(phpResult.statusCode || 200, {
                     ...req.headers,
@@ -7143,7 +7143,7 @@ function usePHP(cfg = {}) {
           next();
         });
       },
-      handleHotUpdate({ server, file }) {
+      async handleHotUpdate({ server, file }) {
         const entry2 = entries.find(
           (entryFile) => require$$0$1.resolve(entryFile) === file
         );
@@ -7153,9 +7153,9 @@ function usePHP(cfg = {}) {
             inputFile: entry2,
             config
           }).write(outputFile);
+          server.moduleGraph.invalidateAll();
           server.ws.send({
-            type: "full-reload",
-            path: "*"
+            type: "full-reload"
           });
         }
       }
@@ -7167,6 +7167,7 @@ function usePHP(cfg = {}) {
       resolveId(source, importer, options) {
         if (entries.includes(source)) {
           return {
+            // Rename ids because Vite transforms only .html files: https://github.com/vitejs/vite/blob/0cde495ebeb48bcfb5961784a30bfaed997790a0/packages/vite/src/node/plugins/html.ts#L330
             id: `${source}.html`,
             resolvedBy: "vite-plugin-php",
             meta: {
@@ -7203,6 +7204,16 @@ function usePHP(cfg = {}) {
                   phpCodes: meta.phpCodes
                 });
               }
+            } else if (item.type === "chunk" && item.facadeModuleId) {
+              const meta = this.getModuleInfo(
+                item.facadeModuleId
+              )?.meta;
+              if (meta?.phpCodes) {
+                item.code = unescapePHP({
+                  escapedCode: item.code,
+                  phpCodes: meta.phpCodes
+                });
+              }
             }
           });
         }

package/dist/index.mjs

@@ -7051,7 +7051,7 @@ function usePHP(cfg = {}) {
         phpServer.start(viteServer?.config.root);
         server.middlewares.use(async (req, res, next) => {
           try {
-            if (req.url && !["/@vite", "/@fs"].some(
+            if (req.url && !["/@vite", "/@fs", "/@id/__x00__"].some(
               (path) => req.url.startsWith(path)
             )) {
               const url = new URL(req.url, "http://localhost");
@@ -7111,9 +7111,9 @@ function usePHP(cfg = {}) {
                     ).on("error", reject).end();
                   });
                   const out = await server.transformIndexHtml(
-                    "/" + entryPathname,
+                    requestUrl,
                     phpResult.content,
-                    req.originalUrl
+                    "/" + entryPathname
                   );
                   res.writeHead(phpResult.statusCode || 200, {
                     ...req.headers,
@@ -7129,7 +7129,7 @@ function usePHP(cfg = {}) {
           next();
         });
       },
-      handleHotUpdate({ server, file }) {
+      async handleHotUpdate({ server, file }) {
         const entry2 = entries.find(
           (entryFile) => resolve(entryFile) === file
         );
@@ -7139,9 +7139,9 @@ function usePHP(cfg = {}) {
             inputFile: entry2,
             config
           }).write(outputFile);
+          server.moduleGraph.invalidateAll();
           server.ws.send({
-            type: "full-reload",
-            path: "*"
+            type: "full-reload"
           });
         }
       }
@@ -7153,6 +7153,7 @@ function usePHP(cfg = {}) {
       resolveId(source, importer, options) {
         if (entries.includes(source)) {
           return {
+            // Rename ids because Vite transforms only .html files: https://github.com/vitejs/vite/blob/0cde495ebeb48bcfb5961784a30bfaed997790a0/packages/vite/src/node/plugins/html.ts#L330
             id: `${source}.html`,
             resolvedBy: "vite-plugin-php",
             meta: {
@@ -7189,6 +7190,16 @@ function usePHP(cfg = {}) {
                   phpCodes: meta.phpCodes
                 });
               }
+            } else if (item.type === "chunk" && item.facadeModuleId) {
+              const meta = this.getModuleInfo(
+                item.facadeModuleId
+              )?.meta;
+              if (meta?.phpCodes) {
+                item.code = unescapePHP({
+                  escapedCode: item.code,
+                  phpCodes: meta.phpCodes
+                });
+              }
             }
           });
         }

package/dist/router.php

@@ -14,13 +14,23 @@ $_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);
 
-$source = str_replace(
-	array_keys($codeTokens),
-	array_values($codeTokens),
-	$source,
-);
+$tokensFile = "$sourceFile.json";
+if (file_exists($tokensFile)) {
+	$codeTokens = json_decode(file_get_contents($tokensFile), true);
+
+	$source = str_replace(
+		array_keys($codeTokens),
+		array_values($codeTokens),
+		$source,
+	);
+}
+
+preg_match('#<\?((?!\?>).)*$#s', $source, $matches);
+
+if (count($matches)) {
+	$source .= ' ?>';
+}
 
 (function () {
 	try {

package/package.json

@@ -1,43 +1,21 @@
 {
 	"name": "vite-plugin-php",
-	"version": "1.0.50",
-	"description": "Process PHP-files with the speed and tools of Vite",
-	"keywords": [
-		"vite",
-		"vite-plugin",
-		"load php",
-		"use php",
-		"vite php",
-		"compile php",
-		"php",
-		"php-loader",
-		"php-compiler",
-		"php processing",
-		"php transpilation",
-		"php-vite",
-		"vite-php",
-		"loader",
-		"url rewrite",
-		"url router",
-		"mod_rewrite"
-	],
+	"version": "1.0.60",
 	"author": "Nikita 'donnikitos' Nitichevski <me@donnikitos.com> (https://donnikitos.com/)",
-	"license": "MIT",
-	"bugs": {
-		"url": "https://github.com/donnikitos/vite-plugin-php/issues"
-	},
-	"homepage": "https://github.com/donnikitos/vite-plugin-php#readme",
 	"repository": {
 		"type": "git",
 		"url": "git+ssh://git@github.com/donnikitos/vite-plugin-php.git"
 	},
-	"files": [
-		"dist"
-	],
-	"type": "module",
 	"main": "./dist/index.mjs",
 	"module": "./dist/index.mjs",
-	"types": "./dist/index.d.ts",
+	"devDependencies": {
+		"@types/node": "^22.4.0",
+		"fast-glob": "^3.3.2",
+		"picocolors": "^1.0.1",
+		"typescript": "^5.5.4",
+		"unbuild": "^2.0.0",
+		"vite": "^5.4.1"
+	},
 	"exports": {
 		".": {
 			"require": {
@@ -52,17 +30,38 @@
 			"default": "./dist/index.mjs"
 		}
 	},
+	"bugs": {
+		"url": "https://github.com/donnikitos/vite-plugin-php/issues"
+	},
+	"description": "Process PHP-files with the speed and tools of Vite",
+	"files": [
+		"dist"
+	],
+	"homepage": "https://github.com/donnikitos/vite-plugin-php#readme",
+	"keywords": [
+		"vite",
+		"vite-plugin",
+		"load php",
+		"use php",
+		"vite php",
+		"compile php",
+		"php",
+		"php-loader",
+		"php-compiler",
+		"php processing",
+		"php transpilation",
+		"php-vite",
+		"vite-php",
+		"loader",
+		"url rewrite",
+		"url router",
+		"mod_rewrite"
+	],
+	"license": "MIT",
 	"scripts": {
 		"build": "npx unbuild",
 		"prepack": "npm run build"
 	},
-	"dependencies": {},
-	"devDependencies": {
-		"@types/node": "^20.14.11",
-		"fast-glob": "^3.3.2",
-		"picocolors": "^1.0.1",
-		"typescript": "^5.5.3",
-		"unbuild": "^2.0.0",
-		"vite": "^5.3.4"
-	}
+	"type": "module",
+	"types": "./dist/index.d.ts"
 }