lilact 0.15.4 → 0.16.0

package/{webpack.config.factory.cjs → scripts/build.mjs}

@@ -1,65 +1,18 @@
-const path = require("path");
-const webpack = require('webpack');
-
-module.exports = function webpackConfigFactory({
-	entry,
-	outputPath,
-	mode,
-	name
-}) {
-	const entryAbs = path.isAbsolute(entry) ? entry : path.resolve(entry);
-	const lilactRoot = path.dirname(require.resolve("lilact/package.json"));
-
-	return {
-		mode,
-		target: "web",
-
-		entry: entryAbs,
-
-		output: {
-			path: outputPath,
-			filename: name,
-			clean: true
-		},
-
-		resolve: {
-			extensions: [".js", ".cjs", ".mjs", ".json", ".css", ".jsx"]
-		},
-
-		module: {
-			rules: [
-				{
-					test: /\.jsx$/,
-					exclude: /node_modules/,
-					use: [{
-						loader: path.join(lilactRoot, 'src/loader.cjs'),
-						options: {
-							mode
-						}
-					}]
-				},
-				{
-					test: /\.css$/i,
-					use: [
-						{
-							loader: "style-loader"
-						},
-						{
-							loader: "css-loader",
-							options: {
-								// keeps behavior simple; you can enable modules if you want
-								modules: false,
-								importLoaders: 0
-							}
-						}
-					]
-				}
-			]
-		},
-		plugins: [
-		    new webpack.BannerPlugin({
-		      banner: `Lilact
-Copyright (C) 2024-2025 Arash Kazemi <contact.arash.kazemi@gmail.com>
+import esbuild from "esbuild";
+
+const mode = process.env.MODE === "production" ? "production" : "development";
+const minify = process.env.MINIFY === "true";
+
+const DEBUG = mode === "development";
+
+const suffix = mode === "development" ? ".development" : ".production";
+const minSuffix = minify ? ".min" : "";
+const outFile = `lilact.${mode}${minSuffix}.js`;
+
+
+const licenseBanner = `/*!
+Lilact
+Copyright (C) 2024-2026 Arash Kazemi <contact.arash.kazemi@gmail.com>
 All rights reserved.
 
 BSD-2-Clause
@@ -82,10 +35,6 @@ the Lilact object:
 Copyright (c) Emotion team and other contributors
 MIT License
 
-prop-types:
-Copyright (c) 2013-present, Facebook, Inc.
-MIT License
-
 redux:
 Copyright (c) 2015-present Dan Abramov
 MIT License
@@ -115,10 +64,36 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-`,
-		      raw: false,          // treat banner as text
-		      entryOnly: false,   // apply to all chunks; set true for entry only
-		    }),
-		  ]
-	};
-};
+*/
+`;
+
+
+await esbuild.build({
+  entryPoints: [".tmp/src/lilact.jsx"],
+  bundle: true,
+  format: "esm",
+  platform: "browser",
+
+  outfile: `dist/${outFile}`,
+  target: "es2018",
+  sourcemap: mode === "development",
+
+  minify,
+
+  define: {
+    DEBUG: JSON.stringify(DEBUG),
+  },
+
+  loader: {
+    ".js": "js",
+    ".jsx": "jsx",
+  },
+  
+  logOverride: {
+    "direct-eval": "silent",
+  },
+
+  banner: {
+    js: licenseBanner, // prepended to the top of the generated JS
+  },
+});

package/scripts/copy-dist-to-root.mjs

@@ -0,0 +1,13 @@
+import fs from "fs";
+import path from "path";
+
+const root = path.resolve(process.cwd(), "root");
+const dist = path.resolve(process.cwd(), "dist");
+
+fs.mkdirSync(root, { recursive: true });
+
+for (const name of fs.readdirSync(dist)) {
+  const src = path.join(dist, name);
+  const dst = path.join(root, name);
+  if (fs.statSync(src).isFile()) fs.copyFileSync(src, dst);
+}

package/scripts/esbuild-preprocessor-plugin.cjs

@@ -0,0 +1,29 @@
+// scripts/esbuild-preprocessor-plugin.cjs
+const fs = require("fs/promises");
+const path = require("path");
+const { transpileJSX } = require("../src/jsx.js");
+
+function createLilactJsxPlugin({ mode }) {
+  const DEBUG = mode !== "production";
+
+  return {
+    name: "lilact-transpile-jsx",
+    setup(build) {
+      build.onLoad({ filter: /\.jsx$/ }, async (args) => {
+        const source = await fs.readFile(args.path, "utf8");
+
+        const out = transpileJSX(source, {
+          path: args.path,
+          appendSourcemap: DEBUG,
+        });
+
+        return { contents: out, loader: "js" };
+      });
+
+      // Optional: if you want .js files through your transpiler too, add another onLoad:
+      // build.onLoad({ filter: /\.js$/ }, async (args) => { ... })
+    },
+  };
+}
+
+module.exports = { createLilactJsxPlugin };

package/scripts/preprocess.mjs

@@ -0,0 +1,42 @@
+// scripts/preprocess.mjs
+import fs from "fs";
+import path from "path";
+import fg from "fast-glob";
+import { fileURLToPath } from "url";
+import { transpileJSX } from "../src/jsx.js";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const projectRoot = path.resolve(__dirname, "..");
+
+const mode = process.env.MODE === "production" ? "production" : "development";
+const DEBUG = mode === "development";
+
+const outDir = path.resolve(projectRoot, ".tmp");
+
+const files = await fg(["src/**/*.jsx", "src/**/*.js"], {
+  cwd: projectRoot,
+  onlyFiles: true,
+});
+
+await Promise.all(
+  files.map(async (rel) => {
+    const inPath = path.resolve(projectRoot, rel);
+
+    const outRel = rel; //.replace(/\.(jsx|js)$/i, ".js");
+    const outPath = path.resolve(outDir, outRel);
+
+    await fs.promises.mkdir(path.dirname(outPath), { recursive: true });
+
+    const source = await fs.promises.readFile(inPath, "utf8");
+
+    const compiled = transpileJSX(source, {
+      path: inPath,
+      appendSourcemap: DEBUG,
+    });
+
+    await fs.promises.writeFile(outPath, compiled, "utf8");
+  })
+);
+
+console.log("Preprocessing done.");

package/src/accessories.jsx

@@ -173,30 +173,9 @@ export class Suspense extends Component
 	}
 
 /** @ignore */
-	componentDidCatch(error) {
+	componentDidCatch(error, info) {
 		if (!isThenable(error)) return;
-
-		const promise = error;
-
-		if (this._pending.has(promise)) return;
-
-		// Add to set of pending promises
-		this._pending.add(promise);
-
-		// Start delay timer only when this is the first pending promise
-		if (this._pending.size === 1) {
-			const delay = Math.max(0, this.props.minDelay);
-			// Ensure no leftover timers
-			if (this._delayTimer) {
-				clearTimeout(this._delayTimer);
-				this._delayTimer = null;
-			}
-			this._delayTimer = setTimeout(() => {
-				this._delayTimer = null;
-				this._fallbackShownAt = Date.now();
-				this.setState({ showingFallback: true });
-			}, delay);
-		}
+		this._attachPromise(error);
 	}
 
 /** @ignore */
@@ -274,11 +253,6 @@ export class Suspense extends Component
 		promise.then(onSettled, onSettled);
 	}
 
-/** @ignore */
-	componentDidCatch(error, info) {
-		if (!isThenable(error)) return;
-		this._attachPromise(error);
-	}
 
 /** @ignore */
 	render() {

package/src/components.jsx

@@ -33,7 +33,7 @@ import Lilact from './lilact.jsx';
 import { CORE, COMPONENT, TEXT, IS_ZOMBIE, IDX, CHILD_CLASS_ADDENDUM, MEMOIZED } from "./symbols.jsx"
 import { shallowEqual, toBool, isClass } from "./misc.jsx";
 
-import PropTypes from 'prop-types';
+import { PropTypes } from './proptypes.jsx';
 
 /* 
 ComponentCache is for internal use. It is the heart of the JSX runtime,

package/src/hooks.jsx

@@ -480,11 +480,10 @@ export function useImperativeHandle(ref, factory, deps=undefined)
 
 	ref.deps = deps;
 
-	Lilact.setTimeout( ()=>{ 
-		if(typeof ref?.current !== 'object') {
-			ref.current = {};
-		}
-		Object.assign( ref.current, factory(), 0 );	
-	}, 0);
+	if(typeof ref?.current !== 'object') {
+		ref.current = {};
+	}
+	Object.assign( ref.current, factory(), 0 );	
+
 }
 

package/src/jsx.js

@@ -34,7 +34,7 @@
 // It is not very fast, the xml look-ahead can be quite expensive, but it is not 
 // slow at all.
 
-// Check the webpack config and also the transpiler.js helper script for
+// Check the esbuild config and also the transpiler.js helper script for
 // usage outside Lilact. Also make sure to check the default configuration.
 
 // There are some situations that are solved with tricks, as some aspects of
@@ -46,11 +46,11 @@
 // note: JSX or preprocessors are not processed inside template strings
 // todo: injected string try catchs should be generated by a function
 
-import * as jsxAddons from './jsx.addons.js';
+//import * as jsxAddons from './jsx.addons.js';
 
 /** @ignore */
 export const transpilerConfig = {
-	addons: jsxAddons,
+	//addons: jsxAddons, // addons are not used anymore
 	setBlockLabels: true,
 	enableLabelStack: false,
 	injectLabels: true,
@@ -87,7 +87,7 @@ function parseRegex(code, index, container)
 	// todo: i have doubts about including preprocessorDelimiter
 
 	let i = index;
-	const dels = `;=,([{}!^~&|:?*%-+/<>${transpilerConfig.preprocessorDelimiter}`;
+	let dels = `;=,([{}!^~&|:?*%-+/<>${transpilerConfig.preprocessorDelimiter}`;
 	while(--i>0) { 
 		if( ' \t\r'.indexOf(code[i])!==-1 ) continue;
 		if(code[i]==='\n' ) {
@@ -230,7 +230,8 @@ function preprocessPragmas(node, context)
 {
 	const all_nodes = [];
 
-	var segments = ["const {" + Object.keys(jsxAddons).join(', ') + "} = transpilerConfig.addons;"];
+	var segments = [];  //["const {" + Object.keys(jsxAddons).join(', ') + "} = transpilerConfig.addons;"];
+						// addons are not used anymore
 
 	var scope_stack = [];
 	var last_block = null;
@@ -582,23 +583,25 @@ function parseXML(code, index, container, look_behind=false)
 			break;
 
 		case '>':
-			const i = parseXMLContent(code, index, b);
+			{
+				const i = parseXMLContent(code, index, b);
 
-			// not xml
-			// todo: side effects must be checked
-			if(i===null) return;
+				// not xml
+				// todo: side effects must be checked
+				if(i===null) return;
 
-			if(i>index) index = i;
-			else index++;
+				if(i>index) index = i;
+				else index++;
 
-			if(b.end) {
-				if(container) container.children.push(b);
-				return b;
-			}
-			else {
-				index++;
+				if(b.end) {
+					if(container) container.children.push(b);
+					return b;
+				}
+				else {
+					index++;
+				}
+				break;
 			}
-			break;
 
 		case ' ':
 		case '\t':
@@ -1182,14 +1185,15 @@ export function transpileJSX( jsx, {
 		out += inline_sm;
 	}
 
-	if(globalThis[TRANSPILER_OUTPUT]) {
-		try {
-			const fs = import('fs');
-			fs.writeFileSync(globalThis[TRANSPILER_OUTPUT], out);	
-		}
-		catch(e) {}
-		globalThis[TRANSPILER_OUTPUT] = undefined;
-	}
+	// if(globalThis[TRANSPILER_OUTPUT]) {
+	// 	try {
+	// 		const fs = import('fs');
+	// 		fs.writeFileSync(globalThis[TRANSPILER_OUTPUT], out);	
+	// 	}
+	// 	catch(e) {}
+	// 	globalThis[TRANSPILER_OUTPUT] = undefined;
+	// }
+	
 	//console.log(out);
 
 	return out;

package/src/lilact.jsx

@@ -50,7 +50,7 @@
 
 import * as redux from "redux";
 import * as emotion from "@emotion/css";
-import PropTypes from 'prop-types';
+import { PropTypes } from './proptypes.jsx';
 
 import * as components from './components.jsx';
 import * as hooks from './hooks.jsx';
@@ -92,7 +92,7 @@ export {transpileJSX, transpilerConfig} from "./jsx";
 export const Lilact = 
 {	
 
-	VERSION: "beta.15",
+	VERSION: "beta.16",
 	
 	// Configuration
 
@@ -124,6 +124,7 @@ export const Lilact =
 	emotion,
 
 }
+
 globalThis.Lilact = Lilact;
 globalThis.createComponent = Lilact.createComponent;
 globalThis.Fragment = Lilact.Fragment;