@blaze-cms/nextjs-tools 0.118.0 → 0.119.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/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 +17 -17
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","pageDataFields","checkUrlQuery","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","pageDataFields","checkUrlQuery","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AAEA,MAAMC,cAAc,GAAI;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WArBA;AAuBA,MAAMC,aAAa,GAAGF,GAAI;AAC1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,YAAYC,cAAe;AAC3B;AACA;AACA;AACA;AACA,CAbA;;AAeA,MAAME,YAAY,GAAG,CAAC;AAAEC,EAAAA,OAAO,EAAE;AAAEC,IAAAA,GAAF;AAAOC,IAAAA;AAAP,MAAwB,EAAnC;AAAuCC,EAAAA;AAAvC,CAAD,KAAwD;AAC3E,QAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,SAAOL,GAAI;AACb;AACA,kBAAkBQ,SAAU;AAC5B,UAAUP,cAAe;AACzB;AACA;AACA;AACA,GAPE;AAQD,CAXD;;AAaA,MAAMQ,iBAAiB,GAAGT,GAAI;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CARA;AAUA,SAASE,aAAT,EAAwBC,YAAxB,EAAsCM,iBAAtC","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-es/blaze.config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/blaze.config.js"],"names":["pageBuilder","gtm","googleMaps","previewFe","authFe","plugins","Map","set","apollo","uri","process","env","BLAZE_GRAPHQL_URI"],"mappings":"AAAA,OAAOA,WAAP,MAAwB,mCAAxB;AACA,OAAOC,GAAP,MAAgB,0BAAhB;AACA,OAAOC,UAAP,MAAuB,kCAAvB;AACA,OAAOC,SAAP,MAAsB,8BAAtB;AACA,OAAOC,MAAP,MAAmB,2BAAnB;AAEA,MAAMC,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYP,WAAZ,EAAyB,EAAzB;AACAK,OAAO,CAACE,GAAR,CAAYN,GAAZ,EAAiB,EAAjB;AACAI,OAAO,CAACE,GAAR,CAAYL,UAAZ,EAAwB,EAAxB;AACAG,OAAO,CAACE,GAAR,CAAYJ,SAAZ,EAAuB,EAAvB;AACAE,OAAO,CAACE,GAAR,CAAYH,MAAZ,EAAoB,EAApB;AAEA,MAAMI,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC;
|
|
1
|
+
{"version":3,"sources":["../src/blaze.config.js"],"names":["pageBuilder","gtm","googleMaps","previewFe","authFe","plugins","Map","set","apollo","uri","process","env","BLAZE_GRAPHQL_URI","loadEntitiesInBrowser"],"mappings":"AAAA,OAAOA,WAAP,MAAwB,mCAAxB;AACA,OAAOC,GAAP,MAAgB,0BAAhB;AACA,OAAOC,UAAP,MAAuB,kCAAvB;AACA,OAAOC,SAAP,MAAsB,8BAAtB;AACA,OAAOC,MAAP,MAAmB,2BAAnB;AAEA,MAAMC,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYP,WAAZ,EAAyB,EAAzB;AACAK,OAAO,CAACE,GAAR,CAAYN,GAAZ,EAAiB,EAAjB;AACAI,OAAO,CAACE,GAAR,CAAYL,UAAZ,EAAwB,EAAxB;AACAG,OAAO,CAACE,GAAR,CAAYJ,SAAZ,EAAuB,EAAvB;AACAE,OAAO,CAACE,GAAR,CAAYH,MAAZ,EAAoB,EAApB;AAEA,MAAMI,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC,iBADJ;AAEbC,EAAAA,qBAAqB,EAAE;AAFV,CAAf;AAKA,eAAe;AAAER,EAAAA,OAAF;AAAWG,EAAAA;AAAX,CAAf","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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/check-url.js"],"names":["parseUrl","getUnpublishedEntityName","getAccessToken","checkAccessToken","HTTPS","DOUBLE_SLASH","COLON","NOT_FOUND_STATUS_CODE","checkUrlQuery","checkParent","checkPreviewUrl","handleStaticRoutes","getPageData","getRootSelectorClasses","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","getHandler","previewData","disableSsr","getPreviewData","urlCheckOptions","result","doUrlCheck","handle404Error","pageData","rootSelectorClasses","isPreview","getHost","BLAZE_FRONTEND_HOST","host","location","protocol","hostname","port","window","urlPort","data","itemId","itemEntity","urlTo","variables","writeHead","Location","end","href","err","parentPATH","handleError","events","emit","error","networkError","write","graphQLErrors","length","statusCode","errorCode"],"mappings":";;;;;;AAAA,SAASA,QAAT,QAAyB,cAAzB;AACA,SAASC,wBAAT,QAAyC,+BAAzC;AACA,SAASC,cAAT,EAAyBC,gBAAzB,QAAiD,yBAAjD;AACA,SAASC,KAAT,EAAgBC,YAAhB,EAA8BC,KAA9B,EAAqCC,qBAArC,QAAkE,cAAlE;AACA,SAASC,aAAT,QAA8B,sBAA9B;AACA,OAAOC,WAAP,MAAwB,gBAAxB;AACA,OAAOC,eAAP,MAA4B,qBAA5B;AACA,OAAOC,kBAAP,MAA+B,wBAA/B;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,sBAAP,MAAmC,6BAAnC;;AAEA,MAAMC,mBAAmB,GAAG,MAAMC,MAAM,CAACC,OAAO,CAACC,GAAR,CAAYC,iCAAb,CAAxC;;AAEA,MAAMC,OAAO,GAAGC,GAAG,IAAI;AACrB,MAAI,CAACA,GAAL,EAAU,OAAO,KAAP;AACV,SAAO,CAAC,CAAClB,cAAc,CAACkB,GAAG,CAACC,OAAJ,CAAYC,MAAb,CAAvB;AACD,CAHD;;AAKA,MAAMC,QAAQ,GAAG,MAAMC,KAAN,IAAe;AAC9B,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,YAAV;AAAwBC,IAAAA,GAAxB;AAA6BP,IAAAA,GAA7B;AAAkCQ,IAAAA,KAAlC;AAAyCC,IAAAA;AAAzC,MAAsDL,KAA5D;AACA,QAAMM,OAAO,GAAGC,UAAU,CAACX,GAAD,EAAMK,MAAN,CAA1B;AACA,QAAM;AAAEO,IAAAA;AAAF,MAAUhC,QAAQ,CAACyB,MAAD,CAAxB;;AAEA,MAAIT,OAAO,CAACC,GAAR,CAAYgB,gBAAZ,IAAgCD,GAAG,KAAKhB,OAAO,CAACC,GAAR,CAAYgB,gBAAxD,EAA0E;AACxE,WAAO;AAAEC,MAAAA,YAAY,EAAE;AAAhB,KAAP;AACD;;AACD,MAAIP,GAAJ,EAAS;
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/check-url.js"],"names":["parseUrl","getUnpublishedEntityName","getAccessToken","checkAccessToken","HTTPS","DOUBLE_SLASH","COLON","NOT_FOUND_STATUS_CODE","checkUrlQuery","checkParent","checkPreviewUrl","handleStaticRoutes","getPageData","getRootSelectorClasses","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","getHandler","previewData","disableSsr","getPreviewData","urlCheckOptions","result","doUrlCheck","handle404Error","pageData","rootSelectorClasses","isPreview","getHost","BLAZE_FRONTEND_HOST","host","location","protocol","hostname","port","window","urlPort","data","itemId","itemEntity","urlTo","variables","writeHead","Location","end","href","err","parentPATH","handleError","events","emit","error","networkError","write","graphQLErrors","length","statusCode","errorCode"],"mappings":"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","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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import gql from '
|
|
1
|
+
import { gql } from '@apollo/client';
|
|
2
2
|
import { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';
|
|
3
3
|
import getHandler from './generic-file-handler';
|
|
4
4
|
const storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["gql","ROUTE_PATTERN_ROBOTS_TXT","BLAZE_STATIC_ROUTE_STORE_KEY","getHandler","storeKey","process","env","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["gql","ROUTE_PATTERN_ROBOTS_TXT","BLAZE_STATIC_ROUTE_STORE_KEY","getHandler","storeKey","process","env","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,SAASC,wBAAT,EAAmCC,4BAAnC,QAAuE,iBAAvE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,MAAMC,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYJ,4BAAZ,IAA4CA,4BAA7D;AAEA,OAAO,MAAMK,SAAS,GAAGP,GAAI;AAC7B;AACA;AACA,4BAA4BI,QAAS;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWR,wBAAX,CAAhB;AAEP,OAAO,MAAMS,OAAO,GAAGP,UAAU,CAACI,SAAD,CAA1B","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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["gql","ROUTE_PATTERN_SITEMAP_FILE_REGEX","SITEMAP_STORE_KEY","getHandler","fileQuery","getVariables","asPath","filename","split","slice","where","storeKey","pattern","handler"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["gql","ROUTE_PATTERN_SITEMAP_FILE_REGEX","SITEMAP_STORE_KEY","getHandler","fileQuery","getVariables","asPath","filename","split","slice","where","storeKey","pattern","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,OAAO,sBAAP;AACA,SAASC,gCAAT,EAA2CC,iBAA3C,QAAoE,iBAApE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGJ,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA,CAPO;;AASP,SAASK,YAAT,CAAsB;AAAEC,EAAAA;AAAF,CAAtB,EAAkC;AAChC,QAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,QAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAET,iBAAZ;AAA+BK,IAAAA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA;AAAF,GAAP;AACD;;AAED,OAAO,MAAME,OAAO,GAAGX,gCAAhB;AAEP,OAAO,MAAMY,OAAO,GAAGV,UAAU,CAACC,SAAD,EAAYC,YAAZ,CAA1B","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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["gql","ROUTE_PATTERN_SITEMAP","getHandler","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["gql","ROUTE_PATTERN_SITEMAP","getHandler","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,OAAO,sBAAP;AACA,SAASC,qBAAT,QAAsC,iBAAtC;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGH,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWJ,qBAAX,CAAhB;AAEP,OAAO,MAAMK,OAAO,GAAGJ,UAAU,CAACC,SAAD,CAA1B","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-es/hoc/withBlaze.js
CHANGED
|
@@ -7,8 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
7
7
|
|
|
8
8
|
// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js
|
|
9
9
|
import React, { Component } from 'react';
|
|
10
|
-
import
|
|
11
|
-
import { getDataFromTree } from 'react-apollo';
|
|
10
|
+
import { getDataFromTree } from '@apollo/client/react/ssr';
|
|
12
11
|
import getBlazeUi from '@blaze-cms/core-ui';
|
|
13
12
|
import { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';
|
|
14
13
|
import PropTypes from 'prop-types';
|
|
@@ -47,8 +46,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
47
46
|
requestApp.ctx.router = router;
|
|
48
47
|
requestApp.ctx.req = ctx.req;
|
|
49
48
|
requestApp.ctx.res = ctx.res;
|
|
50
|
-
await requestApp.init();
|
|
51
49
|
await blazeApp.init();
|
|
50
|
+
await requestApp.init();
|
|
52
51
|
const apolloClient = getApolloClient(ctx, requestApp);
|
|
53
52
|
ctx.apolloClient = apolloClient;
|
|
54
53
|
ctx.blazeApp = requestApp;
|
|
@@ -57,23 +56,29 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
57
56
|
appProps = await App.getInitialProps(context);
|
|
58
57
|
}
|
|
59
58
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
59
|
+
const {
|
|
60
|
+
pageProps = {}
|
|
61
|
+
} = appProps;
|
|
62
|
+
|
|
63
|
+
const mainProps = _objectSpread(_objectSpread({}, appProps), {}, {
|
|
64
|
+
pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps)
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
if (!isSsr) return mainProps;
|
|
68
|
+
|
|
69
|
+
try {
|
|
70
|
+
await getDataFromTree( /*#__PURE__*/React.createElement(AppTree, _extends({}, appProps, {
|
|
71
|
+
Component: _Component,
|
|
72
|
+
router: router,
|
|
73
|
+
apolloClient: apolloClient
|
|
74
|
+
})));
|
|
75
|
+
} catch (error) {
|
|
76
|
+
errorProps = getErrorMessage(error);
|
|
77
|
+
if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
|
|
78
|
+
ctx.blazeApp.events.emit('monitor:log', {
|
|
79
|
+
error
|
|
80
|
+
});
|
|
81
|
+
requestApp.log.error('Error while running `getDataFromTree`', error);
|
|
77
82
|
}
|
|
78
83
|
|
|
79
84
|
const apolloState = apolloClient.cache.extract();
|
|
@@ -81,12 +86,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
81
86
|
acc[key] = apolloState[key];
|
|
82
87
|
return acc;
|
|
83
88
|
}, {});
|
|
84
|
-
|
|
85
|
-
pageProps
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps),
|
|
89
|
-
apolloState: sortedState
|
|
89
|
+
return _objectSpread(_objectSpread({}, mainProps), {}, {
|
|
90
|
+
pageProps: _objectSpread(_objectSpread({}, mainProps.pageProps), errorProps),
|
|
91
|
+
apolloState: sortedState,
|
|
92
|
+
processedBlazeEntities: blazeApp.getProcessedEntities()
|
|
90
93
|
});
|
|
91
94
|
}
|
|
92
95
|
|
|
@@ -110,9 +113,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
110
113
|
setApolloClient() {
|
|
111
114
|
if (!this.apolloClient) {
|
|
112
115
|
const {
|
|
113
|
-
apolloState
|
|
116
|
+
apolloState,
|
|
117
|
+
processedBlazeEntities
|
|
114
118
|
} = this.props;
|
|
115
|
-
this.apolloClient = blazeApp.createClient(apolloState);
|
|
119
|
+
this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
|
|
116
120
|
setupCheckAccessToken(this.apolloClient);
|
|
117
121
|
}
|
|
118
122
|
}
|
|
@@ -132,10 +136,12 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
132
136
|
|
|
133
137
|
}, _defineProperty(_class, "displayName", 'withBlaze(App)'), _defineProperty(_class, "propTypes", {
|
|
134
138
|
apolloState: PropTypes.object,
|
|
135
|
-
apolloClient: PropTypes.object
|
|
139
|
+
apolloClient: PropTypes.object,
|
|
140
|
+
processedBlazeEntities: PropTypes.object
|
|
136
141
|
}), _defineProperty(_class, "defaultProps", {
|
|
137
142
|
apolloState: {},
|
|
138
|
-
apolloClient: null
|
|
143
|
+
apolloClient: null,
|
|
144
|
+
processedBlazeEntities: undefined
|
|
139
145
|
}), _temp;
|
|
140
146
|
}
|
|
141
147
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["React","Component","
|
|
1
|
+
{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["React","Component","getDataFromTree","getBlazeUi","setupCheckAccessToken","PropTypes","dynamic","blazeConfig","getErrorMessage","ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","getInitialProps","context","_Component","router","AppTree","appProps","errorProps","req","res","init","pageProps","mainProps","error","errorCode","statusCode","events","emit","log","apolloState","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","processedBlazeEntities","getProcessedEntities","constructor","props","state","appLoaded","initComplete","componentDidMount","setState","setApolloClient","render","object","undefined","withBlaze","buildConfig","forceSsr","window","logNameSpace"],"mappings":"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","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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useQuery","useGetPage","queryData","id","data","loading","error","variables"],"mappings":"AAAA,SAASA,QAAT,QAAyB,
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useQuery","useGetPage","queryData","id","data","loading","error","variables"],"mappings":"AAAA,SAASA,QAAT,QAAyB,gBAAzB;;AAEA,SAASC,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,QAAM;AAAEC,IAAAA,IAAI,GAAG,EAAT;AAAaC,IAAAA,OAAb;AAAsBC,IAAAA;AAAtB,MAAgCN,QAAQ,CAACE,SAAD,EAAY;AAAEK,IAAAA,SAAS,EAAE;AAAEJ,MAAAA;AAAF;AAAb,GAAZ,CAA9C;AAEA,SAAO;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,GAAP;AACD;;AAED,eAAeL,UAAf","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-es/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as reactApollo from '
|
|
1
|
+
import * as reactApollo from '@apollo/client';
|
|
2
2
|
export { reactApollo };
|
|
3
3
|
export { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';
|
|
4
4
|
export { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';
|
package/lib-es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["reactApollo","SearchPublishedContent","MainContext","MainContextProvider","default","withBlaze","Resolver","BlazeDocument","router"],"mappings":"AAAA,OAAO,KAAKA,WAAZ,MAA6B,
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["reactApollo","SearchPublishedContent","MainContext","MainContextProvider","default","withBlaze","Resolver","BlazeDocument","router"],"mappings":"AAAA,OAAO,KAAKA,WAAZ,MAA6B,gBAA7B;AAEA,SAASA,WAAT;AACA,SAASC,sBAAT,QAAuC,6BAAvC;AACA,SAASC,WAAT,EAAsBC,mBAAtB,QAAiD,8BAAjD;AACA,SAASC,OAAO,IAAIC,SAApB,QAAqC,iBAArC;AACA,SAASD,OAAO,IAAIE,QAApB,QAAoC,kBAApC;AACA,SAASF,OAAO,IAAIG,aAApB,QAAyC,4BAAzC;AACA,SAASH,OAAO,IAAII,MAApB,QAAkC,iBAAlC","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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/nextjs-tools",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.119.0",
|
|
4
4
|
"description": "Blaze nextjs tools",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,38 +27,38 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@
|
|
30
|
+
"@apollo/client": "^3.5.7",
|
|
31
|
+
"@blaze-cms/core-auth-ui": "^0.119.0",
|
|
31
32
|
"@blaze-cms/core-errors": "^0.118.0",
|
|
32
|
-
"@blaze-cms/core-errors-ui": "^0.
|
|
33
|
-
"@blaze-cms/core-ui": "^0.
|
|
34
|
-
"@blaze-cms/nextjs-components": "^0.
|
|
35
|
-
"@blaze-cms/plugin-auth-fe": "^0.
|
|
36
|
-
"@blaze-cms/plugin-google-maps-fe": "^0.
|
|
37
|
-
"@blaze-cms/plugin-gtm-fe": "^0.
|
|
38
|
-
"@blaze-cms/plugin-page-builder-fe": "^0.
|
|
39
|
-
"@blaze-cms/plugin-preview-fe": "^0.
|
|
40
|
-
"@blaze-cms/plugin-search-ui": "^0.
|
|
41
|
-
"@blaze-cms/react-page-builder": "^0.
|
|
33
|
+
"@blaze-cms/core-errors-ui": "^0.119.0",
|
|
34
|
+
"@blaze-cms/core-ui": "^0.119.0",
|
|
35
|
+
"@blaze-cms/nextjs-components": "^0.119.0",
|
|
36
|
+
"@blaze-cms/plugin-auth-fe": "^0.119.0",
|
|
37
|
+
"@blaze-cms/plugin-google-maps-fe": "^0.119.0",
|
|
38
|
+
"@blaze-cms/plugin-gtm-fe": "^0.119.0",
|
|
39
|
+
"@blaze-cms/plugin-page-builder-fe": "^0.119.0",
|
|
40
|
+
"@blaze-cms/plugin-preview-fe": "^0.119.0",
|
|
41
|
+
"@blaze-cms/plugin-search-ui": "^0.119.0",
|
|
42
|
+
"@blaze-cms/react-page-builder": "^0.119.0",
|
|
42
43
|
"@blaze-cms/setup-ui": "^0.92.0",
|
|
43
44
|
"autoprefixer": "^10.2.3",
|
|
44
45
|
"core-js": "^3.2.1",
|
|
45
46
|
"cross-fetch": "^3.0.2",
|
|
46
|
-
"graphql
|
|
47
|
+
"graphql": "^16.2.0",
|
|
47
48
|
"jsonwebtoken": "^8.5.1",
|
|
48
49
|
"nextjs-dynamic-routes": "^2.5.1",
|
|
49
50
|
"postcss": "8.2.8",
|
|
50
51
|
"postcss-loader": "4.2.0",
|
|
51
52
|
"postcss-preset-env": "6.7.0",
|
|
52
53
|
"query-string": "^6.9.0",
|
|
53
|
-
"react-apollo": "^3.1.1",
|
|
54
54
|
"react-icons": "^4.3.1",
|
|
55
55
|
"regenerator-runtime": "^0.13.3",
|
|
56
56
|
"sass": "1.32.8"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"next": "
|
|
59
|
+
"next": "12.x",
|
|
60
60
|
"prop-types": "^15.7.2",
|
|
61
|
-
"react": "^
|
|
61
|
+
"react": "^17.0.2"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"nock": "^13.0.5"
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"lib/*",
|
|
68
68
|
"lib-es/*"
|
|
69
69
|
],
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "2bbdbff965c620190bc67b5bae4b210041d44c0f"
|
|
71
71
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import gql from '
|
|
1
|
+
import { gql } from '@apollo/client';
|
|
2
2
|
|
|
3
3
|
const pageDataFields = `
|
|
4
4
|
id
|
|
@@ -6,13 +6,17 @@ name
|
|
|
6
6
|
preparedPageBuilderComponents
|
|
7
7
|
canonicalUrl
|
|
8
8
|
category {
|
|
9
|
+
id
|
|
9
10
|
name
|
|
10
11
|
}
|
|
11
12
|
tags {
|
|
13
|
+
id
|
|
12
14
|
name
|
|
13
15
|
}
|
|
14
16
|
slug
|
|
15
17
|
image{
|
|
18
|
+
id
|
|
19
|
+
data
|
|
16
20
|
url
|
|
17
21
|
}
|
|
18
22
|
formattedMetaTitle
|
package/src/blaze.config.js
CHANGED
package/src/helpers/check-url.js
CHANGED
|
@@ -25,6 +25,7 @@ const checkUrl = async props => {
|
|
|
25
25
|
return { isStatusPage: true };
|
|
26
26
|
}
|
|
27
27
|
if (res) {
|
|
28
|
+
res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');
|
|
28
29
|
const handler = handleStaticRoutes.getHandler(asPath);
|
|
29
30
|
if (handler) {
|
|
30
31
|
return handler(props);
|
package/src/hoc/withBlaze.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js
|
|
2
2
|
import React, { Component } from 'react';
|
|
3
|
-
import
|
|
4
|
-
import { getDataFromTree } from 'react-apollo';
|
|
3
|
+
import { getDataFromTree } from '@apollo/client/react/ssr';
|
|
5
4
|
import getBlazeUi from '@blaze-cms/core-ui';
|
|
6
5
|
import { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';
|
|
7
6
|
import PropTypes from 'prop-types';
|
|
@@ -26,12 +25,14 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
26
25
|
|
|
27
26
|
static propTypes = {
|
|
28
27
|
apolloState: PropTypes.object,
|
|
29
|
-
apolloClient: PropTypes.object
|
|
28
|
+
apolloClient: PropTypes.object,
|
|
29
|
+
processedBlazeEntities: PropTypes.object
|
|
30
30
|
};
|
|
31
31
|
|
|
32
32
|
static defaultProps = {
|
|
33
33
|
apolloState: {},
|
|
34
|
-
apolloClient: null
|
|
34
|
+
apolloClient: null,
|
|
35
|
+
processedBlazeEntities: undefined
|
|
35
36
|
};
|
|
36
37
|
|
|
37
38
|
static async getInitialProps(context) {
|
|
@@ -46,8 +47,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
46
47
|
requestApp.ctx.req = ctx.req;
|
|
47
48
|
requestApp.ctx.res = ctx.res;
|
|
48
49
|
|
|
49
|
-
await requestApp.init();
|
|
50
50
|
await blazeApp.init();
|
|
51
|
+
await requestApp.init();
|
|
51
52
|
|
|
52
53
|
const apolloClient = getApolloClient(ctx, requestApp);
|
|
53
54
|
|
|
@@ -57,24 +58,28 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
57
58
|
appProps = await App.getInitialProps(context);
|
|
58
59
|
}
|
|
59
60
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
61
|
+
const { pageProps = {} } = appProps;
|
|
62
|
+
const mainProps = {
|
|
63
|
+
...appProps,
|
|
64
|
+
pageProps: { ...pageProps, ...errorProps }
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
if (!isSsr) return mainProps;
|
|
68
|
+
|
|
69
|
+
try {
|
|
70
|
+
await getDataFromTree(
|
|
71
|
+
<AppTree
|
|
72
|
+
{...appProps}
|
|
73
|
+
Component={_Component}
|
|
74
|
+
router={router}
|
|
75
|
+
apolloClient={apolloClient}
|
|
76
|
+
/>
|
|
77
|
+
);
|
|
78
|
+
} catch (error) {
|
|
79
|
+
errorProps = getErrorMessage(error);
|
|
80
|
+
if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
|
|
81
|
+
ctx.blazeApp.events.emit('monitor:log', { error });
|
|
82
|
+
requestApp.log.error('Error while running `getDataFromTree`', error);
|
|
78
83
|
}
|
|
79
84
|
|
|
80
85
|
const apolloState = apolloClient.cache.extract();
|
|
@@ -85,12 +90,11 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
85
90
|
return acc;
|
|
86
91
|
}, {});
|
|
87
92
|
|
|
88
|
-
const { pageProps = {} } = appProps;
|
|
89
|
-
|
|
90
93
|
return {
|
|
91
|
-
...
|
|
92
|
-
pageProps: { ...pageProps, ...errorProps },
|
|
93
|
-
apolloState: sortedState
|
|
94
|
+
...mainProps,
|
|
95
|
+
pageProps: { ...mainProps.pageProps, ...errorProps },
|
|
96
|
+
apolloState: sortedState,
|
|
97
|
+
processedBlazeEntities: blazeApp.getProcessedEntities()
|
|
94
98
|
};
|
|
95
99
|
}
|
|
96
100
|
|
|
@@ -115,8 +119,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
115
119
|
|
|
116
120
|
setApolloClient() {
|
|
117
121
|
if (!this.apolloClient) {
|
|
118
|
-
const { apolloState } = this.props;
|
|
119
|
-
this.apolloClient = blazeApp.createClient(apolloState);
|
|
122
|
+
const { apolloState, processedBlazeEntities } = this.props;
|
|
123
|
+
this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
|
|
120
124
|
setupCheckAccessToken(this.apolloClient);
|
|
121
125
|
}
|
|
122
126
|
}
|
package/src/index.js
CHANGED