ezfw-core 1.0.95 → 1.0.97

package/core/ezEntryPlugin.js

@@ -4,26 +4,72 @@
  * Generates index.js and hydrate.js entry points with user config inlined.
  * This allows users to only modify ez.config.js while keeping all framework
  * internals hidden.
+ *
+ * Supports two modes:
+ * - Local: when ./ez folder exists (main ez repo)
+ * - NPM: when using ezfw-core from node_modules
  */
 import * as fs from 'fs';
 import * as path from 'path';
 
+/**
+ * Detect if project uses local ./ez folder or ezfw-core from npm
+ */
+function detectFrameworkMode(root) {
+    const localEzPath = path.resolve(root, 'ez/core/ez.js');
+    const localEzTsPath = path.resolve(root, 'ez/core/ez.ts');
+    if (fs.existsSync(localEzPath) || fs.existsSync(localEzTsPath)) {
+        return 'local';
+    }
+    return 'npm';
+}
+
 /**
  * Generate the SPA entry point code (index.js)
  */
-function generateIndexCode(config) {
+function generateIndexCode(config, mode) {
     const theme = config.theme || 'slate-dark';
     const i18nCode = config.i18n
         ? `ez.setLanguages(${JSON.stringify(config.i18n.languages)}, { default: '${config.i18n.default}', debug: ${config.i18n.debug || false} });`
         : '';
 
+    // Framework imports differ based on mode
+    const fwImports = mode === 'local'
+        ? `import './ez/core/ez.js';
+import './ez-base.css';
+import './ez/themes/ez-theme.scss';
+import './ez/themes/ez-theme-slate.scss';`
+        : `import 'ezfw-core';
+import 'ezfw-core/ez-base.css';
+import 'ezfw-core/themes/ez-theme.scss';
+import 'ezfw-core/themes/ez-theme-slate.scss';`;
+
+    // Framework module globs differ based on mode
+    const fwModulesGlob = mode === 'local'
+        ? `const frameworkModules = import.meta.glob([
+    './ez/**/*.{js,jsx,ts,tsx}',
+    '!./ez/islands/**',
+    '!./ez/**/*.test.{js,ts}',
+    '!./ez/**/*.example.{js,ts}',
+    '!./ez/**/*Plugin.{js,ts}'
+]);`
+        : `const frameworkModules = import.meta.glob([
+    './node_modules/ezfw-core/**/*.{js,jsx,ts,tsx}',
+    '!./node_modules/ezfw-core/islands/**',
+    '!./node_modules/ezfw-core/**/*.test.{js,ts}',
+    '!./node_modules/ezfw-core/**/*.example.{js,ts}',
+    '!./node_modules/ezfw-core/**/*Plugin.{js,ts}'
+]);`;
+
+    const fwStylesGlob = mode === 'local'
+        ? `const frameworkStyles = import.meta.glob('./ez/**/*.module.scss');`
+        : `const frameworkStyles = import.meta.glob('./node_modules/ezfw-core/**/*.module.scss');`;
+
     return `// Generated by Ez Framework - DO NOT EDIT
 // Configuration: ez.config.js
+// Mode: ${mode}
 
-import './ez/core/ez.js';
-import './ez-base.css';
-import './ez/themes/ez-theme.scss';
-import './ez/themes/ez-theme-slate.scss';
+${fwImports}
 import { fetchConfigResolver } from './app/fetchConfig.js';
 import { routeResolver } from './app/routes.js';
 import stylesConfig from './ez.styles.config.js';
@@ -42,13 +88,7 @@ ${i18nCode}
 // Framework internals
 ez.defineStyles(stylesConfig);
 
-const frameworkModules = import.meta.glob([
-    './ez/**/*.{js,jsx,ts,tsx}',
-    '!./ez/islands/**',
-    '!./ez/**/*.test.{js,ts}',
-    '!./ez/**/*.example.{js,ts}',
-    '!./ez/**/*Plugin.{js,ts}'
-]);
+${fwModulesGlob}
 
 const desktopModules = import.meta.glob([
     './app/**/*.{js,jsx,ts,tsx}',
@@ -61,7 +101,7 @@ const desktopModules = import.meta.glob([
 const mobileModules = import.meta.glob('./app/**/*.mobile.{js,jsx,ts,tsx}');
 const tabletModules = import.meta.glob('./app/**/*.tablet.{js,jsx,ts,tsx}');
 
-const frameworkStyles = import.meta.glob('./ez/**/*.module.scss');
+${fwStylesGlob}
 const appStyles = import.meta.glob('./app/**/*.module.scss');
 
 ez.installModules({
@@ -100,19 +140,49 @@ if (!window.__EZ_SSR_MODE__) {
 /**
  * Generate the SSR hydration entry point code (hydrate.js)
  */
-function generateHydrateCode(config) {
+function generateHydrateCode(config, mode) {
     const theme = config.theme || 'slate-dark';
     const i18nCode = config.i18n
         ? `ez.setLanguages(${JSON.stringify(config.i18n.languages)}, { default: '${config.i18n.default}', debug: ${config.i18n.debug || false} });`
         : '';
 
+    // Framework imports differ based on mode
+    const fwImports = mode === 'local'
+        ? `import './ez/core/ez.js';
+import './ez-base.css';
+import './ez/themes/ez-theme.scss';
+import './ez/themes/ez-theme-slate.scss';`
+        : `import 'ezfw-core';
+import 'ezfw-core/ez-base.css';
+import 'ezfw-core/themes/ez-theme.scss';
+import 'ezfw-core/themes/ez-theme-slate.scss';`;
+
+    // Framework module globs differ based on mode
+    const fwModulesGlob = mode === 'local'
+        ? `const frameworkModules = import.meta.glob([
+    './ez/**/*.{js,jsx,ts,tsx}',
+    '!./ez/islands/**',
+    '!./ez/**/*.test.{js,ts}',
+    '!./ez/**/*.example.{js,ts}',
+    '!./ez/**/*Plugin.{js,ts}'
+]);`
+        : `const frameworkModules = import.meta.glob([
+    './node_modules/ezfw-core/**/*.{js,jsx,ts,tsx}',
+    '!./node_modules/ezfw-core/islands/**',
+    '!./node_modules/ezfw-core/**/*.test.{js,ts}',
+    '!./node_modules/ezfw-core/**/*.example.{js,ts}',
+    '!./node_modules/ezfw-core/**/*Plugin.{js,ts}'
+]);`;
+
+    const fwStylesGlob = mode === 'local'
+        ? `const frameworkStyles = import.meta.glob('./ez/**/*.module.scss');`
+        : `const frameworkStyles = import.meta.glob('./node_modules/ezfw-core/**/*.module.scss');`;
+
     return `// Generated by Ez Framework - DO NOT EDIT
 // Configuration: ez.config.js
+// Mode: ${mode}
 
-import './ez/core/ez.js';
-import './ez-base.css';
-import './ez/themes/ez-theme.scss';
-import './ez/themes/ez-theme-slate.scss';
+${fwImports}
 import { fetchConfigResolver } from './app/fetchConfig.js';
 import { routeResolver } from './app/routes.js';
 import stylesConfig from './ez.styles.config.js';
@@ -131,13 +201,7 @@ ${i18nCode}
 // Framework internals
 ez.defineStyles(stylesConfig);
 
-const frameworkModules = import.meta.glob([
-    './ez/**/*.{js,jsx,ts,tsx}',
-    '!./ez/islands/**',
-    '!./ez/**/*.test.{js,ts}',
-    '!./ez/**/*.example.{js,ts}',
-    '!./ez/**/*Plugin.{js,ts}'
-]);
+${fwModulesGlob}
 
 const desktopModules = import.meta.glob([
     './app/**/*.{js,jsx,ts,tsx}',
@@ -150,7 +214,7 @@ const desktopModules = import.meta.glob([
 const mobileModules = import.meta.glob('./app/**/*.mobile.{js,jsx,ts,tsx}');
 const tabletModules = import.meta.glob('./app/**/*.tablet.{js,jsx,ts,tsx}');
 
-const frameworkStyles = import.meta.glob('./ez/**/*.module.scss');
+${fwStylesGlob}
 const appStyles = import.meta.glob('./app/**/*.module.scss');
 
 ez.installModules({
@@ -237,10 +301,14 @@ export function ezEntry() {
             // Reload config on each transform (for HMR support)
             config = await loadConfig(root);
 
+            // Detect if using local ./ez folder or ezfw-core from npm
+            const mode = detectFrameworkMode(root);
+            console.log('[Ez Entry] Framework mode:', mode);
+
             if (fileName === 'index.js') {
                 console.log('[Ez Entry] Generating index.js');
                 return {
-                    code: generateIndexCode(config),
+                    code: generateIndexCode(config, mode),
                     map: null
                 };
             }
@@ -248,7 +316,7 @@ export function ezEntry() {
             if (fileName === 'hydrate.js') {
                 console.log('[Ez Entry] Generating hydrate.js');
                 return {
-                    code: generateHydrateCode(config),
+                    code: generateHydrateCode(config, mode),
                     map: null
                 };
             }

package/islands/ViteIslandsPlugin.js

@@ -905,4 +905,8 @@ function generateSitemap(pages, siteUrl) {
 ${urls}
 </urlset>`;
 }
+// Re-export other Vite plugins for unified import
+export { ezEntry } from '../core/ezEntryPlugin.js';
+export { ezJsx } from '../jsx/vite-plugin-ez-jsx.js';
+
 export default ezIslands;

package/islands/ViteIslandsPlugin.ts

@@ -401,4 +401,8 @@ export function ezIslands(options: EzIslandsOptions = {}): Plugin {
 // Re-export types for consumers
 export type { EzIslandsOptions, PageInfo, IslandInfo, BuildManifest, StaticPathParams, GetStaticPaths } from './types.js';
 
+// Re-export other Vite plugins for unified import
+export { ezEntry } from '../core/ezEntryPlugin.js';
+export { ezJsx } from '../jsx/vite-plugin-ez-jsx.js';
+
 export default ezIslands;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezfw-core",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "description": "Ez Framework - A declarative component framework for building modern web applications",
   "type": "module",
   "main": "./core/ez.ts",