@rws-framework/client 2.9.19 → 2.9.22

package/package.json

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

package/rws.webpack.config.js

@@ -70,11 +70,19 @@ const RWSWebpackWrapper = async (config) => {
 
   //AFTER OPTION DEFINITIONS
 
+  let _rws_defines = {
+    'process.env._RWS_DEFAULTS': JSON.stringify(BuildConfigurator.exportDefaultConfig()),
+    'process.env._RWS_BUILD_OVERRIDE': JSON.stringify(BuildConfigurator.exportBuildConfig())
+  }
+
+  const rwsDefines = BuildConfigurator.get('rwsDefines') || config.rwsDefines || null;
+
+  if(rwsDefines){
+    _rws_defines = {..._rws_defines, ...rwsDefines}
+  }
+
   let WEBPACK_PLUGINS = [
-    new webpack.DefinePlugin({
-      'process.env._RWS_DEFAULTS': JSON.stringify(BuildConfigurator.exportDefaultConfig()),
-      'process.env._RWS_BUILD_OVERRIDE': JSON.stringify(BuildConfigurator.exportBuildConfig())
-    }),
+    new webpack.DefinePlugin(_rws_defines),
     new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en-gb/),
     new webpack.IgnorePlugin({
       resourceRegExp: /.*\.es6\.js$/,

package/src/client/config.ts

@@ -122,17 +122,20 @@ async function setup(this: RWSClientInstance, config: IRWSConfig = {}): Promise<
 
 async function start(this: RWSClientInstance, config: IRWSConfig = {}): Promise<RWSClientInstance> {
     this.config = { ...this.config, ...config };
-
+    
     if (!this.isSetup) {
         this.config = await this.setup(this.config);
     }
 
     if (Object.keys(config).length) {
         this.appConfig.mergeConfig(this.config);
-    }        
+    }            
 
-    if(!this.user && config?.user){
-        this.setUser(config.user);
+    const setThisUser = config?.user || this.getUser();
+
+    if(setThisUser){
+        this.config.user = setThisUser;
+        this.setUser(setThisUser);
     }
 
     if (this.config.user && !this.config.dontPushToSW) {
@@ -141,7 +144,7 @@ async function start(this: RWSClientInstance, config: IRWSConfig = {}): Promise<
 
     await this.initCallback();        
 
-    for (const plugin of RWSPlugin.getAllPlugins()){        
+    for (const plugin of RWSPlugin.getAllPlugins()){                
         await plugin.onClientStart();
     }
 

package/src/types/IRWSConfig.ts

@@ -6,6 +6,7 @@ export type IFrontRoutes = Record<string, unknown>;
 export type RWSPluginEntry<T extends DefaultRWSPluginOptionsType = DefaultRWSPluginOptionsType> = new (...args: any[]) => RWSPlugin<T>;
 
 export default interface IRWSConfig {
+    [key: string]: any
     dev?: boolean
     defaultLayout?: typeof RWSViewComponent
     backendUrl?: string
@@ -20,7 +21,8 @@ export default interface IRWSConfig {
     pubUrlFilePrefix?: string
     partedDirUrlPrefix?: string
     dontPushToSW?: boolean
-    parted?: boolean
+    parted?: boolean,
+    rwsDefines?: {[key: string]: any}
     partedFileDir?: string
     partedPrefix?: string
     plugins?: IStaticRWSPlugin[]