vite-plugin-php 1.0.40 → 1.0.55

package/README.md

@@ -20,12 +20,14 @@ Check out the [starter repo](https://github.com/nititech/php-vite-starter) for a
 
 ## ⚡ Latest changes
 
-| Version | Feature                                                      |
-| ------- | ------------------------------------------------------------ |
-| 1.0.40  | Vite's "HTML Env Replacement" feature in transpiled PHP file |
-| 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.55  | Auto close last PHP tag if not close (usually PHP only files)                         |
+| 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`
 

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const require$$0 = require('fs');
+const require$$0$2 = require('fs');
 const require$$0$1 = require('path');
 const vite = require('vite');
-const require$$0$2 = require('tty');
+const require$$0 = require('tty');
 const http = require('http');
 const child_process = require('child_process');
 const url = require('url');
@@ -15,9 +15,9 @@ const require$$0$6 = require('events');
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const require$$0__default$5 = /*#__PURE__*/_interopDefaultCompat(require$$0);
+const require$$0__default$5 = /*#__PURE__*/_interopDefaultCompat(require$$0$2);
 const require$$0__default$2 = /*#__PURE__*/_interopDefaultCompat(require$$0$1);
-const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0$2);
+const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);
 const http__default = /*#__PURE__*/_interopDefaultCompat(http);
 const require$$0__default$1 = /*#__PURE__*/_interopDefaultCompat(require$$0$3);
 const require$$0__default$3 = /*#__PURE__*/_interopDefaultCompat(require$$0$4);
@@ -28,11 +28,6 @@ function makeID() {
   return Date.now().toString(36) + Math.random() * 100;
 }
 
-function writeFile(file, data) {
-  require$$0.mkdirSync(require$$0$1.dirname(file), { recursive: true });
-  require$$0.writeFileSync(file, data);
-}
-
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -165,38 +160,44 @@ function initReplaceEnv(config) {
   };
 }
 
+function writeFile(file, data) {
+  require$$0$2.mkdirSync(require$$0$1.dirname(file), { recursive: true });
+  require$$0$2.writeFileSync(file, data);
+}
+
 const phpTagPattern = /<\?(?:php|).+?(\?>|$)/gis;
-function escapePHP({ inputFile, outputFile, config }) {
+function escapePHP({ inputFile, config }) {
   const replaceEnv = initReplaceEnv(config);
-  const input = require$$0.readFileSync(inputFile).toString();
-  const codeTokens = {};
+  const input = require$$0$2.readFileSync(inputFile, "utf-8").toString();
+  const phpCodes = {};
   const isJS = inputFile.includes(".js") || inputFile.includes(".ts");
   const isML = inputFile.includes(".php") || inputFile.includes(".htm");
-  const out = input.replace(phpTagPattern, (match) => {
+  const escapedCode = input.replace(phpTagPattern, (match) => {
     let token = makeID();
     if (isJS) {
       token = `/*${token}*/`;
     } else if (isML) {
       token = `<!--${token}-->`;
     }
-    codeTokens[token] = replaceEnv(match, inputFile);
+    phpCodes[token] = replaceEnv(match, inputFile);
     return token;
   });
-  writeFile(outputFile + ".json", JSON.stringify(codeTokens));
-  writeFile(outputFile, out);
-}
-function unescapePHP({ file, tokensFile }) {
-  const input = require$$0.readFileSync(file).toString();
-  let out = input;
-  const tknsFile = tokensFile || file + ".json";
-  if (require$$0.existsSync(tknsFile)) {
-    const codeTokens = JSON.parse(require$$0.readFileSync(tknsFile).toString());
-    Object.entries(codeTokens).forEach(([token, code]) => {
-      out = out.replace(token, (match) => {
-        return `${code}`;
-      });
+  return {
+    escapedCode,
+    phpCodes,
+    write(outputFile) {
+      writeFile(outputFile, escapedCode);
+      writeFile(outputFile + ".json", JSON.stringify(phpCodes));
+    }
+  };
+}
+function unescapePHP({ escapedCode, phpCodes }) {
+  let out = escapedCode;
+  Object.entries(phpCodes).forEach(([token, code]) => {
+    out = out.replace(token, (match) => {
+      return `${code}`;
     });
-  }
+  });
   return out;
 }
 
@@ -6956,6 +6957,22 @@ var out = FastGlob;
 
 const fastGlob = /*@__PURE__*/getDefaultExportFromCjs(out);
 
+function consoleHijack(entries) {
+  ["log", "info", "warn", "error"].forEach((command) => {
+    const cx = console[command];
+    console[command] = function(...args) {
+      cx.apply(
+        this,
+        args.map(
+          (arg) => typeof arg === "string" ? entries.reduce((acc, entry) => {
+            return acc.replace(entry + ".html", entry);
+          }, arg) : arg
+        )
+      );
+    };
+  });
+}
+
 const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
@@ -6973,9 +6990,8 @@ function usePHP(cfg = {}) {
   function getTempFileName(file) {
     return `${tempDir}/${file}.html`;
   }
-  function cleanupTemp(dir = "") {
-    const parentDir = dir ? dir + "/" : dir;
-    require$$0.rmSync(parentDir + tempDir, { recursive: true, force: true });
+  function cleanupTemp() {
+    require$$0$2.rmSync(tempDir, { recursive: true, force: true });
   }
   function onExit() {
     if (config?.command === "serve") {
@@ -7000,40 +7016,50 @@ function usePHP(cfg = {}) {
       enforce: "post",
       config(config2, env) {
         const gitIgnoreFile = `${tempDir}/.gitignore`;
-        if (!require$$0.existsSync(gitIgnoreFile)) {
+        if (!require$$0$2.existsSync(gitIgnoreFile)) {
           writeFile(gitIgnoreFile, "*\n**/*.php.html");
         }
-        entries = entries.flatMap(
-          (entry2) => fastGlob.globSync(entry2, {
-            dot: true,
-            onlyFiles: true,
-            unique: true,
-            ignore: [tempDir, config2.build?.outDir || "dist"]
-          })
-        );
-        const inputs = entries.map(getTempFileName);
+        entries = [
+          ...new Set(
+            entries.flatMap(
+              (entry2) => fastGlob.globSync(entry2, {
+                dot: true,
+                onlyFiles: true,
+                unique: true,
+                ignore: [
+                  tempDir,
+                  config2.build?.outDir || "dist"
+                ]
+              })
+            )
+          )
+        ];
+        consoleHijack(entries);
         return {
           build: {
-            rollupOptions: { input: inputs }
+            rollupOptions: { input: entries }
           },
-          optimizeDeps: { entries: inputs }
+          optimizeDeps: { entries }
         };
       },
       configResolved(_config) {
         config = _config;
-        entries.forEach(
-          (entry2) => escapePHP({
-            inputFile: entry2,
-            outputFile: getTempFileName(entry2),
-            config
-          })
-        );
       }
     },
     {
       name: "serve-php",
       apply: "serve",
       enforce: "pre",
+      configResolved(_config) {
+        config = _config;
+        entries.forEach((entry2) => {
+          const outputFile = getTempFileName(entry2);
+          escapePHP({
+            inputFile: entry2,
+            config
+          }).write(outputFile);
+        });
+      },
       configureServer(server) {
         viteServer = server;
         phpServer.start(viteServer?.config.root);
@@ -7062,7 +7088,7 @@ function usePHP(cfg = {}) {
               });
               if (entry2) {
                 const tempFile = getTempFileName(entry2);
-                if (require$$0.existsSync(require$$0$1.resolve(tempFile))) {
+                if (require$$0$2.existsSync(require$$0$1.resolve(tempFile))) {
                   url.pathname = tempFile;
                   url.port = phpServer.port.toString();
                   url.searchParams.set(
@@ -7119,14 +7145,14 @@ function usePHP(cfg = {}) {
       },
       handleHotUpdate({ server, file }) {
         const entry2 = entries.find(
-          (entryFile) => file.endsWith(entryFile) && require$$0$1.resolve(entryFile) === file
+          (entryFile) => require$$0$1.resolve(entryFile) === file
         );
         if (entry2) {
+          const outputFile = getTempFileName(entry2);
           escapePHP({
             inputFile: entry2,
-            outputFile: getTempFileName(entry2),
             config
-          });
+          }).write(outputFile);
           server.ws.send({
             type: "full-reload",
             path: "*"
@@ -7137,22 +7163,49 @@ function usePHP(cfg = {}) {
     {
       name: "build-php",
       apply: "build",
+      enforce: "pre",
       resolveId(source, importer, options) {
-        if (importer?.endsWith(".html") && importer.includes(`/${tempDir}/`)) {
-          return { id: require$$0$1.resolve(source) };
+        if (entries.includes(source)) {
+          return {
+            id: `${source}.html`,
+            resolvedBy: "vite-plugin-php",
+            meta: {
+              originalId: source
+            }
+          };
         }
       },
-      closeBundle() {
-        const distDir = config?.build.outDir;
-        entries.forEach((file) => {
-          const tempFileName = getTempFileName(file);
-          const code = unescapePHP({
-            file: `${distDir}/${tempFileName}`,
-            tokensFile: `${tempFileName}.json`
+      load(id, options) {
+        const entry2 = this.getModuleInfo(id)?.meta.originalId;
+        if (entry2) {
+          const { escapedCode, phpCodes } = escapePHP({
+            inputFile: entry2,
+            config
           });
-          writeFile(`${distDir}/${file}`, code);
-        });
-        cleanupTemp(distDir);
+          return {
+            code: escapedCode,
+            meta: { phpCodes }
+          };
+        }
+      },
+      generateBundle: {
+        order: "post",
+        handler(options, bundle, isWrite) {
+          Object.entries(bundle).forEach(([key, item]) => {
+            if (item.type === "asset") {
+              const meta = this.getModuleInfo(
+                item.fileName
+              )?.meta;
+              if (meta?.originalId && meta?.phpCodes) {
+                item.fileName = meta.originalId;
+                item.source = unescapePHP({
+                  escapedCode: item.source.toString(),
+                  phpCodes: meta.phpCodes
+                });
+              }
+            }
+          });
+        }
       }
     }
   ];

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import require$$0$5, { mkdirSync, writeFileSync, readFileSync, existsSync, rmSync } from 'fs';
-import require$$0$2, { dirname, relative, resolve } from 'path';
+import require$$0$2, { relative, dirname, resolve } from 'path';
 import { normalizePath } from 'vite';
 import require$$0 from 'tty';
 import http from 'http';
@@ -14,11 +14,6 @@ function makeID() {
   return Date.now().toString(36) + Math.random() * 100;
 }
 
-function writeFile(file, data) {
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, data);
-}
-
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -151,38 +146,44 @@ function initReplaceEnv(config) {
   };
 }
 
+function writeFile(file, data) {
+  mkdirSync(dirname(file), { recursive: true });
+  writeFileSync(file, data);
+}
+
 const phpTagPattern = /<\?(?:php|).+?(\?>|$)/gis;
-function escapePHP({ inputFile, outputFile, config }) {
+function escapePHP({ inputFile, config }) {
   const replaceEnv = initReplaceEnv(config);
-  const input = readFileSync(inputFile).toString();
-  const codeTokens = {};
+  const input = readFileSync(inputFile, "utf-8").toString();
+  const phpCodes = {};
   const isJS = inputFile.includes(".js") || inputFile.includes(".ts");
   const isML = inputFile.includes(".php") || inputFile.includes(".htm");
-  const out = input.replace(phpTagPattern, (match) => {
+  const escapedCode = input.replace(phpTagPattern, (match) => {
     let token = makeID();
     if (isJS) {
       token = `/*${token}*/`;
     } else if (isML) {
       token = `<!--${token}-->`;
     }
-    codeTokens[token] = replaceEnv(match, inputFile);
+    phpCodes[token] = replaceEnv(match, inputFile);
     return token;
   });
-  writeFile(outputFile + ".json", JSON.stringify(codeTokens));
-  writeFile(outputFile, out);
-}
-function unescapePHP({ file, tokensFile }) {
-  const input = readFileSync(file).toString();
-  let out = input;
-  const tknsFile = tokensFile || file + ".json";
-  if (existsSync(tknsFile)) {
-    const codeTokens = JSON.parse(readFileSync(tknsFile).toString());
-    Object.entries(codeTokens).forEach(([token, code]) => {
-      out = out.replace(token, (match) => {
-        return `${code}`;
-      });
+  return {
+    escapedCode,
+    phpCodes,
+    write(outputFile) {
+      writeFile(outputFile, escapedCode);
+      writeFile(outputFile + ".json", JSON.stringify(phpCodes));
+    }
+  };
+}
+function unescapePHP({ escapedCode, phpCodes }) {
+  let out = escapedCode;
+  Object.entries(phpCodes).forEach(([token, code]) => {
+    out = out.replace(token, (match) => {
+      return `${code}`;
     });
-  }
+  });
   return out;
 }
 
@@ -6942,6 +6943,22 @@ var out = FastGlob;
 
 const fastGlob = /*@__PURE__*/getDefaultExportFromCjs(out);
 
+function consoleHijack(entries) {
+  ["log", "info", "warn", "error"].forEach((command) => {
+    const cx = console[command];
+    console[command] = function(...args) {
+      cx.apply(
+        this,
+        args.map(
+          (arg) => typeof arg === "string" ? entries.reduce((acc, entry) => {
+            return acc.replace(entry + ".html", entry);
+          }, arg) : arg
+        )
+      );
+    };
+  });
+}
+
 const internalParam = "__314159265359__";
 function usePHP(cfg = {}) {
   const {
@@ -6959,9 +6976,8 @@ function usePHP(cfg = {}) {
   function getTempFileName(file) {
     return `${tempDir}/${file}.html`;
   }
-  function cleanupTemp(dir = "") {
-    const parentDir = dir ? dir + "/" : dir;
-    rmSync(parentDir + tempDir, { recursive: true, force: true });
+  function cleanupTemp() {
+    rmSync(tempDir, { recursive: true, force: true });
   }
   function onExit() {
     if (config?.command === "serve") {
@@ -6989,37 +7005,47 @@ function usePHP(cfg = {}) {
         if (!existsSync(gitIgnoreFile)) {
           writeFile(gitIgnoreFile, "*\n**/*.php.html");
         }
-        entries = entries.flatMap(
-          (entry2) => fastGlob.globSync(entry2, {
-            dot: true,
-            onlyFiles: true,
-            unique: true,
-            ignore: [tempDir, config2.build?.outDir || "dist"]
-          })
-        );
-        const inputs = entries.map(getTempFileName);
+        entries = [
+          ...new Set(
+            entries.flatMap(
+              (entry2) => fastGlob.globSync(entry2, {
+                dot: true,
+                onlyFiles: true,
+                unique: true,
+                ignore: [
+                  tempDir,
+                  config2.build?.outDir || "dist"
+                ]
+              })
+            )
+          )
+        ];
+        consoleHijack(entries);
         return {
           build: {
-            rollupOptions: { input: inputs }
+            rollupOptions: { input: entries }
           },
-          optimizeDeps: { entries: inputs }
+          optimizeDeps: { entries }
         };
       },
       configResolved(_config) {
         config = _config;
-        entries.forEach(
-          (entry2) => escapePHP({
-            inputFile: entry2,
-            outputFile: getTempFileName(entry2),
-            config
-          })
-        );
       }
     },
     {
       name: "serve-php",
       apply: "serve",
       enforce: "pre",
+      configResolved(_config) {
+        config = _config;
+        entries.forEach((entry2) => {
+          const outputFile = getTempFileName(entry2);
+          escapePHP({
+            inputFile: entry2,
+            config
+          }).write(outputFile);
+        });
+      },
       configureServer(server) {
         viteServer = server;
         phpServer.start(viteServer?.config.root);
@@ -7105,14 +7131,14 @@ function usePHP(cfg = {}) {
       },
       handleHotUpdate({ server, file }) {
         const entry2 = entries.find(
-          (entryFile) => file.endsWith(entryFile) && resolve(entryFile) === file
+          (entryFile) => resolve(entryFile) === file
         );
         if (entry2) {
+          const outputFile = getTempFileName(entry2);
           escapePHP({
             inputFile: entry2,
-            outputFile: getTempFileName(entry2),
             config
-          });
+          }).write(outputFile);
           server.ws.send({
             type: "full-reload",
             path: "*"
@@ -7123,22 +7149,49 @@ function usePHP(cfg = {}) {
     {
       name: "build-php",
       apply: "build",
+      enforce: "pre",
       resolveId(source, importer, options) {
-        if (importer?.endsWith(".html") && importer.includes(`/${tempDir}/`)) {
-          return { id: resolve(source) };
+        if (entries.includes(source)) {
+          return {
+            id: `${source}.html`,
+            resolvedBy: "vite-plugin-php",
+            meta: {
+              originalId: source
+            }
+          };
         }
       },
-      closeBundle() {
-        const distDir = config?.build.outDir;
-        entries.forEach((file) => {
-          const tempFileName = getTempFileName(file);
-          const code = unescapePHP({
-            file: `${distDir}/${tempFileName}`,
-            tokensFile: `${tempFileName}.json`
+      load(id, options) {
+        const entry2 = this.getModuleInfo(id)?.meta.originalId;
+        if (entry2) {
+          const { escapedCode, phpCodes } = escapePHP({
+            inputFile: entry2,
+            config
           });
-          writeFile(`${distDir}/${file}`, code);
-        });
-        cleanupTemp(distDir);
+          return {
+            code: escapedCode,
+            meta: { phpCodes }
+          };
+        }
+      },
+      generateBundle: {
+        order: "post",
+        handler(options, bundle, isWrite) {
+          Object.entries(bundle).forEach(([key, item]) => {
+            if (item.type === "asset") {
+              const meta = this.getModuleInfo(
+                item.fileName
+              )?.meta;
+              if (meta?.originalId && meta?.phpCodes) {
+                item.fileName = meta.originalId;
+                item.source = unescapePHP({
+                  escapedCode: item.source.toString(),
+                  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,6 +1,6 @@
 {
 	"name": "vite-plugin-php",
-	"version": "1.0.40",
+	"version": "1.0.55",
 	"description": "Process PHP-files with the speed and tools of Vite",
 	"keywords": [
 		"vite",