@blaze-cms/nextjs-tools 0.118.0-alpha.3 → 0.119.0-alpha.2
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/CHANGELOG.md +39 -0
- package/README.md +1 -0
- package/build/next.base.config.js +1 -1
- package/example.env +1 -1
- package/lib/application/query/index.js +5 -5
- package/lib/application/query/index.js.map +1 -1
- package/lib/blaze.config.js +2 -1
- package/lib/blaze.config.js.map +1 -1
- package/lib/helpers/check-url.js +13 -12
- package/lib/helpers/check-url.js.map +1 -1
- package/lib/helpers/static-route-handlers/robots-txt.js +2 -2
- package/lib/helpers/static-route-handlers/robots-txt.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap-file.js +2 -2
- package/lib/helpers/static-route-handlers/sitemap-file.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap.js +2 -2
- package/lib/helpers/static-route-handlers/sitemap.js.map +1 -1
- package/lib/hoc/withBlaze.js +37 -30
- package/lib/hoc/withBlaze.js.map +1 -1
- package/lib/hooks/use-get-page.js +2 -2
- package/lib/hooks/use-get-page.js.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib-es/application/query/index.js +5 -1
- package/lib-es/application/query/index.js.map +1 -1
- package/lib-es/blaze.config.js +2 -1
- package/lib-es/blaze.config.js.map +1 -1
- package/lib-es/helpers/check-url.js +1 -0
- package/lib-es/helpers/check-url.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/robots-txt.js +1 -1
- package/lib-es/helpers/static-route-handlers/robots-txt.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/sitemap-file.js +1 -1
- package/lib-es/helpers/static-route-handlers/sitemap-file.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/sitemap.js +1 -1
- package/lib-es/helpers/static-route-handlers/sitemap.js.map +1 -1
- package/lib-es/hoc/withBlaze.js +36 -30
- package/lib-es/hoc/withBlaze.js.map +1 -1
- package/lib-es/hooks/use-get-page.js +1 -1
- package/lib-es/hooks/use-get-page.js.map +1 -1
- package/lib-es/index.js +1 -1
- package/lib-es/index.js.map +1 -1
- package/package.json +18 -18
- package/src/application/query/index.js +5 -1
- package/src/blaze.config.js +2 -1
- package/src/helpers/check-url.js +1 -0
- package/src/helpers/static-route-handlers/robots-txt.js +1 -1
- package/src/helpers/static-route-handlers/sitemap-file.js +1 -1
- package/src/helpers/static-route-handlers/sitemap.js +1 -1
- package/src/hoc/withBlaze.js +34 -30
- package/src/hooks/use-get-page.js +1 -1
- package/src/index.js +1 -1
- package/tests/unit/src/components/DebugSidebar/DebugSidebar.test.js +1 -1
- package/tests/unit/src/containers/ContentContainer.test.js +1 -1
- package/tests/unit/src/helpers/check-url.test.js +20 -1
- package/tests/unit/src/helpers/static-route-handlers/generic-file-handler.test.js +1 -1
- package/tests/unit/src/hoc/withBlaze.test.js +19 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,45 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.119.0-alpha.2](https://github.com/thebyte9/blaze/compare/v0.119.0-alpha.1...v0.119.0-alpha.2) (2022-01-28)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @blaze-cms/nextjs-tools
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [0.119.0-alpha.1](https://github.com/thebyte9/blaze/compare/v0.119.0-alpha.0...v0.119.0-alpha.1) (2022-01-27)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* add Cache-Control header env ([#3318](https://github.com/thebyte9/blaze/issues/3318)) ([f0d3d0c](https://github.com/thebyte9/blaze/commit/f0d3d0c37140f2d5f08e2f027a6e3cf997c2f2e9))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# [0.119.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.118.1-alpha.0...v0.119.0-alpha.0) (2022-01-26)
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Features
|
|
29
|
+
|
|
30
|
+
* update apollo client to v3.5 add cache redirects and optimise queries ([#3308](https://github.com/thebyte9/blaze/issues/3308)) ([5281b17](https://github.com/thebyte9/blaze/commit/5281b17fd972f8c727d099f0c814e747896af431))
|
|
31
|
+
* upgrade next to latest version ([#3290](https://github.com/thebyte9/blaze/issues/3290)) ([d2c37bd](https://github.com/thebyte9/blaze/commit/d2c37bd1bf7847dbbbaf7ab8634008c2042f91f9))
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
# [0.118.0](https://github.com/thebyte9/blaze/compare/v0.118.0-alpha.3...v0.118.0) (2022-01-25)
|
|
38
|
+
|
|
39
|
+
**Note:** Version bump only for package @blaze-cms/nextjs-tools
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
6
45
|
# [0.118.0-alpha.3](https://github.com/thebyte9/blaze/compare/v0.118.0-alpha.2...v0.118.0-alpha.3) (2022-01-24)
|
|
7
46
|
|
|
8
47
|
**Note:** Version bump only for package @blaze-cms/nextjs-tools
|
package/README.md
CHANGED
|
@@ -87,6 +87,7 @@ This example will also allow the path to contain **.** characters
|
|
|
87
87
|
|---|---|---|
|
|
88
88
|
| BLAZE_FRONTEND_HOST | Frontend host (used to identify host) | String | |
|
|
89
89
|
| BLAZE_ROUTE_REGEX | Override default route regex | /^\/[a-z0-9€_\/]+(?:[-\/\.]{1,2}[a-z0-9\/€_\/]+)*$|^\/$/ |
|
|
90
|
+
| BLAZE_CACHE_CONTROL_HEADER | Cache-Control header to set on page requests | String | "" |
|
|
90
91
|
| BLAZE_STATIC_ROUTE_STORE_KEY | Override store for static file routes | default |
|
|
91
92
|
| BLAZE_ROUTE_PATTERN_SITEMAP | Override sitemap route | /sitemap.xml |
|
|
92
93
|
| BLAZE_CONTENT_SITEMAP_URL_PREFIX | Prefix for sitemap URL, used in frontend static route e.g. /sitemap/sitemap-0.xml. This needs to match the value set in the API app. | String | |
|
package/example.env
CHANGED
|
@@ -11,12 +11,12 @@ exports.getPageQuery = exports.checkUrlQuery = exports.GET_ENTITY_SCHEMA = void
|
|
|
11
11
|
|
|
12
12
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _client = require("@apollo/client");
|
|
15
15
|
|
|
16
16
|
var _templateObject, _templateObject2, _templateObject3;
|
|
17
17
|
|
|
18
|
-
var pageDataFields = "\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n name\n}\ntags {\n name\n}\nslug\nimage{\n url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename";
|
|
19
|
-
var checkUrlQuery = (0,
|
|
18
|
+
var pageDataFields = "\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n id\n name\n}\ntags {\n id\n name\n}\nslug\nimage{\n id\n data\n url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename";
|
|
19
|
+
var checkUrlQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n query checkUrl($url: String!) {\n checkUrl(url: $url) {\n itemId\n itemEntity\n urlTo\n pageData: record {\n ...on ContentContentInterface {\n ", "\n }\n }\n }\n }\n"])), pageDataFields);
|
|
20
20
|
exports.checkUrlQuery = checkUrlQuery;
|
|
21
21
|
|
|
22
22
|
var getPageQuery = function getPageQuery(_ref) {
|
|
@@ -26,10 +26,10 @@ var getPageQuery = function getPageQuery(_ref) {
|
|
|
26
26
|
getPublished = _ref$actions.getPublished,
|
|
27
27
|
isPreview = _ref.isPreview;
|
|
28
28
|
var getMethod = !isPreview && getPublished ? getPublished : get;
|
|
29
|
-
return (0,
|
|
29
|
+
return (0, _client.gql)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n query pageData($id: String!) {\n pageData: ", "(id: $id) {\n ", "\n url\n }\n }\n "])), getMethod, pageDataFields);
|
|
30
30
|
};
|
|
31
31
|
|
|
32
32
|
exports.getPageQuery = getPageQuery;
|
|
33
|
-
var GET_ENTITY_SCHEMA = (0,
|
|
33
|
+
var GET_ENTITY_SCHEMA = (0, _client.gql)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n query getEntitySchema($id: String!) {\n entitySchema: getEntitySchema(id: $id) {\n id\n identifier\n actions\n }\n }\n"])));
|
|
34
34
|
exports.GET_ENTITY_SCHEMA = GET_ENTITY_SCHEMA;
|
|
35
35
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["pageDataFields","checkUrlQuery","gql","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,cAAc,
|
|
1
|
+
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["pageDataFields","checkUrlQuery","gql","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,cAAc,kNAApB;AAuBA,IAAMC,aAAa,OAAGC,WAAH,wTAQPF,cARO,CAAnB;;;AAeA,IAAMG,YAAY,GAAG,SAAfA,YAAe,OAAwD;AAAA,0BAArDC,OAAqD;AAAA,2CAApB,EAAoB;AAAA,MAA1CC,GAA0C,gBAA1CA,GAA0C;AAAA,MAArCC,YAAqC,gBAArCA,YAAqC;AAAA,MAAhBC,SAAgB,QAAhBA,SAAgB;AAC3E,MAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,aAAOH,WAAP,8MAEgBM,SAFhB,EAGQR,cAHR;AAQD,CAXD;;;AAaA,IAAMS,iBAAiB,OAAGP,WAAH,yOAAvB","sourcesContent":["import { gql } from '@apollo/client';\n\nconst pageDataFields = `\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n id\n name\n}\ntags {\n id\n name\n}\nslug\nimage{\n id\n data\n url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename`;\n\nconst checkUrlQuery = gql`\n query checkUrl($url: String!) {\n checkUrl(url: $url) {\n itemId\n itemEntity\n urlTo\n pageData: record {\n ...on ContentContentInterface {\n ${pageDataFields}\n }\n }\n }\n }\n`;\n\nconst getPageQuery = ({ actions: { get, getPublished } = {}, isPreview }) => {\n const getMethod = !isPreview && getPublished ? getPublished : get;\n\n return gql`\n query pageData($id: String!) {\n pageData: ${getMethod}(id: $id) {\n ${pageDataFields}\n url\n }\n }\n `;\n};\n\nconst GET_ENTITY_SCHEMA = gql`\n query getEntitySchema($id: String!) {\n entitySchema: getEntitySchema(id: $id) {\n id\n identifier\n actions\n }\n }\n`;\n\nexport { checkUrlQuery, getPageQuery, GET_ENTITY_SCHEMA };\n"],"file":"index.js"}
|
package/lib/blaze.config.js
CHANGED
|
@@ -36,7 +36,8 @@ plugins.set(_pluginGoogleMapsFe["default"], {});
|
|
|
36
36
|
plugins.set(_pluginPreviewFe["default"], {});
|
|
37
37
|
plugins.set(_pluginAuthFe["default"], {});
|
|
38
38
|
var apollo = {
|
|
39
|
-
uri: process.env.BLAZE_GRAPHQL_URI
|
|
39
|
+
uri: process.env.BLAZE_GRAPHQL_URI,
|
|
40
|
+
loadEntitiesInBrowser: false
|
|
40
41
|
};
|
|
41
42
|
var _default = {
|
|
42
43
|
plugins: plugins,
|
package/lib/blaze.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/blaze.config.js"],"names":["plugins","Map","set","pageBuilder","gtm","googleMaps","previewFe","authFe","apollo","uri","process","env","BLAZE_GRAPHQL_URI"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYC,+BAAZ,EAAyB,EAAzB;AACAH,OAAO,CAACE,GAAR,CAAYE,uBAAZ,EAAiB,EAAjB;AACAJ,OAAO,CAACE,GAAR,CAAYG,8BAAZ,EAAwB,EAAxB;AACAL,OAAO,CAACE,GAAR,CAAYI,2BAAZ,EAAuB,EAAvB;AACAN,OAAO,CAACE,GAAR,CAAYK,wBAAZ,EAAoB,EAApB;AAEA,IAAMC,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC;
|
|
1
|
+
{"version":3,"sources":["../src/blaze.config.js"],"names":["plugins","Map","set","pageBuilder","gtm","googleMaps","previewFe","authFe","apollo","uri","process","env","BLAZE_GRAPHQL_URI","loadEntitiesInBrowser"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYC,+BAAZ,EAAyB,EAAzB;AACAH,OAAO,CAACE,GAAR,CAAYE,uBAAZ,EAAiB,EAAjB;AACAJ,OAAO,CAACE,GAAR,CAAYG,8BAAZ,EAAwB,EAAxB;AACAL,OAAO,CAACE,GAAR,CAAYI,2BAAZ,EAAuB,EAAvB;AACAN,OAAO,CAACE,GAAR,CAAYK,wBAAZ,EAAoB,EAApB;AAEA,IAAMC,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC,iBADJ;AAEbC,EAAAA,qBAAqB,EAAE;AAFV,CAAf;eAKe;AAAEb,EAAAA,OAAO,EAAPA,OAAF;AAAWQ,EAAAA,MAAM,EAANA;AAAX,C","sourcesContent":["import pageBuilder from '@blaze-cms/plugin-page-builder-fe';\nimport gtm from '@blaze-cms/plugin-gtm-fe';\nimport googleMaps from '@blaze-cms/plugin-google-maps-fe';\nimport previewFe from '@blaze-cms/plugin-preview-fe';\nimport authFe from '@blaze-cms/plugin-auth-fe';\n\nconst plugins = new Map();\n\nplugins.set(pageBuilder, {});\nplugins.set(gtm, {});\nplugins.set(googleMaps, {});\nplugins.set(previewFe, {});\nplugins.set(authFe, {});\n\nconst apollo = {\n uri: process.env.BLAZE_GRAPHQL_URI,\n loadEntitiesInBrowser: false\n};\n\nexport default { plugins, apollo };\n"],"file":"blaze.config.js"}
|
package/lib/helpers/check-url.js
CHANGED
|
@@ -93,24 +93,25 @@ var checkUrl = /*#__PURE__*/function () {
|
|
|
93
93
|
|
|
94
94
|
case 5:
|
|
95
95
|
if (!res) {
|
|
96
|
-
_context.next =
|
|
96
|
+
_context.next = 10;
|
|
97
97
|
break;
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
+
res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');
|
|
100
101
|
handler = _handleStaticRoutes["default"].getHandler(asPath);
|
|
101
102
|
|
|
102
103
|
if (!handler) {
|
|
103
|
-
_context.next =
|
|
104
|
+
_context.next = 10;
|
|
104
105
|
break;
|
|
105
106
|
}
|
|
106
107
|
|
|
107
108
|
return _context.abrupt("return", handler(props));
|
|
108
109
|
|
|
109
|
-
case
|
|
110
|
+
case 10:
|
|
110
111
|
previewData = (0, _checkPreviewUrl["default"])(url, query);
|
|
111
112
|
|
|
112
113
|
if (!(!previewData && hasAuth(req))) {
|
|
113
|
-
_context.next =
|
|
114
|
+
_context.next = 13;
|
|
114
115
|
break;
|
|
115
116
|
}
|
|
116
117
|
|
|
@@ -118,38 +119,38 @@ var checkUrl = /*#__PURE__*/function () {
|
|
|
118
119
|
disableSsr: true
|
|
119
120
|
});
|
|
120
121
|
|
|
121
|
-
case
|
|
122
|
-
_context.next =
|
|
122
|
+
case 13:
|
|
123
|
+
_context.next = 15;
|
|
123
124
|
return (0, _coreAuthUi.checkAccessToken)(apolloClient);
|
|
124
125
|
|
|
125
|
-
case
|
|
126
|
+
case 15:
|
|
126
127
|
if (!previewData) {
|
|
127
|
-
_context.next =
|
|
128
|
+
_context.next = 17;
|
|
128
129
|
break;
|
|
129
130
|
}
|
|
130
131
|
|
|
131
132
|
return _context.abrupt("return", getPreviewData(previewData, apolloClient));
|
|
132
133
|
|
|
133
|
-
case
|
|
134
|
+
case 17:
|
|
134
135
|
urlCheckOptions = {
|
|
135
136
|
asPath: asPath,
|
|
136
137
|
url: url,
|
|
137
138
|
apolloClient: apolloClient,
|
|
138
139
|
res: res
|
|
139
140
|
};
|
|
140
|
-
_context.next =
|
|
141
|
+
_context.next = 20;
|
|
141
142
|
return doUrlCheck(_objectSpread(_objectSpread({}, urlCheckOptions), {}, {
|
|
142
143
|
handle404Error: true,
|
|
143
144
|
blazeApp: blazeApp
|
|
144
145
|
}));
|
|
145
146
|
|
|
146
|
-
case
|
|
147
|
+
case 20:
|
|
147
148
|
result = _context.sent;
|
|
148
149
|
return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
|
|
149
150
|
fullUrl: fullUrl
|
|
150
151
|
}) || {});
|
|
151
152
|
|
|
152
|
-
case
|
|
153
|
+
case 22:
|
|
153
154
|
case "end":
|
|
154
155
|
return _context.stop();
|
|
155
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/check-url.js"],"names":["getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","hasAuth","req","headers","cookie","checkUrl","props","asPath","apolloClient","res","query","blazeApp","fullUrl","getFullUrl","url","BLAZE_STATUS_URL","isStatusPage","handler","handleStaticRoutes","getHandler","previewData","disableSsr","getPreviewData","urlCheckOptions","doUrlCheck","handle404Error","result","pageData","rootSelectorClasses","isPreview","getHost","BLAZE_FRONTEND_HOST","host","HTTPS","window","location","protocol","hostname","port","urlPort","COLON","DOUBLE_SLASH","checkUrlQuery","variables","data","itemId","itemEntity","urlTo","writeHead","Location","end","href","parentPATH","handleError","err","events","emit","error","networkError","write","graphQLErrors","length","statusCode","NOT_FOUND_STATUS_CODE","errorCode"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,mBAAmB,GAAG,SAAtBA,mBAAsB;AAAA,SAAMC,MAAM,CAACC,OAAO,CAACC,GAAR,CAAYC,iCAAb,CAAZ;AAAA,CAA5B;;AAEA,IAAMC,OAAO,GAAG,SAAVA,OAAU,CAAAC,GAAG,EAAI;AACrB,MAAI,CAACA,GAAL,EAAU,OAAO,KAAP;AACV,SAAO,CAAC,CAAC,gCAAeA,GAAG,CAACC,OAAJ,CAAYC,MAA3B,CAAT;AACD,CAHD;;AAKA,IAAMC,QAAQ;AAAA,2FAAG,iBAAMC,KAAN;AAAA;;AAAA;AAAA;AAAA;AAAA;AACPC,YAAAA,MADO,GAC6CD,KAD7C,CACPC,MADO,EACCC,YADD,GAC6CF,KAD7C,CACCE,YADD,EACeC,GADf,GAC6CH,KAD7C,CACeG,GADf,EACoBP,GADpB,GAC6CI,KAD7C,CACoBJ,GADpB,EACyBQ,KADzB,GAC6CJ,KAD7C,CACyBI,KADzB,EACgCC,QADhC,GAC6CL,KAD7C,CACgCK,QADhC;AAETC,YAAAA,OAFS,GAECC,UAAU,CAACX,GAAD,EAAMK,MAAN,CAFX;AAAA,wBAGC,2BAASA,MAAT,CAHD,EAGPO,GAHO,aAGPA,GAHO;;AAAA,kBAKXhB,OAAO,CAACC,GAAR,CAAYgB,gBAAZ,IAAgCD,GAAG,KAAKhB,OAAO,CAACC,GAAR,CAAYgB,gBALzC;AAAA;AAAA;AAAA;;AAAA,6CAMN;AAAEC,cAAAA,YAAY,EAAE;AAAhB,aANM;;AAAA;AAAA,iBAQXP,GARW;AAAA;AAAA;AAAA;;AASPQ,YAAAA,OATO,GASGC,+BAAmBC,UAAnB,CAA8BZ,MAA9B,CATH;;AAAA,iBAUTU,OAVS;AAAA;AAAA;AAAA;;AAAA,6CAWJA,OAAO,CAACX,KAAD,CAXH;;AAAA;AAeTc,YAAAA,WAfS,GAeK,iCAAgBN,GAAhB,EAAqBJ,KAArB,CAfL;;AAAA,kBAiBX,CAACU,WAAD,IAAgBnB,OAAO,CAACC,GAAD,CAjBZ;AAAA;AAAA;AAAA;;AAAA,6CAiB0B;AAAEmB,cAAAA,UAAU,EAAE;AAAd,aAjB1B;;AAAA;AAAA;AAAA,mBAmBT,kCAAiBb,YAAjB,CAnBS;;AAAA;AAAA,iBAqBXY,WArBW;AAAA;AAAA;AAAA;;AAAA,6CAqBSE,cAAc,CAACF,WAAD,EAAcZ,YAAd,CArBvB;;AAAA;AAsBTe,YAAAA,eAtBS,GAsBS;AAAEhB,cAAAA,MAAM,EAANA,MAAF;AAAUO,cAAAA,GAAG,EAAHA,GAAV;AAAeN,cAAAA,YAAY,EAAZA,YAAf;AAA6BC,cAAAA,GAAG,EAAHA;AAA7B,aAtBT;AAAA;AAAA,mBAwBMe,UAAU,iCAC1BD,eAD0B;AAE7BE,cAAAA,cAAc,EAAE,IAFa;AAG7Bd,cAAAA,QAAQ,EAARA;AAH6B,eAxBhB;;AAAA;AAwBTe,YAAAA,MAxBS;AAAA,6CA8BR,gCAAKA,MAAL;AAAad,cAAAA,OAAO,EAAPA;AAAb,kBAA0B,EA9BlB;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAARP,QAAQ;AAAA;AAAA;AAAA,GAAd;;AAiCA,IAAMiB,cAAc;AAAA,4FAAG,kBAAOF,WAAP,EAAoBZ,YAApB;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBACA,6DAAiBY,WAAjB;AAA8BZ,cAAAA,YAAY,EAAZA;AAA9B,eADA;;AAAA;AACfkB,YAAAA,MADe;AAAA,+BAEcA,MAFd,CAEbC,QAFa;AAErB,6DAA4B,EAA5B;AAAoBb,YAAAA,GAFC,oBAEDA,GAFC;AAGfc,YAAAA,mBAHe,GAGO,wCAAuBd,GAAvB,EAA4BlB,mBAAmB,EAA/C,CAHP;AAAA,4FAITwB,WAJS;AAIIQ,cAAAA,mBAAmB,EAAnBA;AAJJ,eAI4BF,MAJ5B;AAIoCG,cAAAA,SAAS,EAAE;AAJ/C;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAAdP,cAAc;AAAA;AAAA;AAAA,GAApB;;AAOA,IAAMQ,OAAO,GAAG,SAAVA,OAAU;AAAA,4BAAG3B,OAAH;AAAA,MAAGA,OAAH,8BAAa,EAAb;AAAA,SACdL,OAAO,CAACC,GAAR,CAAYgC,mBAAZ,IACA5B,OAAO,CAAC,gBAAD,CADP,IAEAA,OAAO,CAAC,kBAAD,CAFP,IAGAA,OAAO,CAAC6B,IAJM;AAAA,CAAhB;;AAMA,IAAMnB,UAAU,GAAG,SAAbA,UAAa,CAACX,GAAD,EAAMK,MAAN,EAAiB;AAClC,MAAIL,GAAJ,EAAS;AACP,qBAAU+B,gBAAV,SAAkBH,OAAO,CAAC5B,GAAD,CAAzB,SAAiCK,MAAjC;AACD;;AACD,gBAEI2B,MAFJ;AAAA,iCACEC,QADF;AAAA,MACcC,QADd,oBACcA,QADd;AAAA,MACwBC,QADxB,oBACwBA,QADxB;AAAA,MACkCC,IADlC,oBACkCA,IADlC;AAGA,MAAMC,OAAO,GAAGD,IAAI,aAAME,gBAAN,SAAcF,IAAd,IAAuB,EAA3C;AAEA,mBAAUF,QAAV,SAAqBK,uBAArB,SAAoCJ,QAApC,SAA+CE,OAA/C,SAAyDhC,MAAzD;AACD,CAVD;;AAYA,IAAMiB,UAAU;AAAA,4FAAG;AAAA;;AAAA;AAAA;AAAA;AAAA;AAASV,YAAAA,GAAT,SAASA,GAAT,EAAcN,YAAd,SAAcA,YAAd,EAA4BC,GAA5B,SAA4BA,GAA5B,EAAiCgB,cAAjC,SAAiCA,cAAjC,EAAiDd,QAAjD,SAAiDA,QAAjD;AAAA;AAAA;AAAA,mBAMLH,YAAY,CAACE,KAAb,CAAmB;AAC3BA,cAAAA,KAAK,EAAEgC,oBADoB;AAE3BC,cAAAA,SAAS,EAAE;AACT7B,gBAAAA,GAAG,EAAHA;AADS;AAFgB,aAAnB,CANK;;AAAA;AAAA;AAAA,2DAGb8B,IAHa,CAIXvC,QAJW;AAICwC,YAAAA,MAJD,0BAICA,MAJD;AAISC,YAAAA,UAJT,0BAISA,UAJT;AAIqBC,YAAAA,KAJrB,0BAIqBA,KAJrB;AAI4BpB,YAAAA,QAJ5B,0BAI4BA,QAJ5B;;AAAA,kBAaXoB,KAAK,IAAIA,KAAK,KAAKjC,GAbR;AAAA;AAAA;AAAA;;AAcb,gBAAIL,GAAJ,EAAS;AACPA,cAAAA,GAAG,CAACuC,SAAJ,CAAc,GAAd,EAAmB;AAAEC,gBAAAA,QAAQ,EAAEF;AAAZ,eAAnB;AACAtC,cAAAA,GAAG,CAACyC,GAAJ;AACD,aAHD,MAGO;AACLhB,cAAAA,MAAM,CAACC,QAAP,CAAgBgB,IAAhB,GAAuBJ,KAAvB;AACD;;AAnBY,8CAoBN,EApBM;;AAAA;AAsBTnB,YAAAA,mBAtBS,GAsBa,wCAAuBd,GAAvB,EAA4BlB,mBAAmB,EAA/C,CAtBb;AAAA,8CAuBR;AACL+B,cAAAA,QAAQ,EAARA,QADK;AAELC,cAAAA,mBAAmB,EAAnBA,mBAFK;AAGLiB,cAAAA,MAAM,EAANA,MAHK;AAILC,cAAAA,UAAU,EAAE,gDAAyBA,UAAzB;AAJP,aAvBQ;;AAAA;AAAA;AAAA;AA8BTM,YAAAA,UA9BS,GA8BI,6BAAYtC,GAAZ,CA9BJ;;AAAA,kBA+BXW,cAAc,IAAI2B,UAAlB,IAAgC3C,GA/BrB;AAAA;AAAA;AAAA;;AAgCbA,YAAAA,GAAG,CAACuC,SAAJ,CAAc,GAAd,EAAmB;AAAEC,cAAAA,QAAQ,EAAEG;AAAZ,aAAnB;AACA3C,YAAAA,GAAG,CAACyC,GAAJ;AAjCa;AAAA;;AAAA;AAAA,8CAmCNG,WAAW,eAAM5C,GAAN,EAAWgB,cAAX,EAA2Bd,QAA3B,CAnCL;;AAAA;AAAA,8CAsCRc,cAAc,GAAG,EAAH,GAAQ,IAtCd;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAAVD,UAAU;AAAA;AAAA;AAAA,GAAhB;;AA0CA,IAAM6B,WAAW,GAAG,SAAdA,WAAc,CAACC,GAAD,EAAM7C,GAAN,EAAWgB,cAAX,EAA2Bd,QAA3B,EAAwC;AAC1DA,EAAAA,QAAQ,CAAC4C,MAAT,CAAgBC,IAAhB,CAAqB,aAArB,EAAoC;AAAEC,IAAAA,KAAK,EAAEH;AAAT,GAApC;AAEA,MAAI,CAAC7C,GAAL,EAAU,OAAO,EAAP;;AACV,MAAI6C,GAAG,CAACI,YAAR,EAAsB;AACpBjD,IAAAA,GAAG,CAACuC,SAAJ,CAAc,GAAd,EAAmB;AAAE,sBAAgB;AAAlB,KAAnB;AACAvC,IAAAA,GAAG,CAACkD,KAAJ,CAAU,6BAAV;AACAlD,IAAAA,GAAG,CAACyC,GAAJ;AACD,GAJD,MAIO,IAAIzB,cAAc,IAAI6B,GAAG,CAACM,aAAJ,CAAkBC,MAAxC,EAAgD;AACrDpD,IAAAA,GAAG,CAACqD,UAAJ,GAAiBC,gCAAjB;AACA,WAAO;AAAEC,MAAAA,SAAS,EAAED;AAAb,KAAP;AACD;;AAED,SAAO,EAAP;AACD,CAdD;;eAee1D,Q","sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { getAccessToken, checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport { HTTPS, DOUBLE_SLASH, COLON, NOT_FOUND_STATUS_CODE } from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst hasAuth = req => {\n if (!req) return false;\n return !!getAccessToken(req.headers.cookie);\n};\n\nconst checkUrl = async props => {\n const { asPath, apolloClient, res, req, query, blazeApp } = props;\n const fullUrl = getFullUrl(req, asPath);\n const { url } = parseUrl(asPath);\n\n if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n return { isStatusPage: true };\n }\n if (res) {\n const handler = handleStaticRoutes.getHandler(asPath);\n if (handler) {\n return handler(props);\n }\n }\n\n const previewData = checkPreviewUrl(url, query);\n\n if (!previewData && hasAuth(req)) return { disableSsr: true };\n\n await checkAccessToken(apolloClient);\n\n if (previewData) return getPreviewData(previewData, apolloClient);\n const urlCheckOptions = { asPath, url, apolloClient, res };\n\n const result = await doUrlCheck({\n ...urlCheckOptions,\n handle404Error: true,\n blazeApp\n });\n\n return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n const result = await getPageData({ ...previewData, apolloClient });\n const { pageData: { url } = {} } = result;\n const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n process.env.BLAZE_FRONTEND_HOST ||\n headers['x-request-host'] ||\n headers['x-forwarded-host'] ||\n headers.host;\n\nconst getFullUrl = (req, asPath) => {\n if (req) {\n return `${HTTPS}${getHost(req)}${asPath}`;\n }\n const {\n location: { protocol, hostname, port }\n } = window;\n const urlPort = port ? `${COLON}${port}` : '';\n\n return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ url, apolloClient, res, handle404Error, blazeApp }) => {\n try {\n const {\n data: {\n checkUrl: { itemId, itemEntity, urlTo, pageData }\n }\n } = await apolloClient.query({\n query: checkUrlQuery,\n variables: {\n url\n }\n });\n\n if (urlTo && urlTo !== url) {\n if (res) {\n res.writeHead(301, { Location: urlTo });\n res.end();\n } else {\n window.location.href = urlTo;\n }\n return {};\n }\n const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n return {\n pageData,\n rootSelectorClasses,\n itemId,\n itemEntity: getUnpublishedEntityName(itemEntity)\n };\n } catch (err) {\n const parentPATH = checkParent(url);\n if (handle404Error && parentPATH && res) {\n res.writeHead(301, { Location: parentPATH });\n res.end();\n } else {\n return handleError(err, res, handle404Error, blazeApp);\n }\n\n return handle404Error ? {} : null;\n }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n blazeApp.events.emit('monitor:log', { error: err });\n\n if (!res) return {};\n if (err.networkError) {\n res.writeHead(500, { 'Content-Type': 'text/plain' });\n res.write('500 Internal Server Error\\n');\n res.end();\n } else if (handle404Error && err.graphQLErrors.length) {\n res.statusCode = NOT_FOUND_STATUS_CODE;\n return { errorCode: NOT_FOUND_STATUS_CODE };\n }\n\n return {};\n};\nexport default checkUrl;\n"],"file":"check-url.js"}
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/check-url.js"],"names":["getRootClassesLimit","Number","process","env","BLAZE_ROOT_SELECTOR_CLASSES_LIMIT","hasAuth","req","headers","cookie","checkUrl","props","asPath","apolloClient","res","query","blazeApp","fullUrl","getFullUrl","url","BLAZE_STATUS_URL","isStatusPage","setHeader","BLAZE_CACHE_CONTROL_HEADER","handler","handleStaticRoutes","getHandler","previewData","disableSsr","getPreviewData","urlCheckOptions","doUrlCheck","handle404Error","result","pageData","rootSelectorClasses","isPreview","getHost","BLAZE_FRONTEND_HOST","host","HTTPS","window","location","protocol","hostname","port","urlPort","COLON","DOUBLE_SLASH","checkUrlQuery","variables","data","itemId","itemEntity","urlTo","writeHead","Location","end","href","parentPATH","handleError","err","events","emit","error","networkError","write","graphQLErrors","length","statusCode","NOT_FOUND_STATUS_CODE","errorCode"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,mBAAmB,GAAG,SAAtBA,mBAAsB;AAAA,SAAMC,MAAM,CAACC,OAAO,CAACC,GAAR,CAAYC,iCAAb,CAAZ;AAAA,CAA5B;;AAEA,IAAMC,OAAO,GAAG,SAAVA,OAAU,CAAAC,GAAG,EAAI;AACrB,MAAI,CAACA,GAAL,EAAU,OAAO,KAAP;AACV,SAAO,CAAC,CAAC,gCAAeA,GAAG,CAACC,OAAJ,CAAYC,MAA3B,CAAT;AACD,CAHD;;AAKA,IAAMC,QAAQ;AAAA,2FAAG,iBAAMC,KAAN;AAAA;;AAAA;AAAA;AAAA;AAAA;AACPC,YAAAA,MADO,GAC6CD,KAD7C,CACPC,MADO,EACCC,YADD,GAC6CF,KAD7C,CACCE,YADD,EACeC,GADf,GAC6CH,KAD7C,CACeG,GADf,EACoBP,GADpB,GAC6CI,KAD7C,CACoBJ,GADpB,EACyBQ,KADzB,GAC6CJ,KAD7C,CACyBI,KADzB,EACgCC,QADhC,GAC6CL,KAD7C,CACgCK,QADhC;AAETC,YAAAA,OAFS,GAECC,UAAU,CAACX,GAAD,EAAMK,MAAN,CAFX;AAAA,wBAGC,2BAASA,MAAT,CAHD,EAGPO,GAHO,aAGPA,GAHO;;AAAA,kBAKXhB,OAAO,CAACC,GAAR,CAAYgB,gBAAZ,IAAgCD,GAAG,KAAKhB,OAAO,CAACC,GAAR,CAAYgB,gBALzC;AAAA;AAAA;AAAA;;AAAA,6CAMN;AAAEC,cAAAA,YAAY,EAAE;AAAhB,aANM;;AAAA;AAAA,iBAQXP,GARW;AAAA;AAAA;AAAA;;AASbA,YAAAA,GAAG,CAACQ,SAAJ,CAAc,eAAd,EAA+BnB,OAAO,CAACC,GAAR,CAAYmB,0BAAZ,IAA0C,EAAzE;AACMC,YAAAA,OAVO,GAUGC,+BAAmBC,UAAnB,CAA8Bd,MAA9B,CAVH;;AAAA,iBAWTY,OAXS;AAAA;AAAA;AAAA;;AAAA,6CAYJA,OAAO,CAACb,KAAD,CAZH;;AAAA;AAgBTgB,YAAAA,WAhBS,GAgBK,iCAAgBR,GAAhB,EAAqBJ,KAArB,CAhBL;;AAAA,kBAkBX,CAACY,WAAD,IAAgBrB,OAAO,CAACC,GAAD,CAlBZ;AAAA;AAAA;AAAA;;AAAA,6CAkB0B;AAAEqB,cAAAA,UAAU,EAAE;AAAd,aAlB1B;;AAAA;AAAA;AAAA,mBAoBT,kCAAiBf,YAAjB,CApBS;;AAAA;AAAA,iBAsBXc,WAtBW;AAAA;AAAA;AAAA;;AAAA,6CAsBSE,cAAc,CAACF,WAAD,EAAcd,YAAd,CAtBvB;;AAAA;AAuBTiB,YAAAA,eAvBS,GAuBS;AAAElB,cAAAA,MAAM,EAANA,MAAF;AAAUO,cAAAA,GAAG,EAAHA,GAAV;AAAeN,cAAAA,YAAY,EAAZA,YAAf;AAA6BC,cAAAA,GAAG,EAAHA;AAA7B,aAvBT;AAAA;AAAA,mBAyBMiB,UAAU,iCAC1BD,eAD0B;AAE7BE,cAAAA,cAAc,EAAE,IAFa;AAG7BhB,cAAAA,QAAQ,EAARA;AAH6B,eAzBhB;;AAAA;AAyBTiB,YAAAA,MAzBS;AAAA,6CA+BR,gCAAKA,MAAL;AAAahB,cAAAA,OAAO,EAAPA;AAAb,kBAA0B,EA/BlB;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAARP,QAAQ;AAAA;AAAA;AAAA,GAAd;;AAkCA,IAAMmB,cAAc;AAAA,4FAAG,kBAAOF,WAAP,EAAoBd,YAApB;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBACA,6DAAiBc,WAAjB;AAA8Bd,cAAAA,YAAY,EAAZA;AAA9B,eADA;;AAAA;AACfoB,YAAAA,MADe;AAAA,+BAEcA,MAFd,CAEbC,QAFa;AAErB,6DAA4B,EAA5B;AAAoBf,YAAAA,GAFC,oBAEDA,GAFC;AAGfgB,YAAAA,mBAHe,GAGO,wCAAuBhB,GAAvB,EAA4BlB,mBAAmB,EAA/C,CAHP;AAAA,4FAIT0B,WAJS;AAIIQ,cAAAA,mBAAmB,EAAnBA;AAJJ,eAI4BF,MAJ5B;AAIoCG,cAAAA,SAAS,EAAE;AAJ/C;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAAdP,cAAc;AAAA;AAAA;AAAA,GAApB;;AAOA,IAAMQ,OAAO,GAAG,SAAVA,OAAU;AAAA,4BAAG7B,OAAH;AAAA,MAAGA,OAAH,8BAAa,EAAb;AAAA,SACdL,OAAO,CAACC,GAAR,CAAYkC,mBAAZ,IACA9B,OAAO,CAAC,gBAAD,CADP,IAEAA,OAAO,CAAC,kBAAD,CAFP,IAGAA,OAAO,CAAC+B,IAJM;AAAA,CAAhB;;AAMA,IAAMrB,UAAU,GAAG,SAAbA,UAAa,CAACX,GAAD,EAAMK,MAAN,EAAiB;AAClC,MAAIL,GAAJ,EAAS;AACP,qBAAUiC,gBAAV,SAAkBH,OAAO,CAAC9B,GAAD,CAAzB,SAAiCK,MAAjC;AACD;;AACD,gBAEI6B,MAFJ;AAAA,iCACEC,QADF;AAAA,MACcC,QADd,oBACcA,QADd;AAAA,MACwBC,QADxB,oBACwBA,QADxB;AAAA,MACkCC,IADlC,oBACkCA,IADlC;AAGA,MAAMC,OAAO,GAAGD,IAAI,aAAME,gBAAN,SAAcF,IAAd,IAAuB,EAA3C;AAEA,mBAAUF,QAAV,SAAqBK,uBAArB,SAAoCJ,QAApC,SAA+CE,OAA/C,SAAyDlC,MAAzD;AACD,CAVD;;AAYA,IAAMmB,UAAU;AAAA,4FAAG;AAAA;;AAAA;AAAA;AAAA;AAAA;AAASZ,YAAAA,GAAT,SAASA,GAAT,EAAcN,YAAd,SAAcA,YAAd,EAA4BC,GAA5B,SAA4BA,GAA5B,EAAiCkB,cAAjC,SAAiCA,cAAjC,EAAiDhB,QAAjD,SAAiDA,QAAjD;AAAA;AAAA;AAAA,mBAMLH,YAAY,CAACE,KAAb,CAAmB;AAC3BA,cAAAA,KAAK,EAAEkC,oBADoB;AAE3BC,cAAAA,SAAS,EAAE;AACT/B,gBAAAA,GAAG,EAAHA;AADS;AAFgB,aAAnB,CANK;;AAAA;AAAA;AAAA,2DAGbgC,IAHa,CAIXzC,QAJW;AAIC0C,YAAAA,MAJD,0BAICA,MAJD;AAISC,YAAAA,UAJT,0BAISA,UAJT;AAIqBC,YAAAA,KAJrB,0BAIqBA,KAJrB;AAI4BpB,YAAAA,QAJ5B,0BAI4BA,QAJ5B;;AAAA,kBAaXoB,KAAK,IAAIA,KAAK,KAAKnC,GAbR;AAAA;AAAA;AAAA;;AAcb,gBAAIL,GAAJ,EAAS;AACPA,cAAAA,GAAG,CAACyC,SAAJ,CAAc,GAAd,EAAmB;AAAEC,gBAAAA,QAAQ,EAAEF;AAAZ,eAAnB;AACAxC,cAAAA,GAAG,CAAC2C,GAAJ;AACD,aAHD,MAGO;AACLhB,cAAAA,MAAM,CAACC,QAAP,CAAgBgB,IAAhB,GAAuBJ,KAAvB;AACD;;AAnBY,8CAoBN,EApBM;;AAAA;AAsBTnB,YAAAA,mBAtBS,GAsBa,wCAAuBhB,GAAvB,EAA4BlB,mBAAmB,EAA/C,CAtBb;AAAA,8CAuBR;AACLiC,cAAAA,QAAQ,EAARA,QADK;AAELC,cAAAA,mBAAmB,EAAnBA,mBAFK;AAGLiB,cAAAA,MAAM,EAANA,MAHK;AAILC,cAAAA,UAAU,EAAE,gDAAyBA,UAAzB;AAJP,aAvBQ;;AAAA;AAAA;AAAA;AA8BTM,YAAAA,UA9BS,GA8BI,6BAAYxC,GAAZ,CA9BJ;;AAAA,kBA+BXa,cAAc,IAAI2B,UAAlB,IAAgC7C,GA/BrB;AAAA;AAAA;AAAA;;AAgCbA,YAAAA,GAAG,CAACyC,SAAJ,CAAc,GAAd,EAAmB;AAAEC,cAAAA,QAAQ,EAAEG;AAAZ,aAAnB;AACA7C,YAAAA,GAAG,CAAC2C,GAAJ;AAjCa;AAAA;;AAAA;AAAA,8CAmCNG,WAAW,eAAM9C,GAAN,EAAWkB,cAAX,EAA2BhB,QAA3B,CAnCL;;AAAA;AAAA,8CAsCRgB,cAAc,GAAG,EAAH,GAAQ,IAtCd;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAAVD,UAAU;AAAA;AAAA;AAAA,GAAhB;;AA0CA,IAAM6B,WAAW,GAAG,SAAdA,WAAc,CAACC,GAAD,EAAM/C,GAAN,EAAWkB,cAAX,EAA2BhB,QAA3B,EAAwC;AAC1DA,EAAAA,QAAQ,CAAC8C,MAAT,CAAgBC,IAAhB,CAAqB,aAArB,EAAoC;AAAEC,IAAAA,KAAK,EAAEH;AAAT,GAApC;AAEA,MAAI,CAAC/C,GAAL,EAAU,OAAO,EAAP;;AACV,MAAI+C,GAAG,CAACI,YAAR,EAAsB;AACpBnD,IAAAA,GAAG,CAACyC,SAAJ,CAAc,GAAd,EAAmB;AAAE,sBAAgB;AAAlB,KAAnB;AACAzC,IAAAA,GAAG,CAACoD,KAAJ,CAAU,6BAAV;AACApD,IAAAA,GAAG,CAAC2C,GAAJ;AACD,GAJD,MAIO,IAAIzB,cAAc,IAAI6B,GAAG,CAACM,aAAJ,CAAkBC,MAAxC,EAAgD;AACrDtD,IAAAA,GAAG,CAACuD,UAAJ,GAAiBC,gCAAjB;AACA,WAAO;AAAEC,MAAAA,SAAS,EAAED;AAAb,KAAP;AACD;;AAED,SAAO,EAAP;AACD,CAdD;;eAee5D,Q","sourcesContent":["import { parseUrl } from 'query-string';\nimport { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';\nimport { getAccessToken, checkAccessToken } from '@blaze-cms/core-auth-ui';\nimport { HTTPS, DOUBLE_SLASH, COLON, NOT_FOUND_STATUS_CODE } from '../constants';\nimport { checkUrlQuery } from '../application/query';\nimport checkParent from './check-parent';\nimport checkPreviewUrl from './check-preview-url';\nimport handleStaticRoutes from './handle-static-routes';\nimport getPageData from './get-page-data';\nimport getRootSelectorClasses from './get-root-selector-classes';\n\nconst getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);\n\nconst hasAuth = req => {\n if (!req) return false;\n return !!getAccessToken(req.headers.cookie);\n};\n\nconst checkUrl = async props => {\n const { asPath, apolloClient, res, req, query, blazeApp } = props;\n const fullUrl = getFullUrl(req, asPath);\n const { url } = parseUrl(asPath);\n\n if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {\n return { isStatusPage: true };\n }\n if (res) {\n res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');\n const handler = handleStaticRoutes.getHandler(asPath);\n if (handler) {\n return handler(props);\n }\n }\n\n const previewData = checkPreviewUrl(url, query);\n\n if (!previewData && hasAuth(req)) return { disableSsr: true };\n\n await checkAccessToken(apolloClient);\n\n if (previewData) return getPreviewData(previewData, apolloClient);\n const urlCheckOptions = { asPath, url, apolloClient, res };\n\n const result = await doUrlCheck({\n ...urlCheckOptions,\n handle404Error: true,\n blazeApp\n });\n\n return { ...result, fullUrl } || {};\n};\n\nconst getPreviewData = async (previewData, apolloClient) => {\n const result = await getPageData({ ...previewData, apolloClient });\n const { pageData: { url } = {} } = result;\n const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n return { ...previewData, rootSelectorClasses, ...result, isPreview: true };\n};\n\nconst getHost = ({ headers = {} }) =>\n process.env.BLAZE_FRONTEND_HOST ||\n headers['x-request-host'] ||\n headers['x-forwarded-host'] ||\n headers.host;\n\nconst getFullUrl = (req, asPath) => {\n if (req) {\n return `${HTTPS}${getHost(req)}${asPath}`;\n }\n const {\n location: { protocol, hostname, port }\n } = window;\n const urlPort = port ? `${COLON}${port}` : '';\n\n return `${protocol}${DOUBLE_SLASH}${hostname}${urlPort}${asPath}`;\n};\n\nconst doUrlCheck = async ({ url, apolloClient, res, handle404Error, blazeApp }) => {\n try {\n const {\n data: {\n checkUrl: { itemId, itemEntity, urlTo, pageData }\n }\n } = await apolloClient.query({\n query: checkUrlQuery,\n variables: {\n url\n }\n });\n\n if (urlTo && urlTo !== url) {\n if (res) {\n res.writeHead(301, { Location: urlTo });\n res.end();\n } else {\n window.location.href = urlTo;\n }\n return {};\n }\n const rootSelectorClasses = getRootSelectorClasses(url, getRootClassesLimit());\n return {\n pageData,\n rootSelectorClasses,\n itemId,\n itemEntity: getUnpublishedEntityName(itemEntity)\n };\n } catch (err) {\n const parentPATH = checkParent(url);\n if (handle404Error && parentPATH && res) {\n res.writeHead(301, { Location: parentPATH });\n res.end();\n } else {\n return handleError(err, res, handle404Error, blazeApp);\n }\n\n return handle404Error ? {} : null;\n }\n};\n\nconst handleError = (err, res, handle404Error, blazeApp) => {\n blazeApp.events.emit('monitor:log', { error: err });\n\n if (!res) return {};\n if (err.networkError) {\n res.writeHead(500, { 'Content-Type': 'text/plain' });\n res.write('500 Internal Server Error\\n');\n res.end();\n } else if (handle404Error && err.graphQLErrors.length) {\n res.statusCode = NOT_FOUND_STATUS_CODE;\n return { errorCode: NOT_FOUND_STATUS_CODE };\n }\n\n return {};\n};\nexport default checkUrl;\n"],"file":"check-url.js"}
|
|
@@ -17,7 +17,7 @@ require("core-js/modules/es.regexp.to-string.js");
|
|
|
17
17
|
|
|
18
18
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
19
19
|
|
|
20
|
-
var
|
|
20
|
+
var _client = require("@apollo/client");
|
|
21
21
|
|
|
22
22
|
var _constants = require("../../constants");
|
|
23
23
|
|
|
@@ -26,7 +26,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
|
|
|
26
26
|
var _templateObject;
|
|
27
27
|
|
|
28
28
|
var storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || _constants.BLAZE_STATIC_ROUTE_STORE_KEY;
|
|
29
|
-
var fileQuery = (0,
|
|
29
|
+
var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n query {\n files: getFiles(\n where: { storeKey: \"", "\", filename: \"robots.txt\" }\n limit: 1\n sort: [{ property: \"created\", direction: \"desc\" }]\n ) {\n mimetype\n url\n }\n }\n"])), storeKey);
|
|
30
30
|
exports.fileQuery = fileQuery;
|
|
31
31
|
var pattern = new RegExp(_constants.ROUTE_PATTERN_ROBOTS_TXT);
|
|
32
32
|
exports.pattern = pattern;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["storeKey","process","env","BLAZE_STATIC_ROUTE_STORE_KEY","fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_ROBOTS_TXT","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;AAEA,IAAMA,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,IAA4CA,uCAA7D;AAEO,IAAMC,SAAS,OAAGC,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["storeKey","process","env","BLAZE_STATIC_ROUTE_STORE_KEY","fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_ROBOTS_TXT","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;AAEA,IAAMA,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,IAA4CA,uCAA7D;AAEO,IAAMC,SAAS,OAAGC,WAAH,wTAGML,QAHN,CAAf;;AAaA,IAAMM,OAAO,GAAG,IAAIC,MAAJ,CAAWC,mCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nconst storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;\n\nexport const fileQuery = gql`\n query {\n files: getFiles(\n where: { storeKey: \"${storeKey}\", filename: \"robots.txt\" }\n limit: 1\n sort: [{ property: \"created\", direction: \"desc\" }]\n ) {\n mimetype\n url\n }\n }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_ROBOTS_TXT);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"robots-txt.js"}
|
|
@@ -17,7 +17,7 @@ require("core-js/modules/es.string.split.js");
|
|
|
17
17
|
|
|
18
18
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
19
19
|
|
|
20
|
-
var
|
|
20
|
+
var _client = require("@apollo/client");
|
|
21
21
|
|
|
22
22
|
require("cross-fetch/polyfill");
|
|
23
23
|
|
|
@@ -27,7 +27,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
|
|
|
27
27
|
|
|
28
28
|
var _templateObject;
|
|
29
29
|
|
|
30
|
-
var fileQuery = (0,
|
|
30
|
+
var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n query getFiles($where: JSON) {\n files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n mimetype\n url\n }\n }\n"])));
|
|
31
31
|
exports.fileQuery = fileQuery;
|
|
32
32
|
|
|
33
33
|
function getVariables(_ref) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["fileQuery","gql","getVariables","asPath","filename","split","slice","where","storeKey","SITEMAP_STORE_KEY","pattern","ROUTE_PATTERN_SITEMAP_FILE_REGEX","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["fileQuery","gql","getVariables","asPath","filename","split","slice","where","storeKey","SITEMAP_STORE_KEY","pattern","ROUTE_PATTERN_SITEMAP_FILE_REGEX","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,WAAH,0QAAf;;;AASP,SAASC,YAAT,OAAkC;AAAA,MAAVC,MAAU,QAAVA,MAAU;AAChC,MAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,MAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAEC,4BAAZ;AAA+BL,IAAAA,QAAQ,EAARA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA,KAAK,EAALA;AAAF,GAAP;AACD;;AAEM,IAAMG,OAAO,GAAGC,2CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWZ,SAAX,EAAsBE,YAAtB,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n query getFiles($where: JSON) {\n files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n mimetype\n url\n }\n }\n`;\n\nfunction getVariables({ asPath }) {\n const filename = asPath.split('/').slice(-1)[0];\n const where = { storeKey: SITEMAP_STORE_KEY, filename };\n return { where };\n}\n\nexport const pattern = ROUTE_PATTERN_SITEMAP_FILE_REGEX;\n\nexport const handler = getHandler(fileQuery, getVariables);\n"],"file":"sitemap-file.js"}
|
|
@@ -17,7 +17,7 @@ require("core-js/modules/es.regexp.to-string.js");
|
|
|
17
17
|
|
|
18
18
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
19
19
|
|
|
20
|
-
var
|
|
20
|
+
var _client = require("@apollo/client");
|
|
21
21
|
|
|
22
22
|
require("cross-fetch/polyfill");
|
|
23
23
|
|
|
@@ -27,7 +27,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
|
|
|
27
27
|
|
|
28
28
|
var _templateObject;
|
|
29
29
|
|
|
30
|
-
var fileQuery = (0,
|
|
30
|
+
var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n query {\n files: getFiles(\n where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n limit: 1\n sort: [{ property: \"created\", direction: \"desc\" }]\n ) {\n mimetype\n url\n }\n }\n"])));
|
|
31
31
|
exports.fileQuery = fileQuery;
|
|
32
32
|
var pattern = new RegExp(_constants.ROUTE_PATTERN_SITEMAP);
|
|
33
33
|
exports.pattern = pattern;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_SITEMAP","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_SITEMAP","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,WAAH,yUAAf;;AAaA,IAAMC,OAAO,GAAG,IAAIC,MAAJ,CAAWC,gCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n query {\n files: getFiles(\n where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n limit: 1\n sort: [{ property: \"created\", direction: \"desc\" }]\n ) {\n mimetype\n url\n }\n }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_SITEMAP);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"sitemap.js"}
|
package/lib/hoc/withBlaze.js
CHANGED
|
@@ -65,9 +65,7 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
|
65
65
|
|
|
66
66
|
var _react = _interopRequireWildcard(require("react"));
|
|
67
67
|
|
|
68
|
-
var
|
|
69
|
-
|
|
70
|
-
var _reactApollo = require("react-apollo");
|
|
68
|
+
var _ssr = require("@apollo/client/react/ssr");
|
|
71
69
|
|
|
72
70
|
var _coreUi = _interopRequireDefault(require("@blaze-cms/core-ui"));
|
|
73
71
|
|
|
@@ -173,8 +171,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
173
171
|
key: "setApolloClient",
|
|
174
172
|
value: function setApolloClient() {
|
|
175
173
|
if (!this.apolloClient) {
|
|
176
|
-
var
|
|
177
|
-
|
|
174
|
+
var _this$props = this.props,
|
|
175
|
+
apolloState = _this$props.apolloState,
|
|
176
|
+
processedBlazeEntities = _this$props.processedBlazeEntities;
|
|
177
|
+
this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
|
|
178
178
|
(0, _coreAuthUi.setupCheckAccessToken)(this.apolloClient);
|
|
179
179
|
}
|
|
180
180
|
}
|
|
@@ -194,7 +194,7 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
194
194
|
key: "getInitialProps",
|
|
195
195
|
value: function () {
|
|
196
196
|
var _getInitialProps = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(context) {
|
|
197
|
-
var _Component, router, AppTree, ctx, appProps, errorProps, requestApp, apolloClient,
|
|
197
|
+
var _Component, router, AppTree, ctx, appProps, errorProps, requestApp, apolloClient, _appProps, _appProps$pageProps, pageProps, mainProps, apolloState, sortedState;
|
|
198
198
|
|
|
199
199
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
200
200
|
while (1) {
|
|
@@ -209,11 +209,11 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
209
209
|
requestApp.ctx.req = ctx.req;
|
|
210
210
|
requestApp.ctx.res = ctx.res;
|
|
211
211
|
_context2.next = 10;
|
|
212
|
-
return
|
|
212
|
+
return blazeApp.init();
|
|
213
213
|
|
|
214
214
|
case 10:
|
|
215
215
|
_context2.next = 12;
|
|
216
|
-
return
|
|
216
|
+
return requestApp.init();
|
|
217
217
|
|
|
218
218
|
case 12:
|
|
219
219
|
apolloClient = getApolloClient(ctx, requestApp);
|
|
@@ -232,26 +232,34 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
232
232
|
appProps = _context2.sent;
|
|
233
233
|
|
|
234
234
|
case 19:
|
|
235
|
-
|
|
236
|
-
|
|
235
|
+
_appProps = appProps, _appProps$pageProps = _appProps.pageProps, pageProps = _appProps$pageProps === void 0 ? {} : _appProps$pageProps;
|
|
236
|
+
mainProps = _objectSpread(_objectSpread({}, appProps), {}, {
|
|
237
|
+
pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps)
|
|
238
|
+
});
|
|
239
|
+
|
|
240
|
+
if (isSsr) {
|
|
241
|
+
_context2.next = 23;
|
|
237
242
|
break;
|
|
238
243
|
}
|
|
239
244
|
|
|
240
|
-
_context2.
|
|
241
|
-
|
|
242
|
-
|
|
245
|
+
return _context2.abrupt("return", mainProps);
|
|
246
|
+
|
|
247
|
+
case 23:
|
|
248
|
+
_context2.prev = 23;
|
|
249
|
+
_context2.next = 26;
|
|
250
|
+
return (0, _ssr.getDataFromTree)( /*#__PURE__*/_react["default"].createElement(AppTree, (0, _extends2["default"])({}, appProps, {
|
|
243
251
|
Component: _Component,
|
|
244
252
|
router: router,
|
|
245
253
|
apolloClient: apolloClient
|
|
246
254
|
})));
|
|
247
255
|
|
|
248
|
-
case
|
|
249
|
-
_context2.next =
|
|
256
|
+
case 26:
|
|
257
|
+
_context2.next = 34;
|
|
250
258
|
break;
|
|
251
259
|
|
|
252
|
-
case
|
|
253
|
-
_context2.prev =
|
|
254
|
-
_context2.t0 = _context2["catch"](
|
|
260
|
+
case 28:
|
|
261
|
+
_context2.prev = 28;
|
|
262
|
+
_context2.t0 = _context2["catch"](23);
|
|
255
263
|
errorProps = (0, _helpers.getErrorMessage)(_context2.t0);
|
|
256
264
|
if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
|
|
257
265
|
ctx.blazeApp.events.emit('monitor:log', {
|
|
@@ -259,27 +267,24 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
259
267
|
});
|
|
260
268
|
requestApp.log.error('Error while running `getDataFromTree`', _context2.t0);
|
|
261
269
|
|
|
262
|
-
case
|
|
263
|
-
_head["default"].rewind();
|
|
264
|
-
|
|
265
|
-
case 32:
|
|
270
|
+
case 34:
|
|
266
271
|
apolloState = apolloClient.cache.extract();
|
|
267
272
|
sortedState = Object.keys(apolloState).sort().reduce(function (acc, key) {
|
|
268
273
|
acc[key] = apolloState[key];
|
|
269
274
|
return acc;
|
|
270
275
|
}, {});
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
276
|
+
return _context2.abrupt("return", _objectSpread(_objectSpread({}, mainProps), {}, {
|
|
277
|
+
pageProps: _objectSpread(_objectSpread({}, mainProps.pageProps), errorProps),
|
|
278
|
+
apolloState: sortedState,
|
|
279
|
+
processedBlazeEntities: blazeApp.getProcessedEntities()
|
|
275
280
|
}));
|
|
276
281
|
|
|
277
|
-
case
|
|
282
|
+
case 37:
|
|
278
283
|
case "end":
|
|
279
284
|
return _context2.stop();
|
|
280
285
|
}
|
|
281
286
|
}
|
|
282
|
-
}, _callee2, null, [[
|
|
287
|
+
}, _callee2, null, [[23, 28]]);
|
|
283
288
|
}));
|
|
284
289
|
|
|
285
290
|
function getInitialProps(_x) {
|
|
@@ -292,10 +297,12 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
292
297
|
return _class;
|
|
293
298
|
}(_react.Component), (0, _defineProperty2["default"])(_class, "displayName", 'withBlaze(App)'), (0, _defineProperty2["default"])(_class, "propTypes", {
|
|
294
299
|
apolloState: _propTypes["default"].object,
|
|
295
|
-
apolloClient: _propTypes["default"].object
|
|
300
|
+
apolloClient: _propTypes["default"].object,
|
|
301
|
+
processedBlazeEntities: _propTypes["default"].object
|
|
296
302
|
}), (0, _defineProperty2["default"])(_class, "defaultProps", {
|
|
297
303
|
apolloState: {},
|
|
298
|
-
apolloClient: null
|
|
304
|
+
apolloClient: null,
|
|
305
|
+
processedBlazeEntities: undefined
|
|
299
306
|
}), _temp;
|
|
300
307
|
}
|
|
301
308
|
|
package/lib/hoc/withBlaze.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","props","state","appLoaded","initComplete","init","setState","apolloState","setApolloClient","context","_Component","Component","router","AppTree","appProps","errorProps","req","res","getInitialProps","errorCode","statusCode","events","emit","error","log","
|
|
1
|
+
{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","props","state","appLoaded","initComplete","init","setState","apolloState","processedBlazeEntities","setApolloClient","context","_Component","Component","router","AppTree","appProps","errorProps","req","res","getInitialProps","pageProps","mainProps","errorCode","statusCode","events","emit","error","log","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","getProcessedEntities","PropTypes","object","undefined","withBlaze","buildConfig","forceSsr","window","blazeConfig","logNameSpace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;;;;;AAEA,IAAMA,aAAa,GAAG,yBAAQ;AAAA;AAAA,2CAAa,2BAAb;AAAA;AAAA,CAAR,CAAtB;AAEA,IAAMC,sBAAsB,GAAG,MAA/B;;AAEA,SAASC,aAAT,CAAuBC,KAAvB,EAA8BC,MAA9B,EAAsCC,QAAtC,EAAgDC,GAAhD,EAAqD;AAAA;;AACnD,WAASC,eAAT,CAAyBC,GAAzB,EAA8BC,UAA9B,EAA0C;AACxC,WAAOD,GAAG,CAACE,YAAJ,IAAoBD,UAAU,CAACE,SAAX,EAApB,IAA8CF,UAAU,CAACG,YAAX,EAArD;AACD;;AAED,WAASC,aAAT,CAAuBJ,UAAvB,EAAmC;AACjC,WAAO,CAACA,UAAD,IAAeN,KAAf,GAAuB,wBAAW;AAAEC,MAAAA,MAAM,EAANA;AAAF,KAAX,CAAvB,GAAgDC,QAAvD;AACD;;AACD;AAAA;;AAAA;;AA8EE,oBAAYS,KAAZ,EAAmB;AAAA;;AAAA;AACjB,gCAAMA,KAAN;AACA,YAAKJ,YAAL,GAAoBI,KAAK,CAACJ,YAA1B;AACA,YAAKK,KAAL,GAAa;AACXC,QAAAA,SAAS,EAAEb,KAAK,IAAIE,QAAQ,CAACY,YAAT;AADT,OAAb;AAGA,YAAKZ,QAAL,GAAgBA,QAAhB;AANiB;AAOlB;;AArFH;AAAA;AAAA;AAAA,+GAuFE;AAAA;AAAA;AAAA;AAAA;AAAA,uBACMA,QAAQ,CAACY,YAAT,EADN;AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA,yBAGQZ,QAAQ,CAACa,IAAT,EAHR;;AAAA;AAKE,uBAAKC,QAAL,CAAc;AACZH,oBAAAA,SAAS,EAAEX,QAAQ,CAACY,YAAT;AADC,mBAAd;;AALF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAvFF;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,aAiGE,2BAAkB;AAChB,YAAI,CAAC,KAAKP,YAAV,EAAwB;AACtB,4BAAgD,KAAKI,KAArD;AAAA,cAAQM,WAAR,eAAQA,WAAR;AAAA,cAAqBC,sBAArB,eAAqBA,sBAArB;AACA,eAAKX,YAAL,GAAoBL,QAAQ,CAACO,YAAT,CAAsBQ,WAAtB,EAAmCC,sBAAnC,CAApB;AACA,iDAAsB,KAAKX,YAA3B;AACD;AACF;AAvGH;AAAA;AAAA,aAyGE,kBAAS;AACP,YAAQM,SAAR,GAAsB,KAAKD,KAA3B,CAAQC,SAAR;AAEA,YAAI,CAACA,SAAD,IAAc,CAACb,KAAnB,EAA0B,OAAO,YAAP;AAE1B,aAAKmB,eAAL;AAEA,4BACE,gCAAC,aAAD;AAAe,UAAA,GAAG,EAAE,KAAKjB;AAAzB,wBACE,gCAAC,GAAD,gCAAS,KAAKS,KAAd;AAAqB,UAAA,YAAY,EAAE,KAAKJ;AAAxC,WADF,CADF;AAKD;AArHH;AAAA;AAAA;AAAA,6GAeE,kBAA6Ba,OAA7B;AAAA;;AAAA;AAAA;AAAA;AAAA;AACqBC,kBAAAA,UADrB,GAC0DD,OAD1D,CACUE,SADV,EACiCC,MADjC,GAC0DH,OAD1D,CACiCG,MADjC,EACyCC,OADzC,GAC0DJ,OAD1D,CACyCI,OADzC,EACkDnB,GADlD,GAC0De,OAD1D,CACkDf,GADlD;AAEMoB,kBAAAA,QAFN,GAEiB,EAFjB;AAGMC,kBAAAA,UAHN,GAGmB,EAHnB;AAKMpB,kBAAAA,UALN,GAKmBD,GAAG,CAACH,QALvB;AAMEI,kBAAAA,UAAU,GAAGI,aAAa,CAACJ,UAAD,CAA1B;AAEAA,kBAAAA,UAAU,CAACD,GAAX,CAAekB,MAAf,GAAwBA,MAAxB;AACAjB,kBAAAA,UAAU,CAACD,GAAX,CAAesB,GAAf,GAAqBtB,GAAG,CAACsB,GAAzB;AACArB,kBAAAA,UAAU,CAACD,GAAX,CAAeuB,GAAf,GAAqBvB,GAAG,CAACuB,GAAzB;AAVF;AAAA,yBAYQ1B,QAAQ,CAACa,IAAT,EAZR;;AAAA;AAAA;AAAA,yBAaQT,UAAU,CAACS,IAAX,EAbR;;AAAA;AAeQR,kBAAAA,YAfR,GAeuBH,eAAe,CAACC,GAAD,EAAMC,UAAN,CAftC;AAiBED,kBAAAA,GAAG,CAACE,YAAJ,GAAmBA,YAAnB;AACAF,kBAAAA,GAAG,CAACH,QAAJ,GAAeI,UAAf;;AAlBF,uBAmBMH,GAAG,CAAC0B,eAnBV;AAAA;AAAA;AAAA;;AAAA;AAAA,yBAoBqB1B,GAAG,CAAC0B,eAAJ,CAAoBT,OAApB,CApBrB;;AAAA;AAoBIK,kBAAAA,QApBJ;;AAAA;AAAA,8BAuB6BA,QAvB7B,kCAuBUK,SAvBV,EAuBUA,SAvBV,oCAuBsB,EAvBtB;AAwBQC,kBAAAA,SAxBR,mCAyBON,QAzBP;AA0BIK,oBAAAA,SAAS,kCAAOA,SAAP,GAAqBJ,UAArB;AA1Bb;;AAAA,sBA6BO1B,KA7BP;AAAA;AAAA;AAAA;;AAAA,oDA6BqB+B,SA7BrB;;AAAA;AAAA;AAAA;AAAA,yBAgCU,wCACJ,gCAAC,OAAD,gCACMN,QADN;AAEE,oBAAA,SAAS,EAAEJ,UAFb;AAGE,oBAAA,MAAM,EAAEE,MAHV;AAIE,oBAAA,YAAY,EAAEhB;AAJhB,qBADI,CAhCV;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAyCImB,kBAAAA,UAAU,GAAG,2CAAb;AACA,sBAAIA,UAAU,CAACM,SAAf,EAA0B3B,GAAG,CAACuB,GAAJ,CAAQK,UAAR,GAAqBP,UAAU,CAACM,SAAhC;AAC1B3B,kBAAAA,GAAG,CAACH,QAAJ,CAAagC,MAAb,CAAoBC,IAApB,CAAyB,aAAzB,EAAwC;AAAEC,oBAAAA,KAAK;AAAP,mBAAxC;AACA9B,kBAAAA,UAAU,CAAC+B,GAAX,CAAeD,KAAf,CAAqB,uCAArB;;AA5CJ;AA+CQnB,kBAAAA,WA/CR,GA+CsBV,YAAY,CAAC+B,KAAb,CAAmBC,OAAnB,EA/CtB;AAgDQC,kBAAAA,WAhDR,GAgDsBC,MAAM,CAACC,IAAP,CAAYzB,WAAZ,EACjB0B,IADiB,GAEjBC,MAFiB,CAEV,UAACC,GAAD,EAAMC,GAAN,EAAc;AACpBD,oBAAAA,GAAG,CAACC,GAAD,CAAH,GAAW7B,WAAW,CAAC6B,GAAD,CAAtB;AACA,2BAAOD,GAAP;AACD,mBALiB,EAKf,EALe,CAhDtB;AAAA,oFAwDOd,SAxDP;AAyDID,oBAAAA,SAAS,kCAAOC,SAAS,CAACD,SAAjB,GAA+BJ,UAA/B,CAzDb;AA0DIT,oBAAAA,WAAW,EAAEuB,WA1DjB;AA2DItB,oBAAAA,sBAAsB,EAAEhB,QAAQ,CAAC6C,oBAAT;AA3D5B;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAfF;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,IAAqBzB,gBAArB,2DACuB,gBADvB,yDAGqB;AACjBL,IAAAA,WAAW,EAAE+B,sBAAUC,MADN;AAEjB1C,IAAAA,YAAY,EAAEyC,sBAAUC,MAFP;AAGjB/B,IAAAA,sBAAsB,EAAE8B,sBAAUC;AAHjB,GAHrB,4DASwB;AACpBhC,IAAAA,WAAW,EAAE,EADO;AAEpBV,IAAAA,YAAY,EAAE,IAFM;AAGpBW,IAAAA,sBAAsB,EAAEgC;AAHJ,GATxB;AAuHD;;AAED,IAAMC,SAAS,GAAG,SAAZA,SAAY,CAAChD,GAAD,EAAMiD,WAAN,EAAiD;AAAA,iFAAP,EAAO;AAAA,2BAA5BC,QAA4B;AAAA,MAA5BA,QAA4B,8BAAjB,KAAiB;;AACjE,MAAMrD,KAAK,GAAGqD,QAAQ,IAAI,OAAOC,MAAP,KAAkB,WAA5C;AACA,MAAMrD,MAAM,GAAGmD,WAAW,GAAGA,WAAW,CAACG,iBAAD,CAAd,GAA8BA,iBAAxD;AACA,MAAMrD,QAAQ,GAAG,wBAAW;AAAED,IAAAA,MAAM,EAANA,MAAF;AAAUuD,IAAAA,YAAY,EAAE1D;AAAxB,GAAX,CAAjB;AACAI,EAAAA,QAAQ,CAACa,IAAT;AAEA,SAAOhB,aAAa,CAACC,KAAD,EAAQC,MAAR,EAAgBC,QAAhB,EAA0BC,GAA1B,CAApB;AACD,CAPD;;eASegD,S","sourcesContent":["// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js\nimport React, { Component } from 'react';\nimport { getDataFromTree } from '@apollo/client/react/ssr';\nimport getBlazeUi from '@blaze-cms/core-ui';\nimport { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport dynamic from 'next/dynamic'; // Next.js dynamic\nimport blazeConfig from '../blaze.config';\nimport { getErrorMessage } from '../helpers';\n\nconst ErrorBoundary = dynamic(() => import('@blaze-cms/core-errors-ui'));\n\nconst APP_LOG_NAMESPACE_MAIN = 'main';\n\nfunction getWrappedApp(isSsr, config, blazeApp, App) {\n function getApolloClient(ctx, requestApp) {\n return ctx.apolloClient || requestApp.getClient() || requestApp.createClient();\n }\n\n function getRequestApp(requestApp) {\n return !requestApp && isSsr ? getBlazeUi({ config }) : blazeApp;\n }\n return class extends Component {\n static displayName = 'withBlaze(App)';\n\n static propTypes = {\n apolloState: PropTypes.object,\n apolloClient: PropTypes.object,\n processedBlazeEntities: PropTypes.object\n };\n\n static defaultProps = {\n apolloState: {},\n apolloClient: null,\n processedBlazeEntities: undefined\n };\n\n static async getInitialProps(context) {\n const { Component: _Component, router, AppTree, ctx } = context;\n let appProps = {};\n let errorProps = {};\n\n let requestApp = ctx.blazeApp;\n requestApp = getRequestApp(requestApp);\n\n requestApp.ctx.router = router;\n requestApp.ctx.req = ctx.req;\n requestApp.ctx.res = ctx.res;\n\n await blazeApp.init();\n await requestApp.init();\n\n const apolloClient = getApolloClient(ctx, requestApp);\n\n ctx.apolloClient = apolloClient;\n ctx.blazeApp = requestApp;\n if (App.getInitialProps) {\n appProps = await App.getInitialProps(context);\n }\n\n const { pageProps = {} } = appProps;\n const mainProps = {\n ...appProps,\n pageProps: { ...pageProps, ...errorProps }\n };\n\n if (!isSsr) return mainProps;\n\n try {\n await getDataFromTree(\n <AppTree\n {...appProps}\n Component={_Component}\n router={router}\n apolloClient={apolloClient}\n />\n );\n } catch (error) {\n errorProps = getErrorMessage(error);\n if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;\n ctx.blazeApp.events.emit('monitor:log', { error });\n requestApp.log.error('Error while running `getDataFromTree`', error);\n }\n\n const apolloState = apolloClient.cache.extract();\n const sortedState = Object.keys(apolloState)\n .sort()\n .reduce((acc, key) => {\n acc[key] = apolloState[key];\n return acc;\n }, {});\n\n return {\n ...mainProps,\n pageProps: { ...mainProps.pageProps, ...errorProps },\n apolloState: sortedState,\n processedBlazeEntities: blazeApp.getProcessedEntities()\n };\n }\n\n constructor(props) {\n super(props);\n this.apolloClient = props.apolloClient;\n this.state = {\n appLoaded: isSsr || blazeApp.initComplete()\n };\n this.blazeApp = blazeApp;\n }\n\n async componentDidMount() {\n if (blazeApp.initComplete()) return;\n\n await blazeApp.init();\n\n this.setState({\n appLoaded: blazeApp.initComplete()\n });\n }\n\n setApolloClient() {\n if (!this.apolloClient) {\n const { apolloState, processedBlazeEntities } = this.props;\n this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);\n setupCheckAccessToken(this.apolloClient);\n }\n }\n\n render() {\n const { appLoaded } = this.state;\n\n if (!appLoaded && !isSsr) return '...loading';\n\n this.setApolloClient();\n\n return (\n <ErrorBoundary app={this.blazeApp}>\n <App {...this.props} apolloClient={this.apolloClient} />\n </ErrorBoundary>\n );\n }\n };\n}\n\nconst withBlaze = (App, buildConfig, { forceSsr = false } = {}) => {\n const isSsr = forceSsr || typeof window === 'undefined';\n const config = buildConfig ? buildConfig(blazeConfig) : blazeConfig;\n const blazeApp = getBlazeUi({ config, logNameSpace: APP_LOG_NAMESPACE_MAIN });\n blazeApp.init();\n\n return getWrappedApp(isSsr, config, blazeApp, App);\n};\n\nexport default withBlaze;\n"],"file":"withBlaze.js"}
|
|
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports["default"] = void 0;
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _client = require("@apollo/client");
|
|
11
11
|
|
|
12
12
|
function useGetPage(queryData, id) {
|
|
13
|
-
var _useQuery = (0,
|
|
13
|
+
var _useQuery = (0, _client.useQuery)(queryData, {
|
|
14
14
|
variables: {
|
|
15
15
|
id: id
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useGetPage","queryData","id","variables","data","loading","error"],"mappings":";;;;;;;;;AAAA;;AAEA,SAASA,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,kBAAsC,
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useGetPage","queryData","id","variables","data","loading","error"],"mappings":";;;;;;;;;AAAA;;AAEA,SAASA,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,kBAAsC,sBAASD,SAAT,EAAoB;AAAEE,IAAAA,SAAS,EAAE;AAAED,MAAAA,EAAE,EAAFA;AAAF;AAAb,GAApB,CAAtC;AAAA,iCAAQE,IAAR;AAAA,MAAQA,IAAR,+BAAe,EAAf;AAAA,MAAmBC,OAAnB,aAAmBA,OAAnB;AAAA,MAA4BC,KAA5B,aAA4BA,KAA5B;;AAEA,SAAO;AAAEF,IAAAA,IAAI,EAAJA,IAAF;AAAQC,IAAAA,OAAO,EAAPA,OAAR;AAAiBC,IAAAA,KAAK,EAALA;AAAjB,GAAP;AACD;;eAEcN,U","sourcesContent":["import { useQuery } from '@apollo/client';\n\nfunction useGetPage(queryData, id) {\n const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });\n\n return { data, loading, error };\n}\n\nexport default useGetPage;\n"],"file":"use-get-page.js"}
|
package/lib/index.js
CHANGED
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["import * as reactApollo from '
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["import * as reactApollo from '@apollo/client';\n\nexport { reactApollo };\nexport { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';\nexport { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';\nexport { default as withBlaze } from './hoc/withBlaze';\nexport { default as Resolver } from './pages/Resolver';\nexport { default as BlazeDocument } from './pages/document/_document';\nexport { default as router } from './server/routes';\n"],"file":"index.js"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
|
-
import gql from '
|
|
1
|
+
import { gql } from '@apollo/client';
|
|
2
2
|
const pageDataFields = `
|
|
3
3
|
id
|
|
4
4
|
name
|
|
5
5
|
preparedPageBuilderComponents
|
|
6
6
|
canonicalUrl
|
|
7
7
|
category {
|
|
8
|
+
id
|
|
8
9
|
name
|
|
9
10
|
}
|
|
10
11
|
tags {
|
|
12
|
+
id
|
|
11
13
|
name
|
|
12
14
|
}
|
|
13
15
|
slug
|
|
14
16
|
image{
|
|
17
|
+
id
|
|
18
|
+
data
|
|
15
19
|
url
|
|
16
20
|
}
|
|
17
21
|
formattedMetaTitle
|