@blaze-cms/nextjs-tools 0.125.0-alpha.7 → 0.125.0-auth-updates.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 +5 -16
- package/README.md +10 -0
- package/build/next.base.config.js +6 -0
- package/lib/application/query/index.js +2 -10
- package/lib/application/query/index.js.map +1 -1
- package/lib/blaze.config.js +0 -13
- package/lib/blaze.config.js.map +1 -1
- package/lib/components/DebugSidebar/index.js +8 -32
- package/lib/components/DebugSidebar/index.js.map +1 -1
- package/lib/components/index.js +0 -3
- package/lib/components/index.js.map +1 -1
- package/lib/constants.js +0 -3
- package/lib/constants.js.map +1 -1
- package/lib/containers/ContentContainer.js +15 -56
- package/lib/containers/ContentContainer.js.map +1 -1
- package/lib/containers/index.js +0 -3
- package/lib/containers/index.js.map +1 -1
- package/lib/helpers/build-admin-href.js +1 -8
- package/lib/helpers/build-admin-href.js.map +1 -1
- package/lib/helpers/check-for-gtm.js +1 -9
- package/lib/helpers/check-for-gtm.js.map +1 -1
- package/lib/helpers/check-parent.js +0 -4
- package/lib/helpers/check-parent.js.map +1 -1
- package/lib/helpers/check-preview-url.js +0 -6
- package/lib/helpers/check-preview-url.js.map +1 -1
- package/lib/helpers/check-url.js +8 -87
- package/lib/helpers/check-url.js.map +1 -1
- package/lib/helpers/get-entitys-actions.js +3 -6
- package/lib/helpers/get-entitys-actions.js.map +1 -1
- package/lib/helpers/get-error-message.js +0 -4
- package/lib/helpers/get-error-message.js.map +1 -1
- package/lib/helpers/get-page-data.js +0 -26
- package/lib/helpers/get-page-data.js.map +1 -1
- package/lib/helpers/get-root-selector-classes.js +0 -14
- package/lib/helpers/get-root-selector-classes.js.map +1 -1
- package/lib/helpers/get-search-filter.js +0 -10
- package/lib/helpers/get-search-filter.js.map +1 -1
- package/lib/helpers/handle-static-routes.js +3 -27
- package/lib/helpers/handle-static-routes.js.map +1 -1
- package/lib/helpers/index.js +0 -13
- package/lib/helpers/index.js.map +1 -1
- package/lib/helpers/render-apple-tags.js +2 -9
- package/lib/helpers/render-apple-tags.js.map +1 -1
- package/lib/helpers/set-blaze-debug.js +1 -7
- package/lib/helpers/set-blaze-debug.js.map +1 -1
- package/lib/helpers/static-route-handlers/generic-file-handler.js +0 -25
- package/lib/helpers/static-route-handlers/generic-file-handler.js.map +1 -1
- package/lib/helpers/static-route-handlers/index.js +3 -18
- package/lib/helpers/static-route-handlers/index.js.map +1 -1
- package/lib/helpers/static-route-handlers/robots-txt.js +0 -11
- package/lib/helpers/static-route-handlers/robots-txt.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap-file.js +0 -16
- package/lib/helpers/static-route-handlers/sitemap-file.js.map +1 -1
- package/lib/helpers/static-route-handlers/sitemap.js +0 -12
- package/lib/helpers/static-route-handlers/sitemap.js.map +1 -1
- package/lib/hoc/withBlaze.js +23 -97
- package/lib/hoc/withBlaze.js.map +1 -1
- package/lib/hooks/use-get-page.js +8 -13
- package/lib/hooks/use-get-page.js.map +1 -1
- package/lib/index.js +0 -19
- package/lib/index.js.map +1 -1
- package/lib/pages/Resolver.js +13 -32
- package/lib/pages/Resolver.js.map +1 -1
- package/lib/pages/document/DocumentBody.js +0 -7
- package/lib/pages/document/DocumentBody.js.map +1 -1
- package/lib/pages/document/_document.js +0 -18
- package/lib/pages/document/_document.js.map +1 -1
- package/lib/server/index.js +1 -12
- package/lib/server/index.js.map +1 -1
- package/lib/server/routes.js +5 -7
- package/lib/server/routes.js.map +1 -1
- package/lib-es/application/query/index.js +0 -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 +0 -2
- 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 +5 -17
- 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 +0 -2
- package/lib-es/helpers/build-admin-href.js.map +1 -1
- package/lib-es/helpers/check-for-gtm.js +0 -2
- package/lib-es/helpers/check-for-gtm.js.map +1 -1
- package/lib-es/helpers/check-parent.js +0 -1
- package/lib-es/helpers/check-parent.js.map +1 -1
- package/lib-es/helpers/check-preview-url.js +0 -2
- package/lib-es/helpers/check-preview-url.js.map +1 -1
- package/lib-es/helpers/check-url.js +6 -32
- package/lib-es/helpers/check-url.js.map +1 -1
- package/lib-es/helpers/get-entitys-actions.js +0 -1
- package/lib-es/helpers/get-entitys-actions.js.map +1 -1
- package/lib-es/helpers/get-error-message.js +0 -2
- package/lib-es/helpers/get-error-message.js.map +1 -1
- package/lib-es/helpers/get-page-data.js +0 -5
- package/lib-es/helpers/get-page-data.js.map +1 -1
- package/lib-es/helpers/get-root-selector-classes.js +0 -2
- package/lib-es/helpers/get-root-selector-classes.js.map +1 -1
- package/lib-es/helpers/get-search-filter.js +0 -5
- package/lib-es/helpers/get-search-filter.js.map +1 -1
- package/lib-es/helpers/handle-static-routes.js +0 -3
- 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 +0 -2
- package/lib-es/helpers/render-apple-tags.js.map +1 -1
- package/lib-es/helpers/set-blaze-debug.js +0 -5
- package/lib-es/helpers/set-blaze-debug.js.map +1 -1
- package/lib-es/helpers/static-route-handlers/generic-file-handler.js +0 -5
- 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 +0 -2
- 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 +3 -21
- package/lib-es/hoc/withBlaze.js.map +1 -1
- package/lib-es/hooks/use-get-page.js +0 -2
- 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 +0 -5
- package/lib-es/pages/Resolver.js.map +1 -1
- package/lib-es/pages/document/DocumentBody.js +0 -2
- package/lib-es/pages/document/DocumentBody.js.map +1 -1
- package/lib-es/pages/document/_document.js +0 -2
- package/lib-es/pages/document/_document.js.map +1 -1
- package/lib-es/server/index.js +0 -4
- package/lib-es/server/index.js.map +1 -1
- package/lib-es/server/routes.js +0 -2
- package/lib-es/server/routes.js.map +1 -1
- package/package.json +11 -10
- package/src/helpers/check-url.js +4 -8
- package/src/hoc/withBlaze.js +3 -0
- package/tests/unit/src/helpers/check-url.test.js +2 -5
- package/tests/unit/src/hoc/withBlaze.test.js +3 -0
package/lib-es/hoc/withBlaze.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
|
-
|
|
4
3
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
5
|
-
|
|
6
4
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
7
|
-
|
|
8
5
|
// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js
|
|
9
6
|
import React, { Component } from 'react';
|
|
10
7
|
import { getDataFromTree } from '@apollo/client/react/ssr';
|
|
@@ -12,25 +9,20 @@ import getBlazeUi from '@blaze-cms/core-ui';
|
|
|
12
9
|
import { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';
|
|
13
10
|
import PropTypes from 'prop-types';
|
|
14
11
|
import dynamic from 'next/dynamic'; // Next.js dynamic
|
|
15
|
-
|
|
16
12
|
import blazeConfig from '../blaze.config';
|
|
17
13
|
import { getErrorMessage } from '../helpers';
|
|
18
14
|
const ErrorBoundary = dynamic(() => import('@blaze-cms/core-errors-ui'));
|
|
19
15
|
const APP_LOG_NAMESPACE_MAIN = 'main';
|
|
20
|
-
|
|
21
16
|
function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
22
17
|
var _class;
|
|
23
|
-
|
|
24
18
|
function getApolloClient(ctx, requestApp) {
|
|
25
19
|
return ctx.apolloClient || requestApp.getClient() || requestApp.createClient();
|
|
26
20
|
}
|
|
27
|
-
|
|
28
21
|
function getRequestApp(requestApp) {
|
|
29
22
|
return !requestApp && isSsr ? getBlazeUi({
|
|
30
23
|
config
|
|
31
24
|
}) : blazeApp;
|
|
32
25
|
}
|
|
33
|
-
|
|
34
26
|
return _class = class extends Component {
|
|
35
27
|
static async getInitialProps(context) {
|
|
36
28
|
const {
|
|
@@ -51,21 +43,19 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
51
43
|
const apolloClient = getApolloClient(ctx, requestApp);
|
|
52
44
|
ctx.apolloClient = apolloClient;
|
|
53
45
|
ctx.blazeApp = requestApp;
|
|
54
|
-
|
|
46
|
+
requestApp.events.emit('page-load:get-initial-props:before', {
|
|
47
|
+
ctx
|
|
48
|
+
});
|
|
55
49
|
if (App.getInitialProps) {
|
|
56
50
|
appProps = await App.getInitialProps(context);
|
|
57
51
|
}
|
|
58
|
-
|
|
59
52
|
const {
|
|
60
53
|
pageProps = {}
|
|
61
54
|
} = appProps;
|
|
62
|
-
|
|
63
55
|
const mainProps = _objectSpread(_objectSpread({}, appProps), {}, {
|
|
64
56
|
pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps)
|
|
65
57
|
});
|
|
66
|
-
|
|
67
58
|
if (!isSsr) return mainProps;
|
|
68
|
-
|
|
69
59
|
try {
|
|
70
60
|
await getDataFromTree( /*#__PURE__*/React.createElement(AppTree, _extends({}, appProps, {
|
|
71
61
|
Component: _Component,
|
|
@@ -80,7 +70,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
80
70
|
});
|
|
81
71
|
requestApp.log.error('Error while running `getDataFromTree`', error);
|
|
82
72
|
}
|
|
83
|
-
|
|
84
73
|
const apolloState = apolloClient.cache.extract();
|
|
85
74
|
const sortedState = Object.keys(apolloState).sort().reduce((acc, key) => {
|
|
86
75
|
acc[key] = apolloState[key];
|
|
@@ -92,7 +81,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
92
81
|
processedBlazeEntities: blazeApp.getProcessedEntities()
|
|
93
82
|
});
|
|
94
83
|
}
|
|
95
|
-
|
|
96
84
|
constructor(props) {
|
|
97
85
|
super(props);
|
|
98
86
|
this.apolloClient = props.apolloClient;
|
|
@@ -101,7 +89,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
101
89
|
};
|
|
102
90
|
this.blazeApp = blazeApp;
|
|
103
91
|
}
|
|
104
|
-
|
|
105
92
|
async componentDidMount() {
|
|
106
93
|
if (blazeApp.initComplete()) return;
|
|
107
94
|
await blazeApp.init();
|
|
@@ -109,7 +96,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
109
96
|
appLoaded: blazeApp.initComplete()
|
|
110
97
|
});
|
|
111
98
|
}
|
|
112
|
-
|
|
113
99
|
setApolloClient() {
|
|
114
100
|
if (!this.apolloClient) {
|
|
115
101
|
const {
|
|
@@ -120,7 +106,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
120
106
|
setupCheckAccessToken(this.apolloClient);
|
|
121
107
|
}
|
|
122
108
|
}
|
|
123
|
-
|
|
124
109
|
render() {
|
|
125
110
|
const {
|
|
126
111
|
appLoaded
|
|
@@ -133,7 +118,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
133
118
|
apolloClient: this.apolloClient
|
|
134
119
|
})));
|
|
135
120
|
}
|
|
136
|
-
|
|
137
121
|
}, _defineProperty(_class, "displayName", 'withBlaze(App)'), _defineProperty(_class, "propTypes", {
|
|
138
122
|
apolloState: PropTypes.object,
|
|
139
123
|
apolloClient: PropTypes.object,
|
|
@@ -144,7 +128,6 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
144
128
|
processedBlazeEntities: undefined
|
|
145
129
|
}), _class;
|
|
146
130
|
}
|
|
147
|
-
|
|
148
131
|
const withBlaze = (App, buildConfig, {
|
|
149
132
|
forceSsr = false
|
|
150
133
|
} = {}) => {
|
|
@@ -157,6 +140,5 @@ const withBlaze = (App, buildConfig, {
|
|
|
157
140
|
blazeApp.init();
|
|
158
141
|
return getWrappedApp(isSsr, config, blazeApp, App);
|
|
159
142
|
};
|
|
160
|
-
|
|
161
143
|
export default withBlaze;
|
|
162
144
|
//# sourceMappingURL=withBlaze.js.map
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
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","events","emit","pageProps","mainProps","error","errorCode","statusCode","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\n requestApp.events.emit('page-load:get-initial-props:before', { ctx });\n\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,5 +1,4 @@
|
|
|
1
1
|
import { useQuery } from '@apollo/client';
|
|
2
|
-
|
|
3
2
|
function useGetPage(queryData, id) {
|
|
4
3
|
const {
|
|
5
4
|
data = {},
|
|
@@ -16,6 +15,5 @@ function useGetPage(queryData, id) {
|
|
|
16
15
|
error
|
|
17
16
|
};
|
|
18
17
|
}
|
|
19
|
-
|
|
20
18
|
export default useGetPage;
|
|
21
19
|
//# sourceMappingURL=use-get-page.js.map
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,QAAQ,QAAQ,gBAAgB;AAEzC,SAASC,UAAU,CAACC,SAAS,EAAEC,EAAE,EAAE;EACjC,MAAM;IAAEC,IAAI,GAAG,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGN,QAAQ,CAACE,SAAS,EAAE;IAAEK,SAAS,EAAE;MAAEJ;IAAG;EAAE,CAAC,CAAC;EAEhF,OAAO;IAAEC,IAAI;IAAEC,OAAO;IAAEC;EAAM,CAAC;AACjC;AAEA,eAAeL,UAAU"}
|
package/lib-es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,WAAW,MAAM,gBAAgB;AAE7C,SAASA,WAAW;AACpB,SAASC,sBAAsB,QAAQ,6BAA6B;AACpE,SAASC,WAAW,EAAEC,mBAAmB,QAAQ,8BAA8B;AAC/E,SAASC,OAAO,IAAIC,SAAS,QAAQ,iBAAiB;AACtD,SAASD,OAAO,IAAIE,QAAQ,QAAQ,kBAAkB;AACtD,SAASF,OAAO,IAAIG,aAAa,QAAQ,4BAA4B;AACrE,SAASH,OAAO,IAAII,MAAM,QAAQ,iBAAiB"}
|
package/lib-es/pages/Resolver.js
CHANGED
|
@@ -6,7 +6,6 @@ import { DebugSidebar } from '../components';
|
|
|
6
6
|
import { checkUrl } from '../helpers';
|
|
7
7
|
import { ContentContainer } from '../containers';
|
|
8
8
|
import { NOT_FOUND_STATUS_CODE, RESOLVER_CONTAINER_CLASS } from '../constants';
|
|
9
|
-
|
|
10
9
|
const Resolver = props => {
|
|
11
10
|
const {
|
|
12
11
|
pageData,
|
|
@@ -21,12 +20,10 @@ const Resolver = props => {
|
|
|
21
20
|
errorMessage = null
|
|
22
21
|
} = props;
|
|
23
22
|
const router = useRouter();
|
|
24
|
-
|
|
25
23
|
if (disableSsr) {
|
|
26
24
|
if (process.browser) router.push('/Resolver', router.asPath);
|
|
27
25
|
return '';
|
|
28
26
|
}
|
|
29
|
-
|
|
30
27
|
if (isStatusPage) return 'OK';
|
|
31
28
|
if (!pageData || !itemId || !itemEntity) return /*#__PURE__*/React.createElement(NextError, {
|
|
32
29
|
statusCode: errorCode,
|
|
@@ -45,9 +42,7 @@ const Resolver = props => {
|
|
|
45
42
|
itemEntity: itemEntity
|
|
46
43
|
}));
|
|
47
44
|
};
|
|
48
|
-
|
|
49
45
|
Resolver.getInitialProps = async props => checkUrl(props);
|
|
50
|
-
|
|
51
46
|
Resolver.propTypes = {
|
|
52
47
|
itemId: PropTypes.string,
|
|
53
48
|
itemEntity: PropTypes.string,
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,SAAS,QAAQ,aAAa;AACvC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,YAAY,QAAQ,eAAe;AAC5C,SAASC,QAAQ,QAAQ,YAAY;AACrC,SAASC,gBAAgB,QAAQ,eAAe;AAChD,SAASC,qBAAqB,EAAEC,wBAAwB,QAAQ,cAAc;AAE9E,MAAMC,QAAQ,GAAGC,KAAK,IAAI;EACxB,MAAM;IACJC,QAAQ;IACRC,MAAM;IACNC,UAAU;IACVC,YAAY;IACZC,OAAO;IACPC,UAAU;IACVC,mBAAmB,GAAGT,wBAAwB;IAC9CU,SAAS,GAAG,KAAK;IACjBC,SAAS,GAAGZ,qBAAqB;IACjCa,YAAY,GAAG;EACjB,CAAC,GAAGV,KAAK;EACT,MAAMW,MAAM,GAAGnB,SAAS,EAAE;EAE1B,IAAIc,UAAU,EAAE;IACd,IAAIM,OAAO,CAACC,OAAO,EAAEF,MAAM,CAACG,IAAI,CAAC,WAAW,EAAEH,MAAM,CAACI,MAAM,CAAC;IAC5D,OAAO,EAAE;EACX;EAEA,IAAIX,YAAY,EAAE,OAAO,IAAI;EAE7B,IAAI,CAACH,QAAQ,IAAI,CAACC,MAAM,IAAI,CAACC,UAAU,EACrC,oBAAO,oBAAC,SAAS;IAAC,UAAU,EAAEM,SAAU;IAAC,KAAK,EAAEC;EAAa,EAAG;EAElE,oBACE;IAAK,SAAS,EAAEH;EAAoB,gBAClC,oBAAC,gBAAgB;IACf,QAAQ,EAAEN,QAAS;IACnB,MAAM,EAAEC,MAAO;IACf,UAAU,EAAEC,UAAW;IACvB,SAAS,EAAEK,SAAU;IACrB,OAAO,EAAEH;EAAQ,EACjB,eAEF,oBAAC,YAAY;IAAC,MAAM,EAAEH,MAAO;IAAC,UAAU,EAAEC;EAAW,EAAG,CACpD;AAEV,CAAC;AAEDJ,QAAQ,CAACiB,eAAe,GAAG,MAAMhB,KAAK,IAAIL,QAAQ,CAACK,KAAK,CAAC;AAEzDD,QAAQ,CAACkB,SAAS,GAAG;EACnBf,MAAM,EAAET,SAAS,CAACyB,MAAM;EACxBf,UAAU,EAAEV,SAAS,CAACyB,MAAM;EAC5BjB,QAAQ,EAAER,SAAS,CAAC0B,MAAM;EAC1Bf,YAAY,EAAEX,SAAS,CAAC2B,IAAI;EAC5Bf,OAAO,EAAEZ,SAAS,CAACyB,MAAM;EACzBV,SAAS,EAAEf,SAAS,CAAC2B,IAAI;EACzBX,SAAS,EAAEhB,SAAS,CAAC4B,MAAM;EAC3Bf,UAAU,EAAEb,SAAS,CAAC2B,IAAI;EAC1BV,YAAY,EAAEjB,SAAS,CAACyB,MAAM;EAC9BX,mBAAmB,EAAEd,SAAS,CAACyB;AACjC,CAAC;AAEDnB,QAAQ,CAACuB,YAAY,GAAG;EACtBpB,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,IAAI;EAChBF,QAAQ,EAAE,IAAI;EACdG,YAAY,EAAE,KAAK;EACnBC,OAAO,EAAE,EAAE;EACXG,SAAS,EAAE,KAAK;EAChBC,SAAS,EAAEZ,qBAAqB;EAChCS,UAAU,EAAE,KAAK;EACjBI,YAAY,EAAE,IAAI;EAClBH,mBAAmB,EAAET;AACvB,CAAC;AAED,eAAeC,QAAQ"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { Main, NextScript } from 'next/document';
|
|
4
|
-
|
|
5
4
|
const DocumentBody = ({
|
|
6
5
|
children
|
|
7
6
|
}) => /*#__PURE__*/React.createElement("body", null, /*#__PURE__*/React.createElement(Main, null), /*#__PURE__*/React.createElement(NextScript, null), children);
|
|
8
|
-
|
|
9
7
|
DocumentBody.propTypes = {
|
|
10
8
|
children: PropTypes.object.isRequired
|
|
11
9
|
};
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,IAAI,EAAEC,UAAU,QAAQ,eAAe;AAEhD,MAAMC,YAAY,GAAG,CAAC;EAAEC;AAAS,CAAC,kBAChC,+CACE,oBAAC,IAAI,OAAG,eACR,oBAAC,UAAU,OAAG,EACbA,QAAQ,CAEZ;AAEDD,YAAY,CAACE,SAAS,GAAG;EACvBD,QAAQ,EAAEJ,SAAS,CAACM,MAAM,CAACC;AAC7B,CAAC;AAED,eAAeJ,YAAY"}
|
|
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
|
|
|
3
3
|
import Document, { Html, Head } from 'next/document';
|
|
4
4
|
import DocumentBody from './DocumentBody';
|
|
5
5
|
import { renderAppleTags } from '../../helpers';
|
|
6
|
-
|
|
7
6
|
const BlazeDocument = ({
|
|
8
7
|
children
|
|
9
8
|
}) => /*#__PURE__*/React.createElement(Html, {
|
|
@@ -13,7 +12,6 @@ const BlazeDocument = ({
|
|
|
13
12
|
href: "/static/img/favicon.png",
|
|
14
13
|
type: "image/x-icon"
|
|
15
14
|
}), renderAppleTags()), children);
|
|
16
|
-
|
|
17
15
|
BlazeDocument.Document = Document;
|
|
18
16
|
BlazeDocument.Body = DocumentBody;
|
|
19
17
|
BlazeDocument.propTypes = {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,QAAQ,IAAIC,IAAI,EAAEC,IAAI,QAAQ,eAAe;AACpD,OAAOC,YAAY,MAAM,gBAAgB;AACzC,SAASC,eAAe,QAAQ,eAAe;AAE/C,MAAMC,aAAa,GAAG,CAAC;EAAEC;AAAS,CAAC,kBACjC,oBAAC,IAAI;EAAC,IAAI,EAAC;AAAI,gBACb,oBAAC,IAAI,qBACH;EAAM,GAAG,EAAC,MAAM;EAAC,IAAI,EAAC,yBAAyB;EAAC,IAAI,EAAC;AAAc,EAAG,EACrEF,eAAe,EAAE,CACb,EACNE,QAAQ,CAEZ;AAEDD,aAAa,CAACL,QAAQ,GAAGA,QAAQ;AACjCK,aAAa,CAACE,IAAI,GAAGJ,YAAY;AAEjCE,aAAa,CAACG,SAAS,GAAG;EACxBF,QAAQ,EAAEP,SAAS,CAACU,MAAM,CAACC;AAC7B,CAAC;AAED,eAAeL,aAAa"}
|
package/lib-es/server/index.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
const {
|
|
2
2
|
createServer
|
|
3
3
|
} = require('http');
|
|
4
|
-
|
|
5
4
|
const Router = require('./routes');
|
|
6
|
-
|
|
7
5
|
const port = parseInt(process.env.PORT, 10) || 3000;
|
|
8
|
-
|
|
9
6
|
async function prepareServer(nextApp) {
|
|
10
7
|
const handler = Router.getRequestHandler(nextApp);
|
|
11
8
|
await nextApp.prepare();
|
|
@@ -14,6 +11,5 @@ async function prepareServer(nextApp) {
|
|
|
14
11
|
handler
|
|
15
12
|
};
|
|
16
13
|
}
|
|
17
|
-
|
|
18
14
|
module.exports = prepareServer;
|
|
19
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAAa,CAAC,GAAGC,OAAO,CAAC,MAAM,CAAC;AACxC,MAAMC,MAAM,GAAGD,OAAO,CAAC,UAAU,CAAC;AAElC,MAAME,IAAI,GAAGC,QAAQ,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI;AAEnD,eAAeC,aAAa,CAACC,OAAO,EAAE;EACpC,MAAMC,OAAO,GAAGR,MAAM,CAACS,iBAAiB,CAACF,OAAO,CAAC;EAEjD,MAAMA,OAAO,CAACG,OAAO,EAAE;EAEvB,OAAO;IAAEC,GAAG,EAAE,MAAMb,YAAY,CAACU,OAAO,CAAC,CAACI,MAAM,CAACX,IAAI,CAAC;IAAEO;EAAQ,CAAC;AACnE;AAEAK,MAAM,CAACC,OAAO,GAAGR,aAAa"}
|
package/lib-es/server/routes.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const Router = require('nextjs-dynamic-routes');
|
|
2
|
-
|
|
3
2
|
const {
|
|
4
3
|
ROUTE_REGEX,
|
|
5
4
|
PREVIEW_REGEX,
|
|
@@ -7,7 +6,6 @@ const {
|
|
|
7
6
|
ROUTE_PATTERN_SITEMAP_FILE_REGEX,
|
|
8
7
|
ROUTE_PATTERN_ROBOTS_TXT
|
|
9
8
|
} = require('../constants');
|
|
10
|
-
|
|
11
9
|
const router = new Router();
|
|
12
10
|
router.add({
|
|
13
11
|
name: 'resolver',
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,uBAAuB,CAAC;AAC/C,MAAM;EACJC,WAAW;EACXC,aAAa;EACbC,qBAAqB;EACrBC,gCAAgC;EAChCC;AACF,CAAC,GAAGL,OAAO,CAAC,cAAc,CAAC;AAE3B,MAAMM,MAAM,GAAG,IAAIP,MAAM,EAAE;AAE3BO,MAAM,CAACC,GAAG,CAAC;EACTC,IAAI,EAAE,UAAU;EAChBC,OAAO,EAAER,WAAW;EACpBS,IAAI,EAAE;AACR,CAAC,CAAC;AAEFJ,MAAM,CAACC,GAAG,CAAC;EACTC,IAAI,EAAE,SAAS;EACfC,OAAO,EAAEP,aAAa;EACtBQ,IAAI,EAAE;AACR,CAAC,CAAC;AAEFJ,MAAM,CAACC,GAAG,CAAC;EACTC,IAAI,EAAE,SAAS;EACfC,OAAO,EAAEN,qBAAqB;EAC9BO,IAAI,EAAE;AACR,CAAC,CAAC;AAEFJ,MAAM,CAACC,GAAG,CAAC;EACTC,IAAI,EAAE,cAAc;EACpBC,OAAO,EAAEL,gCAAgC;EACzCM,IAAI,EAAE;AACR,CAAC,CAAC;AAEFJ,MAAM,CAACC,GAAG,CAAC;EACTC,IAAI,EAAE,QAAQ;EACdC,OAAO,EAAEJ,wBAAwB;EACjCK,IAAI,EAAE;AACR,CAAC,CAAC;AAEFC,MAAM,CAACC,OAAO,GAAGN,MAAM"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/nextjs-tools",
|
|
3
|
-
"version": "0.125.0-
|
|
3
|
+
"version": "0.125.0-auth-updates.0",
|
|
4
4
|
"description": "Blaze nextjs tools",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -28,18 +28,19 @@
|
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@apollo/client": "3.5.x",
|
|
31
|
-
"@blaze-cms/core-auth-ui": "
|
|
31
|
+
"@blaze-cms/core-auth-ui": "0.125.0-auth-updates.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
|
-
"@blaze-cms/nextjs-components": "
|
|
36
|
-
"@blaze-cms/plugin-auth-fe": "
|
|
37
|
-
"@blaze-cms/plugin-
|
|
38
|
-
"@blaze-cms/plugin-
|
|
39
|
-
"@blaze-cms/plugin-
|
|
35
|
+
"@blaze-cms/nextjs-components": "0.125.0-auth-updates.0",
|
|
36
|
+
"@blaze-cms/plugin-auth-fe": "0.125.0-auth-updates.0",
|
|
37
|
+
"@blaze-cms/plugin-auth-local-fe": "0.125.0-auth-updates.0",
|
|
38
|
+
"@blaze-cms/plugin-google-maps-fe": "0.125.0-auth-updates.0",
|
|
39
|
+
"@blaze-cms/plugin-gtm-fe": "0.125.0-auth-updates.0",
|
|
40
|
+
"@blaze-cms/plugin-page-builder-fe": "0.125.0-auth-updates.0",
|
|
40
41
|
"@blaze-cms/plugin-preview-fe": "^0.121.0",
|
|
41
|
-
"@blaze-cms/plugin-search-ui": "0.125.0-
|
|
42
|
-
"@blaze-cms/react-page-builder": "0.125.0-
|
|
42
|
+
"@blaze-cms/plugin-search-ui": "0.125.0-auth-updates.0",
|
|
43
|
+
"@blaze-cms/react-page-builder": "0.125.0-auth-updates.0",
|
|
43
44
|
"@blaze-cms/setup-ui": "^0.92.0",
|
|
44
45
|
"autoprefixer": "^10.2.3",
|
|
45
46
|
"core-js": "^3.2.1",
|
|
@@ -67,5 +68,5 @@
|
|
|
67
68
|
"lib/*",
|
|
68
69
|
"lib-es/*"
|
|
69
70
|
],
|
|
70
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "d7b31bb653375863126988797ddbf4f75dd55a7b"
|
|
71
72
|
}
|
package/src/helpers/check-url.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { parseUrl } from 'query-string';
|
|
2
2
|
import { getUnpublishedEntityName } from '@blaze-cms/react-page-builder';
|
|
3
|
-
import {
|
|
3
|
+
import { checkAccessToken } from '@blaze-cms/core-auth-ui';
|
|
4
4
|
import { HTTPS, DOUBLE_SLASH, COLON, NOT_FOUND_STATUS_CODE } from '../constants';
|
|
5
5
|
import { checkUrlQuery } from '../application/query';
|
|
6
6
|
import checkParent from './check-parent';
|
|
@@ -11,13 +11,8 @@ import getRootSelectorClasses from './get-root-selector-classes';
|
|
|
11
11
|
|
|
12
12
|
const getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);
|
|
13
13
|
|
|
14
|
-
const hasAuth = req => {
|
|
15
|
-
if (!req) return false;
|
|
16
|
-
return !!getAccessToken(req.headers.cookie);
|
|
17
|
-
};
|
|
18
|
-
|
|
19
14
|
const checkUrl = async props => {
|
|
20
|
-
const { asPath, apolloClient, res, req, query, blazeApp } = props;
|
|
15
|
+
const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;
|
|
21
16
|
const fullUrl = getFullUrl(req, asPath);
|
|
22
17
|
const { url } = parseUrl(asPath);
|
|
23
18
|
|
|
@@ -35,8 +30,9 @@ const checkUrl = async props => {
|
|
|
35
30
|
|
|
36
31
|
const previewData = checkPreviewUrl(url, query);
|
|
37
32
|
|
|
38
|
-
if (!previewData &&
|
|
33
|
+
if (!previewData && disableSsr) return { disableSsr: true };
|
|
39
34
|
|
|
35
|
+
// todo: auth remove and replace with an event
|
|
40
36
|
await checkAccessToken(apolloClient);
|
|
41
37
|
|
|
42
38
|
if (previewData) return getPreviewData(previewData, apolloClient);
|
package/src/hoc/withBlaze.js
CHANGED
|
@@ -54,6 +54,9 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
|
|
|
54
54
|
|
|
55
55
|
ctx.apolloClient = apolloClient;
|
|
56
56
|
ctx.blazeApp = requestApp;
|
|
57
|
+
|
|
58
|
+
requestApp.events.emit('page-load:get-initial-props:before', { ctx });
|
|
59
|
+
|
|
57
60
|
if (App.getInitialProps) {
|
|
58
61
|
appProps = await App.getInitialProps(context);
|
|
59
62
|
}
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
import '@testing-library/jest-dom/extend-expect';
|
|
6
|
-
import { getAccessToken } from '@blaze-cms/core-auth-ui';
|
|
7
6
|
|
|
8
7
|
import { checkUrl } from '../../../../src/helpers';
|
|
9
8
|
import { ROUTE_PATTERN_SITEMAP, NOT_FOUND_STATUS_CODE } from '../../../../src/constants';
|
|
@@ -15,8 +14,7 @@ import getRootSelectorClasses from '../../../../src/helpers/get-root-selector-cl
|
|
|
15
14
|
const { setEnvs, deleteEnvs } = require('@blaze-cms/tools/test-helpers/test-files/test-env');
|
|
16
15
|
|
|
17
16
|
jest.mock('@blaze-cms/core-auth-ui', () => ({
|
|
18
|
-
checkAccessToken: jest.fn()
|
|
19
|
-
getAccessToken: jest.fn(() => false)
|
|
17
|
+
checkAccessToken: jest.fn()
|
|
20
18
|
}));
|
|
21
19
|
|
|
22
20
|
jest.mock('../../../../src/helpers/handle-static-routes', () => ({
|
|
@@ -140,8 +138,7 @@ describe('Check url', () => {
|
|
|
140
138
|
});
|
|
141
139
|
|
|
142
140
|
it('should return disableSsr prop', async () => {
|
|
143
|
-
|
|
144
|
-
const result = await checkUrl({ ...props });
|
|
141
|
+
const result = await checkUrl({ ...props, disableSsr: true });
|
|
145
142
|
expect(result).toHaveProperty('disableSsr', true);
|
|
146
143
|
});
|
|
147
144
|
|
|
@@ -125,6 +125,9 @@ describe('withBlaze HOC', () => {
|
|
|
125
125
|
router,
|
|
126
126
|
apolloClient: blazeMock.createClient()
|
|
127
127
|
});
|
|
128
|
+
expect(blazeMock.events.emit).toHaveBeenCalledWith('page-load:get-initial-props:before', {
|
|
129
|
+
ctx: context.ctx
|
|
130
|
+
});
|
|
128
131
|
expect(blazeMock.init).toHaveBeenCalledTimes(3);
|
|
129
132
|
expect(blazeMock.getProcessedEntities).toHaveBeenCalledTimes(2);
|
|
130
133
|
});
|