@webiny/app 5.42.0 → 5.42.1-beta.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.
- package/package.json +10 -10
- package/utils/getTenantId.js +9 -1
- 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.42.0",
|
|
3
|
+
"version": "5.42.1-beta.0",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"@apollo/react-hooks": "3.1.5",
|
|
18
18
|
"@emotion/styled": "11.10.6",
|
|
19
19
|
"@types/react": "18.2.79",
|
|
20
|
-
"@webiny/i18n": "5.42.0",
|
|
21
|
-
"@webiny/i18n-react": "5.42.0",
|
|
22
|
-
"@webiny/plugins": "5.42.0",
|
|
23
|
-
"@webiny/react-composition": "5.42.0",
|
|
24
|
-
"@webiny/react-router": "5.42.0",
|
|
25
|
-
"@webiny/ui": "5.42.0",
|
|
20
|
+
"@webiny/i18n": "5.42.1-beta.0",
|
|
21
|
+
"@webiny/i18n-react": "5.42.1-beta.0",
|
|
22
|
+
"@webiny/plugins": "5.42.1-beta.0",
|
|
23
|
+
"@webiny/react-composition": "5.42.1-beta.0",
|
|
24
|
+
"@webiny/react-router": "5.42.1-beta.0",
|
|
25
|
+
"@webiny/ui": "5.42.1-beta.0",
|
|
26
26
|
"apollo-cache": "1.3.5",
|
|
27
27
|
"apollo-cache-inmemory": "1.6.6",
|
|
28
28
|
"apollo-client": "2.6.10",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/lodash": "4.17.13",
|
|
48
48
|
"@types/warning": "3.0.0",
|
|
49
|
-
"@webiny/cli": "5.42.0",
|
|
50
|
-
"@webiny/project-utils": "5.42.0",
|
|
49
|
+
"@webiny/cli": "5.42.1-beta.0",
|
|
50
|
+
"@webiny/project-utils": "5.42.1-beta.0",
|
|
51
51
|
"rimraf": "6.0.1",
|
|
52
52
|
"typescript": "4.9.5"
|
|
53
53
|
},
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
]
|
|
67
67
|
}
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "16fb9009f44f242bbc8ba0e02c1d49b1f7ab935b"
|
|
70
70
|
}
|
package/utils/getTenantId.js
CHANGED
|
@@ -6,8 +6,16 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.getTenantId = void 0;
|
|
7
7
|
var _isLocalhost = require("./isLocalhost");
|
|
8
8
|
var getTenantId = exports.getTenantId = function getTenantId() {
|
|
9
|
+
var urlSearchParams = new URLSearchParams(location.search);
|
|
10
|
+
|
|
9
11
|
// 1. Get tenant via the `__tenant` query param. Useful when doing page previews.
|
|
10
|
-
var tenant =
|
|
12
|
+
var tenant = urlSearchParams.get("__tenant");
|
|
13
|
+
if (tenant) {
|
|
14
|
+
return tenant;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
// 1. Get tenant via the `tenantId` query param. Useful within the Admin app.
|
|
18
|
+
tenant = urlSearchParams.get("tenantId");
|
|
11
19
|
if (tenant) {
|
|
12
20
|
return tenant;
|
|
13
21
|
}
|
package/utils/getTenantId.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_isLocalhost","require","getTenantId","exports","
|
|
1
|
+
{"version":3,"names":["_isLocalhost","require","getTenantId","exports","urlSearchParams","URLSearchParams","location","search","tenant","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 const urlSearchParams = new URLSearchParams(location.search);\n\n // 1. Get tenant via the `__tenant` query param. Useful when doing page previews.\n let tenant = urlSearchParams.get(\"__tenant\");\n if (tenant) {\n return tenant;\n }\n\n // 1. Get tenant via the `tenantId` query param. Useful within the Admin app.\n tenant = urlSearchParams.get(\"tenantId\");\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,IAAME,eAAe,GAAG,IAAIC,eAAe,CAACC,QAAQ,CAACC,MAAM,CAAC;;EAE5D;EACA,IAAIC,MAAM,GAAGJ,eAAe,CAACK,GAAG,CAAC,UAAU,CAAC;EAC5C,IAAID,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGJ,eAAe,CAACK,GAAG,CAAC,UAAU,CAAC;EACxC,IAAID,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGE,MAAM,CAACC,oBAAoB;EACpC,IAAIH,MAAM,EAAE;IACR,OAAOA,MAAM;EACjB;;EAEA;EACAA,MAAM,GAAGE,MAAM,CAACE,YAAY,CAACC,aAAa;EAC1C,IAAIL,MAAM,EAAE;IACR,IAAI;MACA,IAAMM,KAAK,GAAGC,IAAI,CAACC,KAAK,CAACR,MAAM,CAAC;MAChC,IAAIM,KAAK,EAAE;QACP,OAAOA,KAAK;MAChB;IACJ,CAAC,CAAC,OAAAG,OAAA,EAAM;MACJ;IAAA;IAEJ,OAAOT,MAAM;EACjB;;EAEA;EACA;EACA,IAAI,IAAAU,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":[]}
|