@rws-framework/client 2.9.20 → 2.9.23

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.9.20",
+    "version": "2.9.23",
     "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/services/ConfigService.ts

@@ -29,9 +29,9 @@ class ConfigService extends TheService {
         }        
 
         
-        const isInDefaults: boolean = Object.keys(this._DEFAULTS).includes(key);
-        const isInData: boolean = Object.keys(this.data).includes(key);
-        const isInBuildVars: boolean = Object.keys(this._BUILD_OVERRIDE).includes(key);
+        const isInDefaults: boolean = Object.keys(this._DEFAULTS).includes(key as string);
+        const isInData: boolean = Object.keys(this.data).includes(key as string);
+        const isInBuildVars: boolean = Object.keys(this._BUILD_OVERRIDE).includes(key as string);
 
         let isDev = false;
 
@@ -50,7 +50,7 @@ class ConfigService extends TheService {
                 defaultVal = this.data[((defaultVal as string).slice(1)) as keyof IRWSConfig];
             }
 
-            if(isInBuildVars && Object.keys(this._BUILD_OVERRIDE).includes(key)){
+            if(isInBuildVars && Object.keys(this._BUILD_OVERRIDE).includes(key as string)){
                 if(isDev){
                     console.warn(`.rws.json override [${key}]:`), this._BUILD_OVERRIDE[key];
                 }

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[]