elit 3.6.1 → 3.6.2

package/Cargo.lock

@@ -171,7 +171,7 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "arboard"
-version = "3.6.1"
+version = "3.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
 dependencies = [
@@ -1211,7 +1211,7 @@ dependencies = [
 
 [[package]]
 name = "elit-desktop"
-version = "3.6.0"
+version = "3.6.2"
 dependencies = [
  "eframe",
  "http",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "elit-desktop"
-version = "3.6.0"
+version = "3.6.2"
 edition = "2021"
 build = "desktop/build.rs"
 

package/README.md

@@ -955,7 +955,7 @@ The package also exports `elit/test`, `elit/test-runtime`, and `elit/test-report
 
 Latest release notes live in [CHANGELOG.md](CHANGELOG.md).
 
-Highlights in `v3.6.0`:
+Highlights in `v3.6.2`:
 
 - Added `elit pm` for detached background process management of shell commands, file targets, and WAPK apps.
 - Added `pm.apps[]` and `pm.dataDir` in `elit.config.*` for config-first process manager workflows.

package/dist/cli.cjs

@@ -76846,10 +76846,19 @@ function resolveDesktopEntryDisplayName(entryPath, fallbackName) {
   }
   return formatDesktopDisplayName(fallbackName);
 }
-function resolveDesktopBootstrapSupportModulePath(moduleName, packageRoot = PACKAGE_ROOT) {
+function resolveDesktopBootstrapSupportModulePath(moduleName, packageRoot = PACKAGE_ROOT, options = {}) {
+  const builtCandidates = options.preferredBuiltFormat === "cjs" ? [
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.cjs`),
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.js`),
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.mjs`)
+  ] : [
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.mjs`),
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.js`),
+    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.cjs`)
+  ];
   const candidates = [
     (0, import_node_path3.resolve)(packageRoot, "src", `${moduleName}.ts`),
-    (0, import_node_path3.resolve)(packageRoot, "dist", `${moduleName}.mjs`)
+    ...builtCandidates
   ];
   for (const candidate of candidates) {
     if ((0, import_node_fs3.existsSync)(candidate)) {
@@ -76881,12 +76890,12 @@ function resolveDesktopBinaryOverridePath(configuredPath, envName, cwd = process
   }
   return (0, import_node_path3.resolve)(cwd, explicitPath);
 }
-function createDesktopBootstrapEntry(entryPath, appName) {
+function createDesktopBootstrapEntry(entryPath, appName, options = {}) {
   const bootstrapId = (0, import_node_crypto3.randomUUID)();
   const bootstrapPath = (0, import_node_path3.join)((0, import_node_path3.dirname)(entryPath), `.elit-desktop-bootstrap-${appName}-${bootstrapId}.ts`);
   const preludePath = (0, import_node_path3.join)((0, import_node_path3.dirname)(entryPath), `.elit-desktop-prelude-${appName}-${bootstrapId}.ts`);
-  const desktopAutoRenderPath = resolveDesktopBootstrapSupportModulePath("desktop-auto-render");
-  const renderContextPath = resolveDesktopBootstrapSupportModulePath("render-context");
+  const desktopAutoRenderPath = resolveDesktopBootstrapSupportModulePath("desktop-auto-render", PACKAGE_ROOT, options);
+  const renderContextPath = resolveDesktopBootstrapSupportModulePath("render-context", PACKAGE_ROOT, options);
   const defaultTitle = `${resolveDesktopEntryDisplayName(entryPath, appName)} Desktop`;
   (0, import_node_fs3.writeFileSync)(
     preludePath,
@@ -76934,12 +76943,12 @@ function createDesktopBootstrapEntry(entryPath, appName) {
     cleanupPaths: [bootstrapPath, preludePath]
   };
 }
-function createWorkspacePackagePlugin2(entryDir) {
+function createWorkspacePackagePlugin2(entryDir, options = {}) {
   return {
     name: "workspace-package-self-reference",
     setup(build2) {
       build2.onResolve({ filter: /^elit(?:\/.*)?$/ }, (args) => {
-        const resolved = resolveWorkspacePackageImport(args.path, args.resolveDir || entryDir);
+        const resolved = resolveWorkspacePackageImport(args.path, args.resolveDir || entryDir, options);
         return resolved ? { path: resolved } : void 0;
       });
     }
@@ -77865,8 +77874,10 @@ async function prepareEntry(entry, runtime2, compiler, mode) {
   if (!shouldCompile) {
     return { appName, entryPath };
   }
-  const bootstrapEntry = createDesktopBootstrapEntry(entryPath, appName);
   const output = compileTarget(runtime2);
+  const bootstrapEntry = createDesktopBootstrapEntry(entryPath, appName, {
+    preferredBuiltFormat: compiler === "tsx" ? "esm" : "cjs"
+  });
   const compiledPath = (0, import_node_path3.join)((0, import_node_path3.dirname)(entryPath), `.elit-desktop-${appName}-${(0, import_node_crypto3.randomUUID)()}${output.extension}`);
   try {
     await compileDesktopEntry({
@@ -77919,7 +77930,9 @@ async function compileDesktopEntry(options) {
   }
 }
 async function compileDesktopEntryWithEsbuild(options) {
-  const workspacePackagePlugin = createWorkspacePackagePlugin2((0, import_node_path3.dirname)(options.entryPath));
+  const workspacePackagePlugin = createWorkspacePackagePlugin2((0, import_node_path3.dirname)(options.entryPath), {
+    preferredBuiltFormat: "cjs"
+  });
   await (0, import_esbuild2.build)({
     absWorkingDir: (0, import_node_path3.dirname)(options.entryPath),
     bundle: true,
@@ -77937,7 +77950,9 @@ async function compileDesktopEntryWithEsbuild(options) {
 async function compileDesktopEntryWithTsup(options) {
   const tsup = await loadOptionalDesktopCompiler("tsup", options.entryPath, "tsup");
   const outputBaseName = (0, import_node_path3.basename)(options.compiledPath, (0, import_node_path3.extname)(options.compiledPath));
-  const workspacePackagePlugin = createWorkspacePackagePlugin2((0, import_node_path3.dirname)(options.entryPath));
+  const workspacePackagePlugin = createWorkspacePackagePlugin2((0, import_node_path3.dirname)(options.entryPath), {
+    preferredBuiltFormat: "cjs"
+  });
   await tsup.build({
     bundle: true,
     clean: false,

package/dist/cli.mjs

@@ -76831,10 +76831,19 @@ function resolveDesktopEntryDisplayName(entryPath, fallbackName) {
   }
   return formatDesktopDisplayName(fallbackName);
 }
-function resolveDesktopBootstrapSupportModulePath(moduleName, packageRoot = PACKAGE_ROOT) {
+function resolveDesktopBootstrapSupportModulePath(moduleName, packageRoot = PACKAGE_ROOT, options = {}) {
+  const builtCandidates = options.preferredBuiltFormat === "cjs" ? [
+    resolve4(packageRoot, "dist", `${moduleName}.cjs`),
+    resolve4(packageRoot, "dist", `${moduleName}.js`),
+    resolve4(packageRoot, "dist", `${moduleName}.mjs`)
+  ] : [
+    resolve4(packageRoot, "dist", `${moduleName}.mjs`),
+    resolve4(packageRoot, "dist", `${moduleName}.js`),
+    resolve4(packageRoot, "dist", `${moduleName}.cjs`)
+  ];
   const candidates = [
     resolve4(packageRoot, "src", `${moduleName}.ts`),
-    resolve4(packageRoot, "dist", `${moduleName}.mjs`)
+    ...builtCandidates
   ];
   for (const candidate of candidates) {
     if (existsSync3(candidate)) {
@@ -76866,12 +76875,12 @@ function resolveDesktopBinaryOverridePath(configuredPath, envName, cwd = process
   }
   return resolve4(cwd, explicitPath);
 }
-function createDesktopBootstrapEntry(entryPath, appName) {
+function createDesktopBootstrapEntry(entryPath, appName, options = {}) {
   const bootstrapId = randomUUID2();
   const bootstrapPath = join3(dirname4(entryPath), `.elit-desktop-bootstrap-${appName}-${bootstrapId}.ts`);
   const preludePath = join3(dirname4(entryPath), `.elit-desktop-prelude-${appName}-${bootstrapId}.ts`);
-  const desktopAutoRenderPath = resolveDesktopBootstrapSupportModulePath("desktop-auto-render");
-  const renderContextPath = resolveDesktopBootstrapSupportModulePath("render-context");
+  const desktopAutoRenderPath = resolveDesktopBootstrapSupportModulePath("desktop-auto-render", PACKAGE_ROOT, options);
+  const renderContextPath = resolveDesktopBootstrapSupportModulePath("render-context", PACKAGE_ROOT, options);
   const defaultTitle = `${resolveDesktopEntryDisplayName(entryPath, appName)} Desktop`;
   writeFileSync4(
     preludePath,
@@ -76919,12 +76928,12 @@ function createDesktopBootstrapEntry(entryPath, appName) {
     cleanupPaths: [bootstrapPath, preludePath]
   };
 }
-function createWorkspacePackagePlugin2(entryDir) {
+function createWorkspacePackagePlugin2(entryDir, options = {}) {
   return {
     name: "workspace-package-self-reference",
     setup(build2) {
       build2.onResolve({ filter: /^elit(?:\/.*)?$/ }, (args) => {
-        const resolved = resolveWorkspacePackageImport(args.path, args.resolveDir || entryDir);
+        const resolved = resolveWorkspacePackageImport(args.path, args.resolveDir || entryDir, options);
         return resolved ? { path: resolved } : void 0;
       });
     }
@@ -77850,8 +77859,10 @@ async function prepareEntry(entry, runtime2, compiler, mode) {
   if (!shouldCompile) {
     return { appName, entryPath };
   }
-  const bootstrapEntry = createDesktopBootstrapEntry(entryPath, appName);
   const output = compileTarget(runtime2);
+  const bootstrapEntry = createDesktopBootstrapEntry(entryPath, appName, {
+    preferredBuiltFormat: compiler === "tsx" ? "esm" : "cjs"
+  });
   const compiledPath = join3(dirname4(entryPath), `.elit-desktop-${appName}-${randomUUID2()}${output.extension}`);
   try {
     await compileDesktopEntry({
@@ -77904,7 +77915,9 @@ async function compileDesktopEntry(options) {
   }
 }
 async function compileDesktopEntryWithEsbuild(options) {
-  const workspacePackagePlugin = createWorkspacePackagePlugin2(dirname4(options.entryPath));
+  const workspacePackagePlugin = createWorkspacePackagePlugin2(dirname4(options.entryPath), {
+    preferredBuiltFormat: "cjs"
+  });
   await esbuild2({
     absWorkingDir: dirname4(options.entryPath),
     bundle: true,
@@ -77922,7 +77935,9 @@ async function compileDesktopEntryWithEsbuild(options) {
 async function compileDesktopEntryWithTsup(options) {
   const tsup = await loadOptionalDesktopCompiler("tsup", options.entryPath, "tsup");
   const outputBaseName = basename4(options.compiledPath, extname3(options.compiledPath));
-  const workspacePackagePlugin = createWorkspacePackagePlugin2(dirname4(options.entryPath));
+  const workspacePackagePlugin = createWorkspacePackagePlugin2(dirname4(options.entryPath), {
+    preferredBuiltFormat: "cjs"
+  });
   await tsup.build({
     bundle: true,
     clean: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elit",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Optimized lightweight library for creating DOM elements with reactive state",
   "main": "dist/index.js",
   "module": "dist/index.mjs",