@webiny/app 5.41.0-dbt.0 → 5.41.0

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.
Files changed (3) hide show
  1. package/package.json +10 -10
  2. package/utils/getTenantId.js +8 -0
  3. package/utils/getTenantId.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/app",
3
- "version": "5.41.0-dbt.0",
3
+ "version": "5.41.0",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
@@ -18,12 +18,12 @@
18
18
  "@babel/runtime": "7.24.1",
19
19
  "@emotion/styled": "11.10.6",
20
20
  "@types/react": "18.2.79",
21
- "@webiny/i18n": "5.41.0-dbt.0",
22
- "@webiny/i18n-react": "5.41.0-dbt.0",
23
- "@webiny/plugins": "5.41.0-dbt.0",
24
- "@webiny/react-composition": "5.41.0-dbt.0",
25
- "@webiny/react-router": "5.41.0-dbt.0",
26
- "@webiny/ui": "5.41.0-dbt.0",
21
+ "@webiny/i18n": "5.41.0",
22
+ "@webiny/i18n-react": "5.41.0",
23
+ "@webiny/plugins": "5.41.0",
24
+ "@webiny/react-composition": "5.41.0",
25
+ "@webiny/react-router": "5.41.0",
26
+ "@webiny/ui": "5.41.0",
27
27
  "apollo-cache": "1.3.5",
28
28
  "apollo-cache-inmemory": "1.6.6",
29
29
  "apollo-client": "2.6.10",
@@ -53,8 +53,8 @@
53
53
  "@babel/preset-typescript": "7.24.1",
54
54
  "@types/lodash": "4.14.195",
55
55
  "@types/warning": "3.0.0",
56
- "@webiny/cli": "5.41.0-dbt.0",
57
- "@webiny/project-utils": "5.41.0-dbt.0",
56
+ "@webiny/cli": "5.41.0",
57
+ "@webiny/project-utils": "5.41.0",
58
58
  "rimraf": "5.0.5",
59
59
  "typescript": "4.9.5"
60
60
  },
@@ -73,5 +73,5 @@
73
73
  ]
74
74
  }
75
75
  },
76
- "gitHead": "bbaec4dd1685579548c08bbde386aee5d96b80f8"
76
+ "gitHead": "a542f4d0806744c5e2333b3786478c4af3b6b750"
77
77
  }
