@blaze-cms/nextjs-tools 0.124.0-alpha.2 → 0.124.0-alpha.20
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 +155 -0
- package/lib/application/query/index.js +2 -2
- package/lib/application/query/index.js.map +1 -1
- package/lib/blaze.config.js.map +1 -1
- package/lib/components/DebugSidebar/index.js.map +1 -1
- package/lib/components/index.js.map +1 -1
- package/lib/constants.js.map +1 -1
- package/lib/containers/ContentContainer.js.map +1 -1
- package/lib/containers/index.js.map +1 -1
- package/lib/helpers/build-admin-href.js.map +1 -1
- package/lib/helpers/check-for-gtm.js.map +1 -1
- package/lib/helpers/check-parent.js.map +1 -1
- package/lib/helpers/check-preview-url.js.map +1 -1
- package/lib/helpers/check-url.js +20 -14
- package/lib/helpers/check-url.js.map +1 -1
- package/lib/helpers/get-entitys-actions.js.map +1 -1
- package/lib/helpers/get-error-message.js.map +1 -1
- package/lib/helpers/get-page-data.js.map +1 -1
- package/lib/helpers/get-root-selector-classes.js.map +1 -1
- package/lib/helpers/get-search-filter.js.map +1 -1
- package/lib/helpers/handle-static-routes.js.map +1 -1
- package/lib/helpers/index.js.map +1 -1
- package/lib/helpers/render-apple-tags.js.map +1 -1
- package/lib/helpers/set-blaze-debug.js.map +1 -1
- package/lib/helpers/static-route-handlers/generic-file-handler.js.map +1 -1
- package/lib/helpers/static-route-handlers/index.js.map +1 -1
- package/lib/helpers/static-route-handlers/robots-txt.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap-file.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap.js.map +1 -1
- package/lib/hoc/withBlaze.js.map +1 -1
- package/lib/hooks/use-get-page.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/pages/Resolver.js.map +1 -1
- package/lib/pages/document/DocumentBody.js.map +1 -1
- package/lib/pages/document/_document.js.map +1 -1
- package/lib/server/index.js.map +1 -1
- package/lib/server/routes.js.map +1 -1
- package/lib-es/application/query/index.js +3 -2
- package/lib-es/application/query/index.js.map +1 -1
- package/lib-es/blaze.config.js.map +1 -1
- package/lib-es/components/DebugSidebar/index.js.map +1 -1
- package/lib-es/components/index.js.map +1 -1
- package/lib-es/constants.js.map +1 -1
- package/lib-es/containers/ContentContainer.js.map +1 -1
- package/lib-es/containers/index.js.map +1 -1
- package/lib-es/helpers/build-admin-href.js.map +1 -1
- package/lib-es/helpers/check-for-gtm.js.map +1 -1
- package/lib-es/helpers/check-parent.js.map +1 -1
- package/lib-es/helpers/check-preview-url.js.map +1 -1
- package/lib-es/helpers/check-url.js +10 -3
- package/lib-es/helpers/check-url.js.map +1 -1
- package/lib-es/helpers/get-entitys-actions.js.map +1 -1
- package/lib-es/helpers/get-error-message.js.map +1 -1
- package/lib-es/helpers/get-page-data.js.map +1 -1
- package/lib-es/helpers/get-root-selector-classes.js.map +1 -1
- package/lib-es/helpers/get-search-filter.js.map +1 -1
- package/lib-es/helpers/handle-static-routes.js.map +1 -1
- package/lib-es/helpers/index.js.map +1 -1
- package/lib-es/helpers/render-apple-tags.js.map +1 -1
- package/lib-es/helpers/set-blaze-debug.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/generic-file-handler.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/index.js.map +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.map +1 -1
- package/lib-es/helpers/static-route-handlers/sitemap.js.map +1 -1
- package/lib-es/hoc/withBlaze.js.map +1 -1
- package/lib-es/hooks/use-get-page.js.map +1 -1
- package/lib-es/index.js.map +1 -1
- package/lib-es/pages/Resolver.js.map +1 -1
- package/lib-es/pages/document/DocumentBody.js.map +1 -1
- package/lib-es/pages/document/_document.js.map +1 -1
- package/lib-es/server/index.js.map +1 -1
- package/lib-es/server/routes.js.map +1 -1
- package/package.json +8 -8
- package/src/application/query/index.js +3 -2
- package/src/helpers/check-url.js +9 -5
- package/tests/unit/src/application/query/__snapshots__/index.test.js.snap +800 -0
- package/tests/unit/src/application/query/index.test.js +19 -0
- package/tests/unit/src/helpers/check-url.test.js +32 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":["sitemap","sitemapFile","robots","pattern","sitemapPattern","handler","sitemapHandler","sitemapFilePattern","sitemapFileHandler","robotsTxtPattern","robotsTxtHandler","config","Map","set"],"sources":["../../../src/helpers/static-route-handlers/index.js"],"sourcesContent":["import * as sitemap from './sitemap';\nimport * as sitemapFile from './sitemap-file';\nimport * as robots from './robots-txt';\n\nconst { pattern: sitemapPattern, handler: sitemapHandler } = sitemap;\nconst { pattern: sitemapFilePattern, handler: sitemapFileHandler } = sitemapFile;\nconst { pattern: robotsTxtPattern, handler: robotsTxtHandler } = robots;\n\nconst config = new Map();\nconfig.set(sitemapPattern, sitemapHandler);\nconfig.set(sitemapFilePattern, sitemapFileHandler);\nconfig.set(robotsTxtPattern, robotsTxtHandler);\n\nexport default config;\n"],"mappings":"AAAA,OAAO,KAAKA,OAAZ,MAAyB,WAAzB;AACA,OAAO,KAAKC,WAAZ,MAA6B,gBAA7B;AACA,OAAO,KAAKC,MAAZ,MAAwB,cAAxB;AAEA,MAAM;EAAEC,OAAO,EAAEC,cAAX;EAA2BC,OAAO,EAAEC;AAApC,IAAuDN,OAA7D;AACA,MAAM;EAAEG,OAAO,EAAEI,kBAAX;EAA+BF,OAAO,EAAEG;AAAxC,IAA+DP,WAArE;AACA,MAAM;EAAEE,OAAO,EAAEM,gBAAX;EAA6BJ,OAAO,EAAEK;AAAtC,IAA2DR,MAAjE;AAEA,MAAMS,MAAM,GAAG,IAAIC,GAAJ,EAAf;AACAD,MAAM,CAACE,GAAP,CAAWT,cAAX,EAA2BE,cAA3B;AACAK,MAAM,CAACE,GAAP,CAAWN,kBAAX,EAA+BC,kBAA/B;AACAG,MAAM,CAACE,GAAP,CAAWJ,gBAAX,EAA6BC,gBAA7B;AAEA,eAAeC,MAAf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"robots-txt.js","names":["gql","ROUTE_PATTERN_ROBOTS_TXT","BLAZE_STATIC_ROUTE_STORE_KEY","getHandler","storeKey","process","env","fileQuery","pattern","RegExp","handler"],"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"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"],"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"sitemap-file.js","names":["gql","ROUTE_PATTERN_SITEMAP_FILE_REGEX","SITEMAP_STORE_KEY","getHandler","fileQuery","getVariables","asPath","filename","split","slice","where","storeKey","pattern","handler"],"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"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"],"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;EAAEC;AAAF,CAAtB,EAAkC;EAChC,MAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;EACA,MAAMC,KAAK,GAAG;IAAEC,QAAQ,EAAET,iBAAZ;IAA+BK;EAA/B,CAAd;EACA,OAAO;IAAEG;EAAF,CAAP;AACD;;AAED,OAAO,MAAME,OAAO,GAAGX,gCAAhB;AAEP,OAAO,MAAMY,OAAO,GAAGV,UAAU,CAACC,SAAD,EAAYC,YAAZ,CAA1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"sitemap.js","names":["gql","ROUTE_PATTERN_SITEMAP","getHandler","fileQuery","pattern","RegExp","handler"],"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"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"],"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"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"],"sources":["../../src/hoc/withBlaze.js"],"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"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"use-get-page.js","names":["useQuery","useGetPage","queryData","id","data","loading","error","variables"],"sources":["../../src/hooks/use-get-page.js"],"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"],"mappings":"AAAA,SAASA,QAAT,QAAyB,gBAAzB;;AAEA,SAASC,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;EACjC,MAAM;IAAEC,IAAI,GAAG,EAAT;IAAaC,OAAb;IAAsBC;EAAtB,IAAgCN,QAAQ,CAACE,SAAD,EAAY;IAAEK,SAAS,EAAE;MAAEJ;IAAF;EAAb,CAAZ,CAA9C;EAEA,OAAO;IAAEC,IAAF;IAAQC,OAAR;IAAiBC;EAAjB,CAAP;AACD;;AAED,eAAeL,UAAf"}
|
package/lib-es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":["reactApollo","SearchPublishedContent","MainContext","MainContextProvider","default","withBlaze","Resolver","BlazeDocument","router"],"sources":["../src/index.js"],"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"],"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"Resolver.js","names":["React","NextError","useRouter","PropTypes","DebugSidebar","checkUrl","ContentContainer","NOT_FOUND_STATUS_CODE","RESOLVER_CONTAINER_CLASS","Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","rootSelectorClasses","isPreview","errorCode","errorMessage","router","process","browser","push","asPath","getInitialProps","propTypes","string","object","bool","number","defaultProps"],"sources":["../../src/pages/Resolver.js"],"sourcesContent":["import React from 'react';\nimport NextError from 'next/error';\nimport { useRouter } from 'next/router';\nimport PropTypes from 'prop-types';\nimport { DebugSidebar } from '../components';\nimport { checkUrl } from '../helpers';\nimport { ContentContainer } from '../containers';\nimport { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';\n\nconst Resolver = props => {\n const {\n pageData,\n itemId,\n itemEntity,\n isStatusPage,\n fullUrl,\n disableSsr,\n rootSelectorClasses = RESOLVER_CONTAINER_CLASS,\n isPreview = false,\n errorCode = NOT_FOUND_STATUS_CODE,\n errorMessage = null\n } = props;\n const router = useRouter();\n\n if (disableSsr) {\n if (process.browser) router.push('/Resolver', router.asPath);\n return '';\n }\n\n if (isStatusPage) return 'OK';\n\n if (!pageData || !itemId || !itemEntity)\n return <NextError statusCode={errorCode} title={errorMessage} />;\n\n return (\n <div className={rootSelectorClasses}>\n <ContentContainer\n pageData={pageData}\n itemId={itemId}\n itemEntity={itemEntity}\n isPreview={isPreview}\n fullUrl={fullUrl}\n />\n\n <DebugSidebar itemId={itemId} itemEntity={itemEntity} />\n </div>\n );\n};\n\nResolver.getInitialProps = async props => checkUrl(props);\n\nResolver.propTypes = {\n itemId: PropTypes.string,\n itemEntity: PropTypes.string,\n pageData: PropTypes.object,\n isStatusPage: PropTypes.bool,\n fullUrl: PropTypes.string,\n isPreview: PropTypes.bool,\n errorCode: PropTypes.number,\n disableSsr: PropTypes.bool,\n errorMessage: PropTypes.string,\n rootSelectorClasses: PropTypes.string\n};\n\nResolver.defaultProps = {\n itemId: null,\n itemEntity: null,\n pageData: null,\n isStatusPage: false,\n fullUrl: '',\n isPreview: false,\n errorCode: NOT_FOUND_STATUS_CODE,\n disableSsr: false,\n errorMessage: null,\n rootSelectorClasses: RESOLVER_CONTAINER_CLASS\n};\n\nexport default Resolver;\n"],"mappings":"AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,YAAT,QAA6B,eAA7B;AACA,SAASC,QAAT,QAAyB,YAAzB;AACA,SAASC,gBAAT,QAAiC,eAAjC;AACA,SAASC,qBAAT,EAAgCC,wBAAhC,QAAgE,cAAhE;;AAEA,MAAMC,QAAQ,GAAGC,KAAK,IAAI;EACxB,MAAM;IACJC,QADI;IAEJC,MAFI;IAGJC,UAHI;IAIJC,YAJI;IAKJC,OALI;IAMJC,UANI;IAOJC,mBAAmB,GAAGT,wBAPlB;IAQJU,SAAS,GAAG,KARR;IASJC,SAAS,GAAGZ,qBATR;IAUJa,YAAY,GAAG;EAVX,IAWFV,KAXJ;EAYA,MAAMW,MAAM,GAAGnB,SAAS,EAAxB;;EAEA,IAAIc,UAAJ,EAAgB;IACd,IAAIM,OAAO,CAACC,OAAZ,EAAqBF,MAAM,CAACG,IAAP,CAAY,WAAZ,EAAyBH,MAAM,CAACI,MAAhC;IACrB,OAAO,EAAP;EACD;;EAED,IAAIX,YAAJ,EAAkB,OAAO,IAAP;EAElB,IAAI,CAACH,QAAD,IAAa,CAACC,MAAd,IAAwB,CAACC,UAA7B,EACE,oBAAO,oBAAC,SAAD;IAAW,UAAU,EAAEM,SAAvB;IAAkC,KAAK,EAAEC;EAAzC,EAAP;EAEF,oBACE;IAAK,SAAS,EAAEH;EAAhB,gBACE,oBAAC,gBAAD;IACE,QAAQ,EAAEN,QADZ;IAEE,MAAM,EAAEC,MAFV;IAGE,UAAU,EAAEC,UAHd;IAIE,SAAS,EAAEK,SAJb;IAKE,OAAO,EAAEH;EALX,EADF,eASE,oBAAC,YAAD;IAAc,MAAM,EAAEH,MAAtB;IAA8B,UAAU,EAAEC;EAA1C,EATF,CADF;AAaD,CAtCD;;AAwCAJ,QAAQ,CAACiB,eAAT,GAA2B,MAAMhB,KAAN,IAAeL,QAAQ,CAACK,KAAD,CAAlD;;AAEAD,QAAQ,CAACkB,SAAT,GAAqB;EACnBf,MAAM,EAAET,SAAS,CAACyB,MADC;EAEnBf,UAAU,EAAEV,SAAS,CAACyB,MAFH;EAGnBjB,QAAQ,EAAER,SAAS,CAAC0B,MAHD;EAInBf,YAAY,EAAEX,SAAS,CAAC2B,IAJL;EAKnBf,OAAO,EAAEZ,SAAS,CAACyB,MALA;EAMnBV,SAAS,EAAEf,SAAS,CAAC2B,IANF;EAOnBX,SAAS,EAAEhB,SAAS,CAAC4B,MAPF;EAQnBf,UAAU,EAAEb,SAAS,CAAC2B,IARH;EASnBV,YAAY,EAAEjB,SAAS,CAACyB,MATL;EAUnBX,mBAAmB,EAAEd,SAAS,CAACyB;AAVZ,CAArB;AAaAnB,QAAQ,CAACuB,YAAT,GAAwB;EACtBpB,MAAM,EAAE,IADc;EAEtBC,UAAU,EAAE,IAFU;EAGtBF,QAAQ,EAAE,IAHY;EAItBG,YAAY,EAAE,KAJQ;EAKtBC,OAAO,EAAE,EALa;EAMtBG,SAAS,EAAE,KANW;EAOtBC,SAAS,EAAEZ,qBAPW;EAQtBS,UAAU,EAAE,KARU;EAStBI,YAAY,EAAE,IATQ;EAUtBH,mBAAmB,EAAET;AAVC,CAAxB;AAaA,eAAeC,QAAf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"DocumentBody.js","names":["React","PropTypes","Main","NextScript","DocumentBody","children","propTypes","object","isRequired"],"sources":["../../../src/pages/document/DocumentBody.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { Main, NextScript } from 'next/document';\n\nconst DocumentBody = ({ children }) => (\n <body>\n <Main />\n <NextScript />\n {children}\n </body>\n);\n\nDocumentBody.propTypes = {\n children: PropTypes.object.isRequired\n};\n\nexport default DocumentBody;\n"],"mappings":"AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,SAASC,IAAT,EAAeC,UAAf,QAAiC,eAAjC;;AAEA,MAAMC,YAAY,GAAG,CAAC;EAAEC;AAAF,CAAD,kBACnB,+CACE,oBAAC,IAAD,OADF,eAEE,oBAAC,UAAD,OAFF,EAGGA,QAHH,CADF;;AAQAD,YAAY,CAACE,SAAb,GAAyB;EACvBD,QAAQ,EAAEJ,SAAS,CAACM,MAAV,CAAiBC;AADJ,CAAzB;AAIA,eAAeJ,YAAf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"_document.js","names":["React","PropTypes","Document","Html","Head","DocumentBody","renderAppleTags","BlazeDocument","children","Body","propTypes","object","isRequired"],"sources":["../../../src/pages/document/_document.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport Document, { Html, Head } from 'next/document';\nimport DocumentBody from './DocumentBody';\nimport { renderAppleTags } from '../../helpers';\n\nconst BlazeDocument = ({ children }) => (\n <Html lang=\"en\">\n <Head>\n <link rel=\"icon\" href=\"/static/img/favicon.png\" type=\"image/x-icon\" />\n {renderAppleTags()}\n </Head>\n {children}\n </Html>\n);\n\nBlazeDocument.Document = Document;\nBlazeDocument.Body = DocumentBody;\n\nBlazeDocument.propTypes = {\n children: PropTypes.object.isRequired\n};\n\nexport default BlazeDocument;\n"],"mappings":"AAAA,OAAOA,KAAP,MAAkB,OAAlB;AACA,OAAOC,SAAP,MAAsB,YAAtB;AACA,OAAOC,QAAP,IAAmBC,IAAnB,EAAyBC,IAAzB,QAAqC,eAArC;AACA,OAAOC,YAAP,MAAyB,gBAAzB;AACA,SAASC,eAAT,QAAgC,eAAhC;;AAEA,MAAMC,aAAa,GAAG,CAAC;EAAEC;AAAF,CAAD,kBACpB,oBAAC,IAAD;EAAM,IAAI,EAAC;AAAX,gBACE,oBAAC,IAAD,qBACE;EAAM,GAAG,EAAC,MAAV;EAAiB,IAAI,EAAC,yBAAtB;EAAgD,IAAI,EAAC;AAArD,EADF,EAEGF,eAAe,EAFlB,CADF,EAKGE,QALH,CADF;;AAUAD,aAAa,CAACL,QAAd,GAAyBA,QAAzB;AACAK,aAAa,CAACE,IAAd,GAAqBJ,YAArB;AAEAE,aAAa,CAACG,SAAd,GAA0B;EACxBF,QAAQ,EAAEP,SAAS,CAACU,MAAV,CAAiBC;AADH,CAA1B;AAIA,eAAeL,aAAf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":["createServer","require","Router","port","parseInt","process","env","PORT","prepareServer","nextApp","handler","getRequestHandler","prepare","run","listen","module","exports"],"sources":["../../src/server/index.js"],"sourcesContent":["const { createServer } = require('http');\nconst Router = require('./routes');\n\nconst port = parseInt(process.env.PORT, 10) || 3000;\n\nasync function prepareServer(nextApp) {\n const handler = Router.getRequestHandler(nextApp);\n\n await nextApp.prepare();\n\n return { run: () => createServer(handler).listen(port), handler };\n}\n\nmodule.exports = prepareServer;\n"],"mappings":"AAAA,MAAM;EAAEA;AAAF,IAAmBC,OAAO,CAAC,MAAD,CAAhC;;AACA,MAAMC,MAAM,GAAGD,OAAO,CAAC,UAAD,CAAtB;;AAEA,MAAME,IAAI,GAAGC,QAAQ,CAACC,OAAO,CAACC,GAAR,CAAYC,IAAb,EAAmB,EAAnB,CAAR,IAAkC,IAA/C;;AAEA,eAAeC,aAAf,CAA6BC,OAA7B,EAAsC;EACpC,MAAMC,OAAO,GAAGR,MAAM,CAACS,iBAAP,CAAyBF,OAAzB,CAAhB;EAEA,MAAMA,OAAO,CAACG,OAAR,EAAN;EAEA,OAAO;IAAEC,GAAG,EAAE,MAAMb,YAAY,CAACU,OAAD,CAAZ,CAAsBI,MAAtB,CAA6BX,IAA7B,CAAb;IAAiDO;EAAjD,CAAP;AACD;;AAEDK,MAAM,CAACC,OAAP,GAAiBR,aAAjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"routes.js","names":["Router","require","ROUTE_REGEX","PREVIEW_REGEX","ROUTE_PATTERN_SITEMAP","ROUTE_PATTERN_SITEMAP_FILE_REGEX","ROUTE_PATTERN_ROBOTS_TXT","router","add","name","pattern","page","module","exports"],"sources":["../../src/server/routes.js"],"sourcesContent":["const Router = require('nextjs-dynamic-routes');\nconst {\n ROUTE_REGEX,\n PREVIEW_REGEX,\n ROUTE_PATTERN_SITEMAP,\n ROUTE_PATTERN_SITEMAP_FILE_REGEX,\n ROUTE_PATTERN_ROBOTS_TXT\n} = require('../constants');\n\nconst router = new Router();\n\nrouter.add({\n name: 'resolver',\n pattern: ROUTE_REGEX,\n page: '/Resolver'\n});\n\nrouter.add({\n name: 'preview',\n pattern: PREVIEW_REGEX,\n page: '/Resolver'\n});\n\nrouter.add({\n name: 'sitemap',\n pattern: ROUTE_PATTERN_SITEMAP,\n page: '/Resolver'\n});\n\nrouter.add({\n name: 'sitemap file',\n pattern: ROUTE_PATTERN_SITEMAP_FILE_REGEX,\n page: '/Resolver'\n});\n\nrouter.add({\n name: 'robots',\n pattern: ROUTE_PATTERN_ROBOTS_TXT,\n page: '/Resolver'\n});\n\nmodule.exports = router;\n"],"mappings":"AAAA,MAAMA,MAAM,GAAGC,OAAO,CAAC,uBAAD,CAAtB;;AACA,MAAM;EACJC,WADI;EAEJC,aAFI;EAGJC,qBAHI;EAIJC,gCAJI;EAKJC;AALI,IAMFL,OAAO,CAAC,cAAD,CANX;;AAQA,MAAMM,MAAM,GAAG,IAAIP,MAAJ,EAAf;AAEAO,MAAM,CAACC,GAAP,CAAW;EACTC,IAAI,EAAE,UADG;EAETC,OAAO,EAAER,WAFA;EAGTS,IAAI,EAAE;AAHG,CAAX;AAMAJ,MAAM,CAACC,GAAP,CAAW;EACTC,IAAI,EAAE,SADG;EAETC,OAAO,EAAEP,aAFA;EAGTQ,IAAI,EAAE;AAHG,CAAX;AAMAJ,MAAM,CAACC,GAAP,CAAW;EACTC,IAAI,EAAE,SADG;EAETC,OAAO,EAAEN,qBAFA;EAGTO,IAAI,EAAE;AAHG,CAAX;AAMAJ,MAAM,CAACC,GAAP,CAAW;EACTC,IAAI,EAAE,cADG;EAETC,OAAO,EAAEL,gCAFA;EAGTM,IAAI,EAAE;AAHG,CAAX;AAMAJ,MAAM,CAACC,GAAP,CAAW;EACTC,IAAI,EAAE,QADG;EAETC,OAAO,EAAEJ,wBAFA;EAGTK,IAAI,EAAE;AAHG,CAAX;AAMAC,MAAM,CAACC,OAAP,GAAiBN,MAAjB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/nextjs-tools",
|
|
3
|
-
"version": "0.124.0-alpha.
|
|
3
|
+
"version": "0.124.0-alpha.20",
|
|
4
4
|
"description": "Blaze nextjs tools",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@apollo/client": "
|
|
30
|
+
"@apollo/client": "3.5.x",
|
|
31
31
|
"@blaze-cms/core-auth-ui": "^0.119.0",
|
|
32
32
|
"@blaze-cms/core-errors": "^0.118.0",
|
|
33
33
|
"@blaze-cms/core-errors-ui": "^0.119.0",
|
|
34
34
|
"@blaze-cms/core-ui": "^0.121.0",
|
|
35
35
|
"@blaze-cms/nextjs-components": "^0.124.0-alpha.2",
|
|
36
36
|
"@blaze-cms/plugin-auth-fe": "^0.121.0",
|
|
37
|
-
"@blaze-cms/plugin-google-maps-fe": "^0.124.0-alpha.
|
|
38
|
-
"@blaze-cms/plugin-gtm-fe": "^0.124.0-alpha.
|
|
39
|
-
"@blaze-cms/plugin-page-builder-fe": "^0.124.0-alpha.
|
|
37
|
+
"@blaze-cms/plugin-google-maps-fe": "^0.124.0-alpha.20",
|
|
38
|
+
"@blaze-cms/plugin-gtm-fe": "^0.124.0-alpha.20",
|
|
39
|
+
"@blaze-cms/plugin-page-builder-fe": "^0.124.0-alpha.20",
|
|
40
40
|
"@blaze-cms/plugin-preview-fe": "^0.121.0",
|
|
41
|
-
"@blaze-cms/plugin-search-ui": "^0.124.0-alpha.
|
|
42
|
-
"@blaze-cms/react-page-builder": "^0.124.0-alpha.
|
|
41
|
+
"@blaze-cms/plugin-search-ui": "^0.124.0-alpha.19",
|
|
42
|
+
"@blaze-cms/react-page-builder": "^0.124.0-alpha.20",
|
|
43
43
|
"@blaze-cms/setup-ui": "^0.92.0",
|
|
44
44
|
"autoprefixer": "^10.2.3",
|
|
45
45
|
"core-js": "^3.2.1",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"lib/*",
|
|
68
68
|
"lib-es/*"
|
|
69
69
|
],
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "2e9866310c28c3be1283e8f4516b0a5f889c1e42"
|
|
71
71
|
}
|
|
@@ -21,14 +21,15 @@ image{
|
|
|
21
21
|
}
|
|
22
22
|
formattedMetaTitle
|
|
23
23
|
formattedMetaDescription
|
|
24
|
-
__typename
|
|
24
|
+
__typename
|
|
25
|
+
cacheControlMaxAge`;
|
|
25
26
|
|
|
26
27
|
const checkUrlQuery = gql`
|
|
27
28
|
query checkUrl($url: String!) {
|
|
28
29
|
checkUrl(url: $url) {
|
|
29
30
|
itemId
|
|
30
31
|
itemEntity
|
|
31
|
-
urlTo
|
|
32
|
+
urlTo,
|
|
32
33
|
pageData: record {
|
|
33
34
|
...on ContentContentInterface {
|
|
34
35
|
${pageDataFields}
|
package/src/helpers/check-url.js
CHANGED
|
@@ -24,9 +24,10 @@ const checkUrl = async props => {
|
|
|
24
24
|
if (process.env.BLAZE_STATUS_URL && url === process.env.BLAZE_STATUS_URL) {
|
|
25
25
|
return { isStatusPage: true };
|
|
26
26
|
}
|
|
27
|
+
|
|
27
28
|
if (res) {
|
|
28
|
-
res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');
|
|
29
29
|
const handler = handleStaticRoutes.getHandler(asPath);
|
|
30
|
+
res.setHeader('Cache-Control', process.env.BLAZE_CACHE_CONTROL_HEADER || '');
|
|
30
31
|
if (handler) {
|
|
31
32
|
return handler(props);
|
|
32
33
|
}
|
|
@@ -40,13 +41,11 @@ const checkUrl = async props => {
|
|
|
40
41
|
|
|
41
42
|
if (previewData) return getPreviewData(previewData, apolloClient);
|
|
42
43
|
const urlCheckOptions = { asPath, url, apolloClient, res };
|
|
43
|
-
|
|
44
44
|
const result = await doUrlCheck({
|
|
45
45
|
...urlCheckOptions,
|
|
46
46
|
handle404Error: true,
|
|
47
47
|
blazeApp
|
|
48
48
|
});
|
|
49
|
-
|
|
50
49
|
return { ...result, fullUrl } || {};
|
|
51
50
|
};
|
|
52
51
|
|
|
@@ -79,7 +78,7 @@ const doUrlCheck = async ({ url, apolloClient, res, handle404Error, blazeApp })
|
|
|
79
78
|
try {
|
|
80
79
|
const {
|
|
81
80
|
data: {
|
|
82
|
-
checkUrl: { itemId, itemEntity, urlTo, pageData }
|
|
81
|
+
checkUrl: { itemId, itemEntity, urlTo, pageData = {} }
|
|
83
82
|
}
|
|
84
83
|
} = await apolloClient.query({
|
|
85
84
|
query: checkUrlQuery,
|
|
@@ -88,6 +87,11 @@ const doUrlCheck = async ({ url, apolloClient, res, handle404Error, blazeApp })
|
|
|
88
87
|
}
|
|
89
88
|
});
|
|
90
89
|
|
|
90
|
+
const { cacheControlMaxAge = null } = pageData;
|
|
91
|
+
if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {
|
|
92
|
+
res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);
|
|
93
|
+
}
|
|
94
|
+
|
|
91
95
|
if (urlTo && urlTo !== url) {
|
|
92
96
|
if (res) {
|
|
93
97
|
res.writeHead(301, { Location: urlTo });
|
|
@@ -125,7 +129,7 @@ const handleError = (err, res, handle404Error, blazeApp) => {
|
|
|
125
129
|
res.writeHead(500, { 'Content-Type': 'text/plain' });
|
|
126
130
|
res.write('500 Internal Server Error\n');
|
|
127
131
|
res.end();
|
|
128
|
-
} else if (handle404Error && err.graphQLErrors.length) {
|
|
132
|
+
} else if (handle404Error && err.graphQLErrors && err.graphQLErrors.length) {
|
|
129
133
|
res.statusCode = NOT_FOUND_STATUS_CODE;
|
|
130
134
|
return { errorCode: NOT_FOUND_STATUS_CODE };
|
|
131
135
|
}
|