@blaze-cms/nextjs-tools 0.126.0-alpha.0 → 0.126.0-alpha.6
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 +19 -0
- package/lib/pages/Resolver.js +20 -1
- package/lib/pages/Resolver.js.map +1 -1
- package/lib-es/pages/Resolver.js +14 -1
- package/lib-es/pages/Resolver.js.map +1 -1
- package/package.json +7 -7
- package/src/pages/Resolver.js +12 -1
- package/tests/unit/src/pages/Resolver.test.js +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.126.0-alpha.6](https://github.com/thebyte9/blaze/compare/v0.126.0-alpha.5...v0.126.0-alpha.6) (2023-01-16)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @blaze-cms/nextjs-tools
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [0.126.0-alpha.5](https://github.com/thebyte9/blaze/compare/v0.126.0-alpha.4...v0.126.0-alpha.5) (2023-01-12)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* content groups anchor links in the url ([#3736](https://github.com/thebyte9/blaze/issues/3736)) ([b0fb981](https://github.com/thebyte9/blaze/commit/b0fb9814a62bba34e005537a7410550b1ac79afc))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
# [0.126.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.125.0...v0.126.0-alpha.0) (2022-12-02)
|
|
7
26
|
|
|
8
27
|
**Note:** Version bump only for package @blaze-cms/nextjs-tools
|
package/lib/pages/Resolver.js
CHANGED
|
@@ -8,6 +8,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports["default"] = void 0;
|
|
9
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
|
+
require("core-js/modules/es.array.iterator.js");
|
|
12
|
+
require("core-js/modules/es.object.to-string.js");
|
|
13
|
+
require("core-js/modules/es.string.iterator.js");
|
|
14
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
15
|
+
require("core-js/modules/web.url.js");
|
|
16
|
+
require("core-js/modules/web.url-search-params.js");
|
|
17
|
+
require("core-js/modules/es.date.now.js");
|
|
18
|
+
require("core-js/modules/es.date.to-string.js");
|
|
11
19
|
var _react = _interopRequireDefault(require("react"));
|
|
12
20
|
var _error = _interopRequireDefault(require("next/error"));
|
|
13
21
|
var _router = require("next/router");
|
|
@@ -33,7 +41,18 @@ var Resolver = function Resolver(props) {
|
|
|
33
41
|
errorMessage = _props$errorMessage === void 0 ? null : _props$errorMessage;
|
|
34
42
|
var router = (0, _router.useRouter)();
|
|
35
43
|
if (disableSsr) {
|
|
36
|
-
if (
|
|
44
|
+
if (typeof window !== 'undefined') {
|
|
45
|
+
var asPath = router.asPath;
|
|
46
|
+
if (window.location.hash) {
|
|
47
|
+
// handle nextjs issue not calling getInitialProps if pushing a url with a hash in it
|
|
48
|
+
// we add a new query string param to force calling getInitialProps
|
|
49
|
+
// this should only happen if disableSsr and window.location.hash
|
|
50
|
+
var url = new URL(router.asPath, window.location.href);
|
|
51
|
+
if (url.hash) url.searchParams.set('_h', Date.now());
|
|
52
|
+
asPath = url;
|
|
53
|
+
}
|
|
54
|
+
router.push('/Resolver', asPath);
|
|
55
|
+
}
|
|
37
56
|
return '';
|
|
38
57
|
}
|
|
39
58
|
if (isStatusPage) return 'OK';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resolver.js","names":["Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","rootSelectorClasses","RESOLVER_CONTAINER_CLASS","isPreview","errorCode","NOT_FOUND_STATUS_CODE","errorMessage","router","useRouter","
|
|
1
|
+
{"version":3,"file":"Resolver.js","names":["Resolver","props","pageData","itemId","itemEntity","isStatusPage","fullUrl","disableSsr","rootSelectorClasses","RESOLVER_CONTAINER_CLASS","isPreview","errorCode","NOT_FOUND_STATUS_CODE","errorMessage","router","useRouter","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","getInitialProps","checkUrl","propTypes","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 (typeof window !== 'undefined') {\n let { asPath } = router;\n if (window.location.hash) {\n // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n // we add a new query string param to force calling getInitialProps\n // this should only happen if disableSsr and window.location.hash\n const url = new URL(router.asPath, window.location.href);\n if (url.hash) url.searchParams.set('_h', Date.now());\n asPath = url;\n }\n router.push('/Resolver', asPath);\n }\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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA,IAAMA,QAAQ,GAAG,SAAXA,QAAQ,CAAGC,KAAK,EAAI;EACxB,IACEC,QAAQ,GAUND,KAAK,CAVPC,QAAQ;IACRC,MAAM,GASJF,KAAK,CATPE,MAAM;IACNC,UAAU,GAQRH,KAAK,CARPG,UAAU;IACVC,YAAY,GAOVJ,KAAK,CAPPI,YAAY;IACZC,OAAO,GAMLL,KAAK,CANPK,OAAO;IACPC,UAAU,GAKRN,KAAK,CALPM,UAAU;IAAA,wBAKRN,KAAK,CAJPO,mBAAmB;IAAnBA,mBAAmB,sCAAGC,mCAAwB;IAAA,mBAI5CR,KAAK,CAHPS,SAAS;IAATA,SAAS,iCAAG,KAAK;IAAA,mBAGfT,KAAK,CAFPU,SAAS;IAATA,SAAS,iCAAGC,gCAAqB;IAAA,sBAE/BX,KAAK,CADPY,YAAY;IAAZA,YAAY,oCAAG,IAAI;EAErB,IAAMC,MAAM,GAAG,IAAAC,iBAAS,GAAE;EAE1B,IAAIR,UAAU,EAAE;IACd,IAAI,OAAOS,MAAM,KAAK,WAAW,EAAE;MACjC,IAAMC,MAAM,GAAKH,MAAM,CAAjBG,MAAM;MACZ,IAAID,MAAM,CAACE,QAAQ,CAACC,IAAI,EAAE;QACxB;QACA;QACA;QACA,IAAMC,GAAG,GAAG,IAAIC,GAAG,CAACP,MAAM,CAACG,MAAM,EAAED,MAAM,CAACE,QAAQ,CAACI,IAAI,CAAC;QACxD,IAAIF,GAAG,CAACD,IAAI,EAAEC,GAAG,CAACG,YAAY,CAACC,GAAG,CAAC,IAAI,EAAEC,IAAI,CAACC,GAAG,EAAE,CAAC;QACpDT,MAAM,GAAGG,GAAG;MACd;MACAN,MAAM,CAACa,IAAI,CAAC,WAAW,EAAEV,MAAM,CAAC;IAClC;IACA,OAAO,EAAE;EACX;EAEA,IAAIZ,YAAY,EAAE,OAAO,IAAI;EAE7B,IAAI,CAACH,QAAQ,IAAI,CAACC,MAAM,IAAI,CAACC,UAAU,EACrC,oBAAO,gCAAC,iBAAS;IAAC,UAAU,EAAEO,SAAU;IAAC,KAAK,EAAEE;EAAa,EAAG;EAElE,oBACE;IAAK,SAAS,EAAEL;EAAoB,gBAClC,gCAAC,4BAAgB;IACf,QAAQ,EAAEN,QAAS;IACnB,MAAM,EAAEC,MAAO;IACf,UAAU,EAAEC,UAAW;IACvB,SAAS,EAAEM,SAAU;IACrB,OAAO,EAAEJ;EAAQ,EACjB,eAEF,gCAAC,wBAAY;IAAC,MAAM,EAAEH,MAAO;IAAC,UAAU,EAAEC;EAAW,EAAG,CACpD;AAEV,CAAC;AAEDJ,QAAQ,CAAC4B,eAAe;EAAA,yFAAG,iBAAM3B,KAAK;IAAA;MAAA;QAAA;UAAA;YAAA,iCAAI,IAAA4B,iBAAQ,EAAC5B,KAAK,CAAC;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA;EAAA;IAAA;EAAA;AAAA;AAEzDD,QAAQ,CAAC8B,SAAS,GAAG;EACnB3B,MAAM,EAAE4B,qBAAS,CAACC,MAAM;EACxB5B,UAAU,EAAE2B,qBAAS,CAACC,MAAM;EAC5B9B,QAAQ,EAAE6B,qBAAS,CAACE,MAAM;EAC1B5B,YAAY,EAAE0B,qBAAS,CAACG,IAAI;EAC5B5B,OAAO,EAAEyB,qBAAS,CAACC,MAAM;EACzBtB,SAAS,EAAEqB,qBAAS,CAACG,IAAI;EACzBvB,SAAS,EAAEoB,qBAAS,CAACI,MAAM;EAC3B5B,UAAU,EAAEwB,qBAAS,CAACG,IAAI;EAC1BrB,YAAY,EAAEkB,qBAAS,CAACC,MAAM;EAC9BxB,mBAAmB,EAAEuB,qBAAS,CAACC;AACjC,CAAC;AAEDhC,QAAQ,CAACoC,YAAY,GAAG;EACtBjC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,IAAI;EAChBF,QAAQ,EAAE,IAAI;EACdG,YAAY,EAAE,KAAK;EACnBC,OAAO,EAAE,EAAE;EACXI,SAAS,EAAE,KAAK;EAChBC,SAAS,EAAEC,gCAAqB;EAChCL,UAAU,EAAE,KAAK;EACjBM,YAAY,EAAE,IAAI;EAClBL,mBAAmB,EAAEC;AACvB,CAAC;AAAC,eAEaT,QAAQ;AAAA"}
|
package/lib-es/pages/Resolver.js
CHANGED
|
@@ -21,7 +21,20 @@ const Resolver = props => {
|
|
|
21
21
|
} = props;
|
|
22
22
|
const router = useRouter();
|
|
23
23
|
if (disableSsr) {
|
|
24
|
-
if (
|
|
24
|
+
if (typeof window !== 'undefined') {
|
|
25
|
+
let {
|
|
26
|
+
asPath
|
|
27
|
+
} = router;
|
|
28
|
+
if (window.location.hash) {
|
|
29
|
+
// handle nextjs issue not calling getInitialProps if pushing a url with a hash in it
|
|
30
|
+
// we add a new query string param to force calling getInitialProps
|
|
31
|
+
// this should only happen if disableSsr and window.location.hash
|
|
32
|
+
const url = new URL(router.asPath, window.location.href);
|
|
33
|
+
if (url.hash) url.searchParams.set('_h', Date.now());
|
|
34
|
+
asPath = url;
|
|
35
|
+
}
|
|
36
|
+
router.push('/Resolver', asPath);
|
|
37
|
+
}
|
|
25
38
|
return '';
|
|
26
39
|
}
|
|
27
40
|
if (isStatusPage) return 'OK';
|
|
@@ -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","
|
|
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","window","asPath","location","hash","url","URL","href","searchParams","set","Date","now","push","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 (typeof window !== 'undefined') {\n let { asPath } = router;\n if (window.location.hash) {\n // handle nextjs issue not calling getInitialProps if pushing a url with a hash in it\n // we add a new query string param to force calling getInitialProps\n // this should only happen if disableSsr and window.location.hash\n const url = new URL(router.asPath, window.location.href);\n if (url.hash) url.searchParams.set('_h', Date.now());\n asPath = url;\n }\n router.push('/Resolver', asPath);\n }\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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/nextjs-tools",
|
|
3
|
-
"version": "0.126.0-alpha.
|
|
3
|
+
"version": "0.126.0-alpha.6",
|
|
4
4
|
"description": "Blaze nextjs tools",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"@blaze-cms/nextjs-components": "^0.125.0",
|
|
36
36
|
"@blaze-cms/plugin-auth-fe": "^0.125.0",
|
|
37
37
|
"@blaze-cms/plugin-auth-local-fe": "^0.125.0",
|
|
38
|
-
"@blaze-cms/plugin-google-maps-fe": "0.126.0-alpha.
|
|
39
|
-
"@blaze-cms/plugin-gtm-fe": "0.126.0-alpha.
|
|
40
|
-
"@blaze-cms/plugin-page-builder-fe": "0.126.0-alpha.
|
|
41
|
-
"@blaze-cms/plugin-preview-fe": "
|
|
38
|
+
"@blaze-cms/plugin-google-maps-fe": "0.126.0-alpha.5",
|
|
39
|
+
"@blaze-cms/plugin-gtm-fe": "0.126.0-alpha.5",
|
|
40
|
+
"@blaze-cms/plugin-page-builder-fe": "0.126.0-alpha.5",
|
|
41
|
+
"@blaze-cms/plugin-preview-fe": "0.126.0-alpha.6",
|
|
42
42
|
"@blaze-cms/plugin-search-ui": "^0.125.0",
|
|
43
|
-
"@blaze-cms/react-page-builder": "0.126.0-alpha.
|
|
43
|
+
"@blaze-cms/react-page-builder": "0.126.0-alpha.5",
|
|
44
44
|
"@blaze-cms/setup-ui": "^0.92.0",
|
|
45
45
|
"autoprefixer": "^10.2.3",
|
|
46
46
|
"core-js": "^3.2.1",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"lib/*",
|
|
69
69
|
"lib-es/*"
|
|
70
70
|
],
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "d7c6fd31748f99e10cc7a746a909a89fc6df9594"
|
|
72
72
|
}
|
package/src/pages/Resolver.js
CHANGED
|
@@ -23,7 +23,18 @@ const Resolver = props => {
|
|
|
23
23
|
const router = useRouter();
|
|
24
24
|
|
|
25
25
|
if (disableSsr) {
|
|
26
|
-
if (
|
|
26
|
+
if (typeof window !== 'undefined') {
|
|
27
|
+
let { asPath } = router;
|
|
28
|
+
if (window.location.hash) {
|
|
29
|
+
// handle nextjs issue not calling getInitialProps if pushing a url with a hash in it
|
|
30
|
+
// we add a new query string param to force calling getInitialProps
|
|
31
|
+
// this should only happen if disableSsr and window.location.hash
|
|
32
|
+
const url = new URL(router.asPath, window.location.href);
|
|
33
|
+
if (url.hash) url.searchParams.set('_h', Date.now());
|
|
34
|
+
asPath = url;
|
|
35
|
+
}
|
|
36
|
+
router.push('/Resolver', asPath);
|
|
37
|
+
}
|
|
27
38
|
return '';
|
|
28
39
|
}
|
|
29
40
|
|
|
@@ -5,6 +5,10 @@ import Resolver from '../../../../src/pages/Resolver';
|
|
|
5
5
|
|
|
6
6
|
jest.mock('../../../../src/containers/ContentContainer', () => jest.fn(() => 'ContentContainer'));
|
|
7
7
|
|
|
8
|
+
jest.mock('next/router', () => ({
|
|
9
|
+
useRouter: jest.fn(() => ({ asPath: 'some-url', push: () => {} }))
|
|
10
|
+
}));
|
|
11
|
+
|
|
8
12
|
jest.mock('next/error', () => jest.fn(() => 'NextError'));
|
|
9
13
|
|
|
10
14
|
describe('Resolver page', () => {
|