@rws-framework/client 2.13.8 → 2.14.1

package/builder/vite/rws.vite.config.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { fileURLToPath } from 'url';
+import fs from 'fs';
 import { processEnvDefines } from '../../cfg/build_steps/vite/_env_defines';
 import { getRWSVitePlugins } from '../../cfg/build_steps/vite/_loaders';
 import { rwsPath } from '@rws-framework/console';
@@ -7,14 +7,62 @@ import type { RWSViteConfig } from '../../cfg/build_steps/vite/types';
 import type { UserConfig } from 'vite'; // Add this import
 import { RWSScssPlugin } from './rws_scss_plugin';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { ScriptTarget } from 'typescript';
 
+interface CompilerOptionsConfig {
+    baseUrl: string;
+    experimentalDecorators: boolean;
+    emitDecoratorMetadata: boolean;
+    target: 'ES2018' | 'ES2020' | 'ESNext';
+    module: 'es2022' | 'ESNext' | 'commonjs';
+    moduleResolution: 'node' | 'bundler';
+    strict: boolean;
+    esModuleInterop: boolean;
+    resolveJsonModule: boolean;
+    outDir: string;
+    strictNullChecks: boolean;
+    skipLibCheck: boolean;
+    allowSyntheticDefaultImports: boolean;
+    sourceMap: boolean;
+    declaration: boolean;
+    lib: Array<'DOM' | 'ESNext' | 'ES2018' | 'ES2020'>; // add other lib options as needed
+  }
 
+interface TSConfig {
+    compilerOptions: CompilerOptionsConfig;
+    paths?: {[key: string]: string[] };
+    include?: string[];
+    exclude?: string[];
+  }
+
+function logError(error: any) {
+    console.error('Vite config error:', {
+      message: error.message,
+      stack: error.stack,
+      cause: error.cause
+    });
+    throw error;
+  }
+
+function loadTsConfig(tsPath: string): TSConfig | null 
+{
+    if(!fs.existsSync(tsPath)){
+        return null;
+    }
+
+    try {
+      const tsConfig = JSON.parse(fs.readFileSync(tsPath, 'utf-8'));
+      return tsConfig;
+    } catch (error) {
+      logError(error);
+      return null;
+    }
+}
 
 export const _DEFAULT_CFG: RWSViteConfig = {
     dev: true,
     entry: path.resolve(rwsPath.findPackageDir(process.cwd()), 'src', 'index.ts'),
+    outDir: path.resolve(rwsPath.findPackageDir(process.cwd()), 'dist'),
     tsConfigPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'tsconfig.json'),
     cssOutputPath: path.resolve(rwsPath.findPackageDir(process.cwd()), 'public', 'css'),
 };
@@ -28,17 +76,30 @@ export function rwsViteBuilder(config: Partial<RWSViteConfig> = _DEFAULT_CFG, de
         config.cssOutputPath = _DEFAULT_CFG.cssOutputPath;
     }
 
+    if(!config.outDir){
+        config.outDir = _DEFAULT_CFG.outDir;
+    }
+
     const scssPlugin = new RWSScssPlugin({ autoCompile: [], dev: config.dev as boolean });
 
 
     const theConfig: RWSViteConfig = {..._DEFAULT_CFG, ...config};
 
-    // Return a plain configuration object
+    const tsConfig: TSConfig | null = loadTsConfig(theConfig.tsConfigPath);
+
+    if(!tsConfig){
+        throw new Error(`File "${theConfig.tsConfigPath}" was not found!`)
+    }
+
+    const pkgDir: string = rwsPath.findPackageDir(process.cwd());
+
+    const outFileName = theConfig.outFileName || 'client.rws.js';
+    
     return {
         define: processEnvDefines(theConfig, _DEFAULT_CFG, devDebug),        
         plugins: getRWSVitePlugins({ 
             scssPlugin,
-            packageDir: rwsPath.findPackageDir(process.cwd()), 
+            packageDir: pkgDir, 
             nodeModulesPath: `${rwsPath.findRootWorkspacePath(process.cwd())}/node_modules`, 
             tsConfigPath: theConfig.tsConfigPath, 
             cssOutputPath: theConfig.cssOutputPath as string,
@@ -47,11 +108,25 @@ export function rwsViteBuilder(config: Partial<RWSViteConfig> = _DEFAULT_CFG, de
         build: {
             minify: !config.dev,
             sourcemap: config.dev,
-            outDir: 'dist',
+            outDir: theConfig.outDir,
+            emptyOutDir: true,
+            copyPublicDir: false,
             rollupOptions: {
-                input: {
-                    main: theConfig.entry
-                }
+              output: {
+                entryFileNames: outFileName,
+                chunkFileNames: [...outFileName.split('.').slice(0, -1), 'chunk', outFileName.split('.').at(-1)].join('.'),
+              }
+            },
+            lib: {
+                entry: theConfig.entry,
+                formats: ['es'],
+                fileName: () => outFileName
+            }            
+        },
+        esbuild: {
+            target: tsConfig?.compilerOptions?.target?.toString().toLowerCase() || ScriptTarget.ES2022.toString().toLowerCase(),
+            tsconfigRaw: {
+                compilerOptions: tsConfig.compilerOptions
             }
         }
     };

package/cfg/build_steps/vite/types.ts

@@ -1,8 +1,10 @@
 export type RWSViteConfig = {
     dev: boolean;
     entry: string;
-    cssOutputPath?: string;
     tsConfigPath: string;
+    outDir: string;
+    cssOutputPath: string;   
+    outFileName?: string; 
     defines?: {
         [key: string]: string
     };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.13.8",
+    "version": "2.14.1",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -94,9 +94,9 @@
         "tslib": "^2.6.2",
         "uglify-js": "^3.17.4",
         "vite": "^6.0.11",
-        "webpack": "^5.86.0",
+        "webpack": "^5.97.1",    
+        "webpack-cli": "^6.0.1",        
         "webpack-bundle-analyzer": "^4.10.1",
-        "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1",
         "webpack-node-externals": "^3.0.0"
     },