@admin-layout/client 3.0.0-alpha.75 → 3.0.0-alpha.76

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,6 @@
1
1
  import * as envalid from 'envalid';
2
2
  import { DefaultSettings } from '../interfaces';
3
- export declare const config: Readonly<{
3
+ declare let config: Readonly<{
4
4
  LAYOUT_SETTINGS: DefaultSettings;
5
5
  } & envalid.CleanedEnvAccessors>;
6
+ export { config };
@@ -2,13 +2,18 @@ import * as envalid from 'envalid';
2
2
  import { defaultSettings } from './defaultSettings';
3
3
  const { json } = envalid;
4
4
  const env = process.APP_ENV || process.env;
5
- // overwrite the layout settings with environment
6
- if (env.LAYOUT_SETTINGS) {
7
- env.LAYOUT_SETTINGS = JSON.stringify(Object.assign(Object.assign({}, defaultSettings), JSON.parse(env.LAYOUT_SETTINGS)));
8
- }
9
- export const config = envalid.cleanEnv(env, {
5
+ const preConfig = envalid.cleanEnv(env, {
10
6
  LAYOUT_SETTINGS: json({
11
7
  default: JSON.stringify(defaultSettings),
12
8
  }),
13
9
  });
10
+ let config = {};
11
+ // overwrite the layout settings with environment
12
+ if (env.LAYOUT_SETTINGS) {
13
+ config = Object.assign(Object.assign({}, preConfig), { LAYOUT_SETTINGS: Object.assign(Object.assign({}, defaultSettings), preConfig.LAYOUT_SETTINGS) });
14
+ }
15
+ else {
16
+ config = preConfig;
17
+ }
18
+ export { config };
14
19
  //# sourceMappingURL=env-config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"env-config.js","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;AACzB,MAAM,GAAG,GAAI,OAAe,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;AAEpD,kDAAkD;AAClD,IAAI,GAAG,CAAC,eAAe,EAAE;IACrB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,iCAAM,eAAe,GAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,EAAI,CAAC;CACrG;AACD,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EACtC;IACI,eAAe,EAAE,IAAI,CAAkB;QACnC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAQ;KAClD,CAAC;CACL,CACJ,CAAC"}
1
+ {"version":3,"file":"env-config.js","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;AACzB,MAAM,GAAG,GAAI,OAAe,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC;AAEpD,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAClC;IACI,eAAe,EAAE,IAAI,CAAkB;QACnC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAQ;KAClD,CAAC;CACL,CACJ,CAAC;AACF,IAAI,MAAM,GAAG,EAAsB,CAAC;AACpC,kDAAkD;AAClD,IAAI,GAAG,CAAC,eAAe,EAAE;IACrB,MAAM,mCAAQ,SAAS,KAAE,eAAe,kCAAO,eAAe,GAAK,SAAS,CAAC,eAAe,IAAI,CAAC;CACpG;KAAM;IACH,MAAM,GAAG,SAAS,CAAC;CACtB;AAED,OAAO,EAAE,MAAM,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@admin-layout/client",
3
- "version": "3.0.0-alpha.75",
3
+ "version": "3.0.0-alpha.76",
4
4
  "description": "Sample client for higher packages to depend on",
5
5
  "license": "ISC",
6
6
  "author": "CDMBase LLC",
@@ -34,5 +34,5 @@
34
34
  "typescript": {
35
35
  "definition": "lib/index.d.ts"
36
36
  },
37
- "gitHead": "eecd3ded9fbd8b19eea2550d230ef5fc0323a9b4"
37
+ "gitHead": "f9b16b8ae967ca8bd1b2201c1ab1455277ed8d35"
38
38
  }