@rws-framework/client 2.13.1 → 2.13.2

package/cfg/build_steps/vite/_loaders.ts

@@ -24,9 +24,11 @@ interface ViewDecoratorData {
     decoratorArgs: any;
 }
 
-export function getRWSVitePlugins({ packageDir, nodeModulesPath, tsConfigPath, cssOutputPath, dev }: RWSLoaderOptions): PluginOption[] {
+export function getRWSVitePlugins({ tsConfigPath, cssOutputPath, dev }: RWSLoaderOptions): PluginOption[] {
     return [
-         tsLoader({dev, scssPlugin: scssPlugin}),  scssLoader({dev, scssPlugin: scssPlugin, cssOutputPath}), htmlLoader({dev})
+        scssLoader({dev, scssPlugin: scssPlugin, cssOutputPath}), 
+        tsLoader({dev, scssPlugin: scssPlugin, tsConfigPath}),  
+        htmlLoader({dev})
     ];
 }
 

package/cfg/build_steps/vite/loaders/loader.type.ts

@@ -7,7 +7,7 @@ export interface LoaderParams {
 
 export interface TSLoaderParams extends LoaderParams {
     scssPlugin: RWSScssPlugin
-
+    tsConfigPath: string
 }
 
 export interface SCSSLoaderParams extends LoaderParams {

package/cfg/build_steps/vite/loaders/ts.ts

@@ -165,7 +165,7 @@ class LoadersHelper {
           const codeData = await plugin.compileScssCode(scsscontent, path.dirname(filePath) + '/styles');      
           const cssCode = codeData.code;          
       
-          styles = isDev ? `import './${stylesPath}';\n` : '';
+          styles = isDev ? `` : '';
       
           if (!templateExists) {
             styles += `import { css } from '@microsoft/fast-element';\n`;
@@ -189,7 +189,7 @@ class LoadersHelper {
       
         if (templateExists) {
           const templateContent = fs.readFileSync(templatePath, 'utf-8').replace(/<!--[\s\S]*?-->/g, '');
-          htmlFastImports = `import * as T from '@microsoft/fast-element';\nimport './${templateName}.html';\n`;
+          htmlFastImports = `import * as T from '@microsoft/fast-element';\n`;
           template = `                
       //@ts-ignore                
       let rwsTemplate: any = T.html\`${templateContent}\`;
@@ -256,7 +256,6 @@ const loader: IRWSViteLoader<TSLoaderParams> = async (params: TSLoaderParams) =>
                 if(!stylesPath && fs.existsSync(defaultStylesPath)){
                     stylesPath ='styles/layout.scss';
                 }
-                console.log({stylesPath, templateName, tagName})
 
                 if (tagName && templateName && stylesPath) {
                     const [template, htmlFastImports, templateExists] = await LoadersHelper.getTemplate(
@@ -275,8 +274,6 @@ const loader: IRWSViteLoader<TSLoaderParams> = async (params: TSLoaderParams) =>
                         isDev
                     );
 
-                    console.log({styles})
-
                     if (className && decoratorExtract?.replacedDecorator) {
                         processedContent = `${template}\n${styles}\n${decoratorExtract.replacedDecorator}`;
                     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.13.1",
+    "version": "2.13.2",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"