@onexapis/cli 1.1.15 → 1.1.17

package/dist/index.mjs

@@ -5,6 +5,7 @@ import path7 from 'path';
 import fs6 from 'fs/promises';
 import crypto from 'crypto';
 import { glob } from 'glob';
+import { createRequire } from 'module';
 import fs2 from 'fs';
 import { execSync, spawn } from 'child_process';
 import inquirer from 'inquirer';
@@ -240,6 +241,12 @@ function createThemeDepsStubPlugin(themePath) {
             if (!result.errors.length) return result;
           } catch {
           }
+          try {
+            const req = createRequire(import.meta.url || __filename);
+            const resolved = req.resolve(args.path);
+            if (resolved) return { path: resolved, namespace: "file" };
+          } catch {
+          }
           return { path: args.path, namespace };
         });
       };
@@ -248,11 +255,19 @@ function createThemeDepsStubPlugin(themePath) {
         const stubs = {
           "next/image": `
 import React from 'react';
-const Image = (props) => {
-  const { src, alt, width, height, fill, priority, ...rest } = props;
+const Image = React.forwardRef((props, ref) => {
+  const { src, alt, width, height, fill, priority, sizes, quality, placeholder, blurDataURL, onLoad, onError, style, className, ...rest } = props;
   const imgSrc = typeof src === 'object' ? src.src : src;
-  return React.createElement('img', { src: imgSrc, alt, width: fill ? undefined : width, height: fill ? undefined : height, loading: priority ? 'eager' : 'lazy', ...rest });
-};
+  const fillStyle = fill ? { position: 'absolute', inset: 0, width: '100%', height: '100%', objectFit: style?.objectFit || 'cover', display: 'block' } : {};
+  const mergedStyle = { ...fillStyle, ...style };
+  return React.createElement('img', {
+    ref, src: imgSrc, alt,
+    width: fill ? undefined : width, height: fill ? undefined : height,
+    loading: priority ? 'eager' : 'lazy',
+    style: Object.keys(mergedStyle).length > 0 ? mergedStyle : undefined,
+    className, onLoad, onError, ...rest,
+  });
+});
 export default Image;
           `,
           "next/link": `
@@ -286,7 +301,10 @@ export function headers() { return new Headers(); }
         if (!lucideThemeScanned) {
           lucideThemeScanned = true;
           try {
-            const scanned = await scanImportsFromPackage(themePath, "lucide-react");
+            const scanned = await scanImportsFromPackage(
+              themePath,
+              "lucide-react"
+            );
             for (const names of Object.values(scanned)) {
               for (const name of names) lucideImports.add(name);
             }
@@ -349,10 +367,13 @@ export function useFormContext() { return useForm(); }
         loader: "js"
       }));
       tryResolveOrStub(/^@hookform\/resolvers/, "hookform-resolvers-stub");
-      build2.onLoad({ filter: /.*/, namespace: "hookform-resolvers-stub" }, () => ({
-        contents: `export function zodResolver() { return () => ({ values: {}, errors: {} }); }`,
-        loader: "js"
-      }));
+      build2.onLoad(
+        { filter: /.*/, namespace: "hookform-resolvers-stub" },
+        () => ({
+          contents: `export function zodResolver() { return () => ({ values: {}, errors: {} }); }`,
+          loader: "js"
+        })
+      );
       tryResolveOrStub(/^next-intl$/, "next-intl-stub");
       build2.onLoad({ filter: /.*/, namespace: "next-intl-stub" }, () => ({
         contents: `
@@ -610,7 +631,11 @@ async function compileStandaloneTheme(themePath, themeName) {
     banner: {
       js: '"use client";'
     },
-    plugins: [reactGlobalPlugin, createCoreGlobalPlugin(themePath), createThemeDepsStubPlugin(themePath)],
+    plugins: [
+      reactGlobalPlugin,
+      createCoreGlobalPlugin(themePath),
+      createThemeDepsStubPlugin(themePath)
+    ],
     external: [],
     alias: {
       events: "events/",
@@ -692,7 +717,11 @@ async function compileStandaloneThemeDev(themePath, themeName) {
     banner: {
       js: '"use client";'
     },
-    plugins: [reactGlobalPlugin, createCoreGlobalPlugin(themePath), createThemeDepsStubPlugin(themePath)],
+    plugins: [
+      reactGlobalPlugin,
+      createCoreGlobalPlugin(themePath),
+      createThemeDepsStubPlugin(themePath)
+    ],
     external: [],
     alias: {
       events: "events/",
@@ -827,7 +856,16 @@ ${locations.join("\n")}`
             path7.join(themePath, "node_modules", "@onexapis", "core", "src"),
             path7.join(themePath, "..", "..", "packages", "core", "src"),
             // monorepo sibling
-            path7.join(__dirname, "..", "..", "..", "..", "packages", "core", "src")
+            path7.join(
+              __dirname,
+              "..",
+              "..",
+              "..",
+              "..",
+              "packages",
+              "core",
+              "src"
+            )
             // from CLI src
           ];
           let coreSourceDir = null;
@@ -841,7 +879,10 @@ ${locations.join("\n")}`
           }
           if (coreSourceDir) {
             try {
-              const scanned = await scanImportsFromPackage(coreSourceDir, "lucide-react");
+              const scanned = await scanImportsFromPackage(
+                coreSourceDir,
+                "lucide-react"
+              );
               for (const names of Object.values(scanned)) {
                 for (const name of names) lucideIconNames.add(name);
               }
@@ -862,7 +903,10 @@ ${locations.join("\n")}`
                 const mjsFiles = await glob("*.mjs", { cwd: candidate });
                 const importRegex = /import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/g;
                 for (const file of mjsFiles) {
-                  const content = await fs6.readFile(path7.join(candidate, file), "utf-8");
+                  const content = await fs6.readFile(
+                    path7.join(candidate, file),
+                    "utf-8"
+                  );
                   for (const match of content.matchAll(importRegex)) {
                     for (const name of match[1].split(",")) {
                       const original = name.trim().split(/\s+as\s+/)[0].trim();
@@ -878,7 +922,10 @@ ${locations.join("\n")}`
             }
           }
           try {
-            const scanned = await scanImportsFromPackage(themePath, "lucide-react");
+            const scanned = await scanImportsFromPackage(
+              themePath,
+              "lucide-react"
+            );
             for (const names of Object.values(scanned)) {
               for (const name of names) lucideIconNames.add(name);
             }
@@ -908,14 +955,39 @@ export default new Proxy({}, { get: (_, name) => name === '__esModule' ? true :
           if (!result.errors.length) return result;
         } catch {
         }
+        try {
+          const req = createRequire(import.meta.url || __filename);
+          const cjsPath = req.resolve("framer-motion");
+          const pkgDir = cjsPath.replace(/[/\\]dist[/\\].*$/, "");
+          const esmEntry = path7.join(pkgDir, "dist", "es", "index.mjs");
+          const { existsSync } = await import('fs');
+          if (existsSync(esmEntry)) {
+            return { path: esmEntry, namespace: "file" };
+          }
+          return { path: cjsPath, namespace: "file" };
+        } catch {
+        }
         return { path: args.path, namespace: "motion-stub" };
       });
       build2.onLoad({ filter: /.*/, namespace: "motion-stub" }, () => ({
         contents: `
-const stub = (props) => props.children || null;
-const handler = { get: (_, name) => name === '__esModule' ? true : stub };
+import React from 'react';
+const MotionComponent = React.forwardRef((props, ref) => {
+  const { initial, animate, exit, variants, transition, whileInView, whileHover, whileTap, viewport, onAnimationComplete, layout, layoutId, style, className, ...rest } = props;
+  return React.createElement(rest.as || 'div', { ref, style, className, ...rest }, rest.children);
+});
+const handler = { get: (_, name) => {
+  if (name === '__esModule') return true;
+  if (name === 'create') return () => new Proxy({}, handler);
+  return MotionComponent;
+}};
 export const motion = new Proxy({}, handler);
-export const AnimatePresence = stub;
+export const AnimatePresence = (props) => props.children || null;
+export const useInView = () => true;
+export const useAnimation = () => ({ start: () => {}, stop: () => {}, set: () => {} });
+export const useMotionValue = (v) => ({ get: () => v, set: () => {}, onChange: () => () => {} });
+export const useTransform = (v) => v;
+export const useScroll = () => ({ scrollY: { get: () => 0, onChange: () => () => {} }, scrollYProgress: { get: () => 0, onChange: () => () => {} } });
 export default { motion, AnimatePresence };
         `.trim(),
         loader: "jsx"
@@ -938,12 +1010,26 @@ export default { motion, AnimatePresence };
       build2.onLoad({ filter: /.*/, namespace: "next-stub" }, (args) => {
         const stubs = {
           "next/image": `
-const Image = (props) => {
-  const { src, alt, width, height, fill, priority, ...rest } = props;
-  const imgSrc = typeof src === 'object' ? src.src : src;
-  return React.createElement('img', { src: imgSrc, alt, width: fill ? undefined : width, height: fill ? undefined : height, loading: priority ? 'eager' : 'lazy', ...rest });
-};
 import React from 'react';
+const Image = React.forwardRef((props, ref) => {
+  const { src, alt, width, height, fill, priority, sizes, quality, placeholder, blurDataURL, onLoad, onError, style, className, ...rest } = props;
+  const imgSrc = typeof src === 'object' ? src.src : src;
+  const fillStyle = fill ? { position: 'absolute', inset: 0, width: '100%', height: '100%', objectFit: style?.objectFit || 'cover', display: 'block' } : {};
+  const mergedStyle = { ...fillStyle, ...style };
+  return React.createElement('img', {
+    ref,
+    src: imgSrc,
+    alt,
+    width: fill ? undefined : width,
+    height: fill ? undefined : height,
+    loading: priority ? 'eager' : 'lazy',
+    style: Object.keys(mergedStyle).length > 0 ? mergedStyle : undefined,
+    className,
+    onLoad,
+    onError,
+    ...rest,
+  });
+});
 export default Image;
           `,
           "next/link": `
@@ -1466,7 +1552,7 @@ Add your theme-specific blocks here.
       try {
         execSync("git init", { cwd: projectPath, stdio: "ignore" });
         execSync("git add .", { cwd: projectPath, stdio: "ignore" });
-        execSync('git commit -m "Initial commit from onex init"', {
+        execSync('git commit -m "Initial commit from onexthm init"', {
           cwd: projectPath,
           stdio: "ignore"
         });
@@ -2634,7 +2720,7 @@ async function buildCommand(options) {
   logger.stopSpinner(true, "Lint passed");
   const pkgJson = fs.readJsonSync(packageJsonPath);
   const buildScript = pkgJson.scripts?.build || "";
-  const isRecursive = buildScript.includes("onex build") || buildScript.includes("onex-cli build");
+  const isRecursive = buildScript.includes("onexthm build") || buildScript.includes("onex-cli build");
   logger.startSpinner(
     options.watch ? "Building (watch mode)..." : "Building..."
   );
@@ -2832,7 +2918,7 @@ async function uploadCommand(options) {
     if (!compiledDir) {
       spinner.fail(
         chalk4.red(
-          `Compiled theme not found for ${themeId}@${version}. Run 'onex build' first.`
+          `Compiled theme not found for ${themeId}@${version}. Run 'onexthm build' first.`
         )
       );
       logger.info(chalk4.gray(`Expected location:
@@ -3064,7 +3150,7 @@ function showDownloadFailureHelp(themeId, bucket) {
   console.log(chalk4.white("1. Compile and upload the theme:"));
   console.log(chalk4.gray(`   cd themes/${themeId}`));
   console.log(chalk4.gray("   pnpm build"));
-  console.log(chalk4.gray("   onex upload"));
+  console.log(chalk4.gray("   onexthm upload"));
   console.log();
   console.log(chalk4.white("2. Verify AWS credentials are set:"));
   console.log(
@@ -3366,7 +3452,7 @@ async function cloneCommand(themeName, options) {
         chalk4.yellow("The theme source may not have been uploaded yet.")
       );
       console.log(
-        chalk4.gray(`Upload source with: onex upload --theme ${themeName}`)
+        chalk4.gray(`Upload source with: onexthm upload --theme ${themeName}`)
       );
       console.log();
       process.exit(1);
@@ -3435,7 +3521,7 @@ async function cloneCommand(themeName, options) {
     if (options.install === false) {
       console.log(chalk4.gray("   pnpm install"));
     }
-    console.log(chalk4.gray("   onex build"));
+    console.log(chalk4.gray("   onexthm build"));
     console.log();
   } catch (error) {
     spinner.fail(chalk4.red(`Clone failed: ${error.message}`));