@rws-framework/client 2.18.7 → 2.18.9

package/builder/webpack/loaders/rws_fast_ts_loader.js

@@ -4,7 +4,7 @@ const chalk = require('chalk');
 const _scss_cache = require('../../../cfg/build_steps/webpack/_cache');
 const LoadersHelper = require('../../../cfg/build_steps/webpack/_loaders');
 const md5 = require('md5');
-
+const json5 = require('json5');
 
 module.exports = async function(content) { 
 
@@ -28,6 +28,8 @@ module.exports = async function(content) {
       return cachedTS;
     }
 
+  
+
     if(!decoratorData){
         return content;
     }
@@ -35,20 +37,22 @@ module.exports = async function(content) {
     let templateName = null;
     let stylesPath = null;
     
-    if(decoratorData.decoratorArgs){
-        if(decoratorData.decoratorArgs.template){
+    if(decoratorData.decoratorArgs){        
+        const decoratorArgs = json5.parse(decoratorData.decoratorArgs)
+
+        if(decoratorArgs.template){
             templateName = decoratorData.decoratorArgs.template || null;
         }
 
-        if(decoratorData.decoratorArgs.styles){
+        if(decoratorArgs.styles){
             stylesPath = decoratorData.decoratorArgs.styles || null;
         }
         
-        if(decoratorData.decoratorArgs.ignorePackaging){
+        if(decoratorArgs.ignorePackaging){
             isIgnored = true;
         }
 
-        if(decoratorData.decoratorArgs.debugPackaging){
+        if(decoratorArgs.debugPackaging){
             isDebugged = true;
         }             
     }    
@@ -60,7 +64,7 @@ module.exports = async function(content) {
 
     try { 
         if(tagName){                                   
-            const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, templateName, isDev);         
+            const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(filePath, this.addDependency, className, templateName, isDev);         
 
             const styles = await LoadersHelper.getStyles(filePath, this.query?.rwsWorkspaceDir, this.query?.appRootDir,this.addDependency, templateExists, stylesPath, isDev);  
 

package/cfg/build_steps/webpack/_build_config.js

@@ -39,7 +39,7 @@ async function getBuildConfig(rwsFrontBuildConfig, _packageDir){
 
     const devRouteProxy = BuildConfigurator.get('devRouteProxy') || rwsFrontBuildConfig.devRouteProxy;
 
-    const tsConfig = await (BuildConfigurator.get('tsConfig') || rwsFrontBuildConfig.tsConfig)(_packageDir, true, false);
+    const tsConfig = await (BuildConfigurator.get('tsConfig') || rwsFrontBuildConfig.tsConfig)(_packageDir, true);
 
     const rwsPlugins = {};
 

package/cfg/build_steps/webpack/_hot_reload.js

@@ -1,14 +1,14 @@
-function getRWSHotReloadSetup(port, outputDir){
-    return {
-        hot: true,
-        port,
-        static: {
-            directory: outputDir,            
-        },
-        devMiddleware: {
-            publicPath: '/'
-        }
-    }
-}
-
+function getRWSHotReloadSetup(port, outputDir){
+    return {
+        hot: true,
+        port,
+        static: {
+            directory: outputDir,            
+        },
+        devMiddleware: {
+            publicPath: '/'
+        }
+    }
+}
+
 module.exports = { getRWSHotReloadSetup };

package/cfg/build_steps/webpack/_loaders.js

@@ -241,7 +241,7 @@ async function getStyles(filePath, rwsWorkspaceDir, appRootDir, addDependency, t
   return styles;
 }
 
-async function getTemplate(filePath, addDependency, templateName = null, isDev = false) {
+async function getTemplate(filePath, addDependency, className, templateName = null, isDev = false) {
   if(!templateName){
     templateName = 'template';
   }
@@ -256,7 +256,7 @@ async function getTemplate(filePath, addDependency, templateName = null, isDev =
     htmlFastImports = `import * as T from '@microsoft/fast-element';\nimport { html, css, ref, when, repeat, slotted, children } from '@microsoft/fast-element'; \nimport './${templateName}.html';\n`;
     template = `                
 //@ts-ignore                
-let rwsTemplate: any = T.html\`${templateContent}\`;
+let rwsTemplate: any = T.html<${className}>\`${templateContent}\`;
 `; addDependency(templatePath);
   }
 

package/cfg/build_steps/webpack/_parser.js

@@ -1,118 +1,118 @@
-// _parser.js
-const path = require('path');
-const fs = require('fs');
-
-function checkIfPackageIsLinked(basePath, packageName) {
-    try {
-        // Check package.json first
-        const packageJsonPath = path.join(basePath, 'package.json');
-        if (fs.existsSync(packageJsonPath)) {
-            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-            
-            // Check if it's in dependencies or devDependencies
-            const version = packageJson.dependencies?.[packageName] || packageJson.devDependencies?.[packageName];
-            
-            // If version starts with 'file:' or 'link:', it's linked
-            if (version && (version.startsWith('file:') || version.startsWith('link:'))) {
-                return {
-                    isLinked: true,
-                    source: 'package.json',
-                    linkPath: version.replace(/^(file:|link:)/, '')
-                };
-            }
-        }
-
-        // Check yarn.lock
-        const yarnLockPath = path.join(basePath, 'yarn.lock');
-        if (fs.existsSync(yarnLockPath)) {
-            const yarnLockContent = fs.readFileSync(yarnLockPath, 'utf8');
-            const packageEntry = yarnLockContent.split('\n\n').find(entry => 
-                entry.includes(`"${packageName}@`)
-            );
-            
-            if (packageEntry && packageEntry.includes('link:')) {
-                const linkMatch = packageEntry.match(/link: (.+)/);
-                return {
-                    isLinked: true,
-                    source: 'yarn.lock',
-                    linkPath: linkMatch ? linkMatch[1] : null
-                };
-            }
-        }
-
-        // Check package-lock.json
-        const packageLockPath = path.join(basePath, 'package-lock.json');
-        if (fs.existsSync(packageLockPath)) {
-            const packageLock = JSON.parse(fs.readFileSync(packageLockPath, 'utf8'));
-            const packageInfo = packageLock.dependencies?.[packageName] || 
-                              packageLock.devDependencies?.[packageName];
-            
-            if (packageInfo && packageInfo.link) {
-                return {
-                    isLinked: true,
-                    source: 'package-lock.json',
-                    linkPath: packageInfo.link
-                };
-            }
-        }
-
-        return {
-            isLinked: false,
-            source: null,
-            linkPath: null
-        };
-    } catch (e) {
-        console.error('Error checking package link status:', e);
-        return {
-            isLinked: false,
-            source: null,
-            linkPath: null,
-            error: e.message
-        };
-    }
-}
-
-function parseWebpackPath(stack) {
-    const currentFileLine = stack.split('\n').find(line => line.includes('_loaders.js'));
-    if (!currentFileLine) return null;
-
-    const match = currentFileLine.match(/\((.+?):\d+:\d+\)/);
-    if (!match) return null;
-
-    const originalPath = match[1];
-    
-    if (originalPath.includes('webpack:')) {
-        const [fsPath, webpackPath] = originalPath.split('webpack:');
-        const basePath = fsPath.replace('/build/', '/');
-        
-        // Check if @rws-framework/client is linked
-        const linkInfo = checkIfPackageIsLinked(basePath, '@rws-framework/client');
-
-        // Check both possible locations
-        const possiblePaths = [
-            // Check in @dev/client
-            path.join(basePath, '../@dev/client', webpackPath),
-            // Check in node_modules
-            path.join(basePath, 'node_modules/@rws-framework/client', webpackPath.replace('/client/', '/'))
-        ];
-
-        for (const possiblePath of possiblePaths) {
-            if (fs.existsSync(possiblePath)) {
-                return {
-                    original: originalPath,
-                    fsPath: basePath,
-                    webpackPath,
-                    exists: true,
-                    realPath: fs.realpathSync(possiblePath),
-                    resolvedPath: possiblePath,
-                    location: possiblePath.includes('node_modules') ? 'node_modules' : '@dev',
-                    linkInfo // Include the link information
-                };
-            }
-        }
-    }
-
-    return null;
-}
-
+// _parser.js
+const path = require('path');
+const fs = require('fs');
+
+function checkIfPackageIsLinked(basePath, packageName) {
+    try {
+        // Check package.json first
+        const packageJsonPath = path.join(basePath, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            
+            // Check if it's in dependencies or devDependencies
+            const version = packageJson.dependencies?.[packageName] || packageJson.devDependencies?.[packageName];
+            
+            // If version starts with 'file:' or 'link:', it's linked
+            if (version && (version.startsWith('file:') || version.startsWith('link:'))) {
+                return {
+                    isLinked: true,
+                    source: 'package.json',
+                    linkPath: version.replace(/^(file:|link:)/, '')
+                };
+            }
+        }
+
+        // Check yarn.lock
+        const yarnLockPath = path.join(basePath, 'yarn.lock');
+        if (fs.existsSync(yarnLockPath)) {
+            const yarnLockContent = fs.readFileSync(yarnLockPath, 'utf8');
+            const packageEntry = yarnLockContent.split('\n\n').find(entry => 
+                entry.includes(`"${packageName}@`)
+            );
+            
+            if (packageEntry && packageEntry.includes('link:')) {
+                const linkMatch = packageEntry.match(/link: (.+)/);
+                return {
+                    isLinked: true,
+                    source: 'yarn.lock',
+                    linkPath: linkMatch ? linkMatch[1] : null
+                };
+            }
+        }
+
+        // Check package-lock.json
+        const packageLockPath = path.join(basePath, 'package-lock.json');
+        if (fs.existsSync(packageLockPath)) {
+            const packageLock = JSON.parse(fs.readFileSync(packageLockPath, 'utf8'));
+            const packageInfo = packageLock.dependencies?.[packageName] || 
+                              packageLock.devDependencies?.[packageName];
+            
+            if (packageInfo && packageInfo.link) {
+                return {
+                    isLinked: true,
+                    source: 'package-lock.json',
+                    linkPath: packageInfo.link
+                };
+            }
+        }
+
+        return {
+            isLinked: false,
+            source: null,
+            linkPath: null
+        };
+    } catch (e) {
+        console.error('Error checking package link status:', e);
+        return {
+            isLinked: false,
+            source: null,
+            linkPath: null,
+            error: e.message
+        };
+    }
+}
+
+function parseWebpackPath(stack) {
+    const currentFileLine = stack.split('\n').find(line => line.includes('_loaders.js'));
+    if (!currentFileLine) return null;
+
+    const match = currentFileLine.match(/\((.+?):\d+:\d+\)/);
+    if (!match) return null;
+
+    const originalPath = match[1];
+    
+    if (originalPath.includes('webpack:')) {
+        const [fsPath, webpackPath] = originalPath.split('webpack:');
+        const basePath = fsPath.replace('/build/', '/');
+        
+        // Check if @rws-framework/client is linked
+        const linkInfo = checkIfPackageIsLinked(basePath, '@rws-framework/client');
+
+        // Check both possible locations
+        const possiblePaths = [
+            // Check in @dev/client
+            path.join(basePath, '../@dev/client', webpackPath),
+            // Check in node_modules
+            path.join(basePath, 'node_modules/@rws-framework/client', webpackPath.replace('/client/', '/'))
+        ];
+
+        for (const possiblePath of possiblePaths) {
+            if (fs.existsSync(possiblePath)) {
+                return {
+                    original: originalPath,
+                    fsPath: basePath,
+                    webpackPath,
+                    exists: true,
+                    realPath: fs.realpathSync(possiblePath),
+                    resolvedPath: possiblePath,
+                    location: possiblePath.includes('node_modules') ? 'node_modules' : '@dev',
+                    linkInfo // Include the link information
+                };
+            }
+        }
+    }
+
+    return null;
+}
+
 module.exports = { parseWebpackPath, checkIfPackageIsLinked };

package/cfg/build_steps/webpack/_webpack_config.js

@@ -54,7 +54,7 @@ async function createWebpackConfig({
                 path: false
             }
         },
-        devServer: hotReload ? getRWSHotReloadSetup(hotReloadPort, outputDir) : null,
+        devServer: hotReload ? getRWSHotReloadSetup(hotReloadPort, outputDir) : false,
         module: {
             rules: getRWSLoaders(_packageDir, executionDir, tsConfig, appRootDir, entrypoint),
         },