package/utils/getTenantId.js CHANGED
@@ -21,6 +21,14 @@ var getTenantId = exports.getTenantId = function getTenantId() {
21
21
  // 3. Get tenant via `window.localStorage.webiny_tenant`. Used within the Admin app.
22
22
  tenant = window.localStorage.webiny_tenant;
23
23
  if (tenant) {
24
+ try {
25
+ var value = JSON.parse(tenant);
26
+ if (value) {
27
+ return value;
28
+ }
29
+ } catch (_unused) {
30
+ // do nothing
31
+ }
24
32
  return tenant;
25
33
  }
26
34
 
package/utils/getTenantId.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_isLocalhost","require","getTenantId","exports","tenant","URLSearchParams","location","search","get","window","__PS_RENDER_TENANT__","localStorage","webiny_tenant","isLocalhost","process","env","WEBINY_WEBSITE_TENANT_ID","WEBINY_ADMIN_TENANT_ID"],"sources":["getTenantId.ts"],"sourcesContent":["import { isLocalhost } from \"~/utils/isLocalhost\";\n\ndeclare global {\n interface Window {\n __PS_RENDER_TENANT__: string;\n }\n}\n\nexport const getTenantId = (): string | null => {\n // 1. Get tenant via the `__tenant` query param. Useful when doing page previews.\n let tenant = new URLSearchParams(location.search).get(\"__tenant\");\n if (tenant) {\n return tenant;\n }\n\n // 2. Get tenant via `window.__PS_RENDER_TENANT__`. Used with prerendered pages.\n tenant = window.__PS_RENDER_TENANT__;\n if (tenant) {\n return tenant;\n }\n\n // 3. Get tenant via `window.localStorage.webiny_tenant`. Used within the Admin app.\n tenant = window.localStorage.webiny_tenant;\n if (tenant) {\n return tenant;\n }\n\n // 4. Finally, for development purposes, we take the `WEBINY_WEBSITE_TENANT_ID`\n // and `WEBINY_ADMIN_TENANT_ID` environment variables into consideration.\n if (isLocalhost()) {\n return process.env.WEBINY_WEBSITE_TENANT_ID || process.env.WEBINY_ADMIN_TENANT_ID || null;\n }\n\n return null;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAQO,IAAMC,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,SAAdA,WAAWA,CAAA,EAAwB;EAC5C;EACA,IAAIE,MAAM,GAAG,IAAIC,eAAe,CAACC,QAAQ,CAACC,MAAM,CAAC,CAACC,GAAG,CAAC,UAAU,CAAC;EACjE,IAAIJ,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGK,MAAM,CAACC,oBAAoB;EACpC,IAAIN,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGK,MAAM,CAACE,YAAY,CAACC,aAAa;EAC1C,IAAIR,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACA;EACA,IAAI,IAAAS,wBAAW,EAAC,CAAC,EAAE;IACf,OAAOC,OAAO,CAACC,GAAG,CAACC,wBAAwB,IAAIF,OAAO,CAACC,GAAG,CAACE,sBAAsB,IAAI,IAAI;EAC7F;EAEA,OAAO,IAAI;AACf,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_isLocalhost","require","getTenantId","exports","tenant","URLSearchParams","location","search","get","window","__PS_RENDER_TENANT__","localStorage","webiny_tenant","value","JSON","parse","_unused","isLocalhost","process","env","WEBINY_WEBSITE_TENANT_ID","WEBINY_ADMIN_TENANT_ID"],"sources":["getTenantId.ts"],"sourcesContent":["import { isLocalhost } from \"~/utils/isLocalhost\";\n\ndeclare global {\n interface Window {\n __PS_RENDER_TENANT__: string;\n }\n}\n\nexport const getTenantId = (): string | null => {\n // 1. Get tenant via the `__tenant` query param. Useful when doing page previews.\n let tenant = new URLSearchParams(location.search).get(\"__tenant\");\n if (tenant) {\n return tenant;\n }\n\n // 2. Get tenant via `window.__PS_RENDER_TENANT__`. Used with prerendered pages.\n tenant = window.__PS_RENDER_TENANT__;\n if (tenant) {\n return tenant;\n }\n\n // 3. Get tenant via `window.localStorage.webiny_tenant`. Used within the Admin app.\n tenant = window.localStorage.webiny_tenant;\n if (tenant) {\n try {\n const value = JSON.parse(tenant);\n if (value) {\n return value;\n }\n } catch {\n // do nothing\n }\n return tenant;\n }\n\n // 4. Finally, for development purposes, we take the `WEBINY_WEBSITE_TENANT_ID`\n // and `WEBINY_ADMIN_TENANT_ID` environment variables into consideration.\n if (isLocalhost()) {\n return process.env.WEBINY_WEBSITE_TENANT_ID || process.env.WEBINY_ADMIN_TENANT_ID || null;\n }\n\n return null;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAQO,IAAMC,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,SAAdA,WAAWA,CAAA,EAAwB;EAC5C;EACA,IAAIE,MAAM,GAAG,IAAIC,eAAe,CAACC,QAAQ,CAACC,MAAM,CAAC,CAACC,GAAG,CAAC,UAAU,CAAC;EACjE,IAAIJ,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGK,MAAM,CAACC,oBAAoB;EACpC,IAAIN,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGK,MAAM,CAACE,YAAY,CAACC,aAAa;EAC1C,IAAIR,MAAM,EAAE;IACR,IAAI;MACA,IAAMS,KAAK,GAAGC,IAAI,CAACC,KAAK,CAACX,MAAM,CAAC;MAChC,IAAIS,KAAK,EAAE;QACP,OAAOA,KAAK;MAChB;IACJ,CAAC,CAAC,OAAAG,OAAA,EAAM;MACJ;IAAA;IAEJ,OAAOZ,MAAM;EACjB;;EAEA;EACA;EACA,IAAI,IAAAa,wBAAW,EAAC,CAAC,EAAE;IACf,OAAOC,OAAO,CAACC,GAAG,CAACC,wBAAwB,IAAIF,OAAO,CAACC,GAAG,CAACE,sBAAsB,IAAI,IAAI;EAC7F;EAEA,OAAO,IAAI;AACf,CAAC","ignoreList":[]}