@rws-framework/client 2.2.1 → 2.2.2

package/_rws_build_configurator.js

@@ -0,0 +1,51 @@
+const fs = require('fs');
+const json5 = require('json5');
+
+
+const _STORAGE = { _loaded: false }
+
+const _DEFAULT_CONFIG = {
+    dev: false,
+    hot: false,
+    report: false,
+    backendUrl: null,
+    wsUrl: null,
+    transports: ['websocket'],    
+    parted: true,
+    partedFileDir: './build',
+    partedPrefix: 'rws',
+    publicDir: './public',
+    publicIndex: 'index.html',
+    pubUrlPrefix: '/',    
+    outputFileName: 'client.rws.js'
+}
+
+function readConfigFile(filePath){
+    const fileConfig = json5.parse(fs.readFileSync(filePath, 'utf-8'));
+
+    return {
+        ..._DEFAULT_CONFIG,
+        ...fileConfig
+    }
+}
+
+function get(key){
+    if(!_STORAGE._loaded){
+        Object.assign(_STORAGE, readConfigFile(process.cwd() + '/.rws.json'));
+
+        console.log(_STORAGE);
+    }
+
+    if(Object.keys(_STORAGE).includes(key)){
+        return _STORAGE[key];
+    }
+
+    return null;
+}
+
+
+module.exports = {
+    readConfigFile,
+    get,
+    _DEFAULT_CONFIG
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/client",
   "private": false,
-  "version": "2.2.1",
+  "version": "2.2.2",
   "main": "src/index.ts",
   "scripts": {
     "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -59,6 +59,7 @@
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
+    "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "dts-bundle": "^0.7.3",

package/rws.webpack.config.js

@@ -11,6 +11,7 @@ const { Console } = require('console');
 const { Interface } = require('readline');
 const ts = require('typescript');
 const tools = require('./_tools');
+const BuildConfigurator = require('./_rws_build_configurator');
 const TerserPlugin = require('terser-webpack-plugin');
 const HtmlMinifier = require('html-minifier').minify;
 const { CleanWebpackPlugin } = require("clean-webpack-plugin");
@@ -46,16 +47,18 @@ let WEBPACK_PLUGINS = [];
 const RWSWebpackWrapper = (config) => {
   const executionDir = config.executionDir || process.cwd();
 
-  const isDev = config.dev;
-  const isHotReload = config.hot;
-  const isReport = config.report;
+  const isDev = config.dev || BuildConfigurator.get('dev');
+  const isHotReload = config.hot || BuildConfigurator.get('hot');
+  const isReport = config.report || BuildConfigurator.get('report');
+  const outputDir = config.outputDir || BuildConfigurator.get('outputDir');
+  const outputFileName = config.outputFileName || BuildConfigurator.get('outputFileName');
 
-  const publicDir = config.publicDir || null;
-  const serviceWorkerPath = config.serviceWorker || null;
+  const publicDir = config.publicDir  || BuildConfigurator.get('publicDir');
+  const serviceWorkerPath = config.serviceWorker  || BuildConfigurator.get('serviceWorker');
 
   const WEBPACK_AFTER_ACTIONS = config.actions || [];
 
-  const publicIndex = config.publicIndex || 'index.html';
+  const publicIndex = config.publicIndex || BuildConfigurator.get('publicIndex');
 
   const aliases = config.aliases = {};
 

package/src/components/_component.ts

@@ -81,7 +81,7 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
                 if (this.fileAssets[file]) {
                     return;
                 }
-                this.utilsService.getFileContents(this.config.get('pubPrefix') + file).then((response: string) => {
+                this.utilsService.getFileContents(this.config.get('pubUrlPrefix') + file).then((response: string) => {
                     this.fileAssets = { ...this.fileAssets, [file]: html`${response}` };
                 });
             });

package/src/components/_decorators/RWSFillBuildConfig.ts

@@ -0,0 +1,14 @@
+import { Key } from '@microsoft/fast-foundation';
+
+import 'reflect-metadata';
+import IRWSConfig from '../../interfaces/IRWSConfig';
+
+type FillBuildDecoratorReturnType = (target: any, key?: string | number | undefined, parameterIndex?: number) => void;
+
+function RWSFillBuildConfig(dependencyClass: Key): FillBuildDecoratorReturnType {
+    return (target: IRWSConfig, key?: string | number, parameterIndex?: number) => {
+        console.log('ONBUILD', target, key, parameterIndex);
+    };
+}
+
+export { RWSFillBuildConfig }

package/src/interfaces/IRWSConfig.ts

@@ -12,11 +12,11 @@ export default interface IRWSConfig {
     user?: any
     ignoreRWSComponents?: boolean
     pubUrl?: string
-    pubPrefix?: string
+    pubUrlPrefix?: string
     dontPushToSW?: boolean
     parted?: boolean
-    splitFileDir?: string
-    splitPrefix?: string
+    partedFileDir?: string
+    partedPrefix?: string
     routing_enabled?: boolean
     _noLoad?: boolean    
 }

package/src/services/ConfigService.ts

@@ -1,12 +1,13 @@
 import TheService from './_service';
 import IRWSConfig from '../interfaces/IRWSConfig';
+import { RWSFillBuildConfig } from '../components/_decorators/RWSFillBuildConfig';
 
-
-const _DEFAULTS: {[property: string]: any} = {
-    pubPrefix: '/',
+@RWSFillBuildConfig()
+const _DEFAULTS: IRWSConfig = {
+    pubUrlPrefix: '/',
     pubUrl : window.origin,
-    splitFileDir: '/',
-    splitPrefix: 'rws'
+    partedFileDir: '/',
+    partedPrefix: 'rws'
 }
 
 const __SENT_TO_COMPONENTS: string[] = [];