@blaze-cms/nextjs-tools 0.118.0 → 0.119.0-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.119.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.118.1-alpha.0...v0.119.0-alpha.0) (2022-01-26)
+
+
+### Features
+
+* update apollo client to v3.5 add cache redirects and optimise queries ([#3308](https://github.com/thebyte9/blaze/issues/3308)) ([5281b17](https://github.com/thebyte9/blaze/commit/5281b17fd972f8c727d099f0c814e747896af431))
+* upgrade next to latest version ([#3290](https://github.com/thebyte9/blaze/issues/3290)) ([d2c37bd](https://github.com/thebyte9/blaze/commit/d2c37bd1bf7847dbbbaf7ab8634008c2042f91f9))
+
+
+
+
+
 # [0.118.0](https://github.com/thebyte9/blaze/compare/v0.118.0-alpha.3...v0.118.0) (2022-01-25)
 
 **Note:** Version bump only for package @blaze-cms/nextjs-tools

package/build/next.base.config.js

@@ -127,7 +127,7 @@ const nextConfig = {
           ),
           '@sentry/browser': '@sentry/browser/esm'
         },
-        fallback: { path: false }
+        fallback: { path: false, fs: false }
       },
       module: {
         rules: [

package/lib/application/query/index.js

@@ -11,12 +11,12 @@ exports.getPageQuery = exports.checkUrlQuery = exports.GET_ENTITY_SCHEMA = void
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _client = require("@apollo/client");
 
 var _templateObject, _templateObject2, _templateObject3;
 
-var pageDataFields = "\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  name\n}\ntags {\n  name\n}\nslug\nimage{\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename";
-var checkUrlQuery = (0, _graphqlTag["default"])(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ", "\n        }\n      }\n    }\n  }\n"])), pageDataFields);
+var pageDataFields = "\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  id\n  name\n}\ntags {\n  id\n  name\n}\nslug\nimage{\n  id\n  data\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename";
+var checkUrlQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ", "\n        }\n      }\n    }\n  }\n"])), pageDataFields);
 exports.checkUrlQuery = checkUrlQuery;
 
 var getPageQuery = function getPageQuery(_ref) {
@@ -26,10 +26,10 @@ var getPageQuery = function getPageQuery(_ref) {
       getPublished = _ref$actions.getPublished,
       isPreview = _ref.isPreview;
   var getMethod = !isPreview && getPublished ? getPublished : get;
-  return (0, _graphqlTag["default"])(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n    query pageData($id: String!) {\n      pageData: ", "(id: $id) {\n        ", "\n        url\n      }\n    }\n  "])), getMethod, pageDataFields);
+  return (0, _client.gql)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n    query pageData($id: String!) {\n      pageData: ", "(id: $id) {\n        ", "\n        url\n      }\n    }\n  "])), getMethod, pageDataFields);
 };
 
 exports.getPageQuery = getPageQuery;
-var GET_ENTITY_SCHEMA = (0, _graphqlTag["default"])(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n"])));
+var GET_ENTITY_SCHEMA = (0, _client.gql)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n"])));
 exports.GET_ENTITY_SCHEMA = GET_ENTITY_SCHEMA;
 //# sourceMappingURL=index.js.map

package/lib/application/query/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/application/query/index.js"],"names":["pageDataFields","checkUrlQuery","gql","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,cAAc,wLAApB;AAmBA,IAAMC,aAAa,OAAGC,sBAAH,wTAQPF,cARO,CAAnB;;;AAeA,IAAMG,YAAY,GAAG,SAAfA,YAAe,OAAwD;AAAA,0BAArDC,OAAqD;AAAA,2CAApB,EAAoB;AAAA,MAA1CC,GAA0C,gBAA1CA,GAA0C;AAAA,MAArCC,YAAqC,gBAArCA,YAAqC;AAAA,MAAhBC,SAAgB,QAAhBA,SAAgB;AAC3E,MAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,aAAOH,sBAAP,8MAEgBM,SAFhB,EAGQR,cAHR;AAQD,CAXD;;;AAaA,IAAMS,iBAAiB,OAAGP,sBAAH,yOAAvB","sourcesContent":["import gql from 'graphql-tag';\n\nconst pageDataFields = `\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  name\n}\ntags {\n  name\n}\nslug\nimage{\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename`;\n\nconst checkUrlQuery = gql`\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ${pageDataFields}\n        }\n      }\n    }\n  }\n`;\n\nconst getPageQuery = ({ actions: { get, getPublished } = {}, isPreview }) => {\n  const getMethod = !isPreview && getPublished ? getPublished : get;\n\n  return gql`\n    query pageData($id: String!) {\n      pageData: ${getMethod}(id: $id) {\n        ${pageDataFields}\n        url\n      }\n    }\n  `;\n};\n\nconst GET_ENTITY_SCHEMA = gql`\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n`;\n\nexport { checkUrlQuery, getPageQuery, GET_ENTITY_SCHEMA };\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/application/query/index.js"],"names":["pageDataFields","checkUrlQuery","gql","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,cAAc,kNAApB;AAuBA,IAAMC,aAAa,OAAGC,WAAH,wTAQPF,cARO,CAAnB;;;AAeA,IAAMG,YAAY,GAAG,SAAfA,YAAe,OAAwD;AAAA,0BAArDC,OAAqD;AAAA,2CAApB,EAAoB;AAAA,MAA1CC,GAA0C,gBAA1CA,GAA0C;AAAA,MAArCC,YAAqC,gBAArCA,YAAqC;AAAA,MAAhBC,SAAgB,QAAhBA,SAAgB;AAC3E,MAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,aAAOH,WAAP,8MAEgBM,SAFhB,EAGQR,cAHR;AAQD,CAXD;;;AAaA,IAAMS,iBAAiB,OAAGP,WAAH,yOAAvB","sourcesContent":["import { gql } from '@apollo/client';\n\nconst pageDataFields = `\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  id\n  name\n}\ntags {\n  id\n  name\n}\nslug\nimage{\n  id\n  data\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename`;\n\nconst checkUrlQuery = gql`\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ${pageDataFields}\n        }\n      }\n    }\n  }\n`;\n\nconst getPageQuery = ({ actions: { get, getPublished } = {}, isPreview }) => {\n  const getMethod = !isPreview && getPublished ? getPublished : get;\n\n  return gql`\n    query pageData($id: String!) {\n      pageData: ${getMethod}(id: $id) {\n        ${pageDataFields}\n        url\n      }\n    }\n  `;\n};\n\nconst GET_ENTITY_SCHEMA = gql`\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n`;\n\nexport { checkUrlQuery, getPageQuery, GET_ENTITY_SCHEMA };\n"],"file":"index.js"}

package/lib/blaze.config.js

@@ -36,7 +36,8 @@ plugins.set(_pluginGoogleMapsFe["default"], {});
 plugins.set(_pluginPreviewFe["default"], {});
 plugins.set(_pluginAuthFe["default"], {});
 var apollo = {
-  uri: process.env.BLAZE_GRAPHQL_URI
+  uri: process.env.BLAZE_GRAPHQL_URI,
+  loadEntitiesInBrowser: false
 };
 var _default = {
   plugins: plugins,

package/lib/blaze.config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/blaze.config.js"],"names":["plugins","Map","set","pageBuilder","gtm","googleMaps","previewFe","authFe","apollo","uri","process","env","BLAZE_GRAPHQL_URI"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYC,+BAAZ,EAAyB,EAAzB;AACAH,OAAO,CAACE,GAAR,CAAYE,uBAAZ,EAAiB,EAAjB;AACAJ,OAAO,CAACE,GAAR,CAAYG,8BAAZ,EAAwB,EAAxB;AACAL,OAAO,CAACE,GAAR,CAAYI,2BAAZ,EAAuB,EAAvB;AACAN,OAAO,CAACE,GAAR,CAAYK,wBAAZ,EAAoB,EAApB;AAEA,IAAMC,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC;AADJ,CAAf;eAIe;AAAEZ,EAAAA,OAAO,EAAPA,OAAF;AAAWQ,EAAAA,MAAM,EAANA;AAAX,C","sourcesContent":["import pageBuilder from '@blaze-cms/plugin-page-builder-fe';\nimport gtm from '@blaze-cms/plugin-gtm-fe';\nimport googleMaps from '@blaze-cms/plugin-google-maps-fe';\nimport previewFe from '@blaze-cms/plugin-preview-fe';\nimport authFe from '@blaze-cms/plugin-auth-fe';\n\nconst plugins = new Map();\n\nplugins.set(pageBuilder, {});\nplugins.set(gtm, {});\nplugins.set(googleMaps, {});\nplugins.set(previewFe, {});\nplugins.set(authFe, {});\n\nconst apollo = {\n  uri: process.env.BLAZE_GRAPHQL_URI\n};\n\nexport default { plugins, apollo };\n"],"file":"blaze.config.js"}
+{"version":3,"sources":["../src/blaze.config.js"],"names":["plugins","Map","set","pageBuilder","gtm","googleMaps","previewFe","authFe","apollo","uri","process","env","BLAZE_GRAPHQL_URI","loadEntitiesInBrowser"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYC,+BAAZ,EAAyB,EAAzB;AACAH,OAAO,CAACE,GAAR,CAAYE,uBAAZ,EAAiB,EAAjB;AACAJ,OAAO,CAACE,GAAR,CAAYG,8BAAZ,EAAwB,EAAxB;AACAL,OAAO,CAACE,GAAR,CAAYI,2BAAZ,EAAuB,EAAvB;AACAN,OAAO,CAACE,GAAR,CAAYK,wBAAZ,EAAoB,EAApB;AAEA,IAAMC,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC,iBADJ;AAEbC,EAAAA,qBAAqB,EAAE;AAFV,CAAf;eAKe;AAAEb,EAAAA,OAAO,EAAPA,OAAF;AAAWQ,EAAAA,MAAM,EAANA;AAAX,C","sourcesContent":["import pageBuilder from '@blaze-cms/plugin-page-builder-fe';\nimport gtm from '@blaze-cms/plugin-gtm-fe';\nimport googleMaps from '@blaze-cms/plugin-google-maps-fe';\nimport previewFe from '@blaze-cms/plugin-preview-fe';\nimport authFe from '@blaze-cms/plugin-auth-fe';\n\nconst plugins = new Map();\n\nplugins.set(pageBuilder, {});\nplugins.set(gtm, {});\nplugins.set(googleMaps, {});\nplugins.set(previewFe, {});\nplugins.set(authFe, {});\n\nconst apollo = {\n  uri: process.env.BLAZE_GRAPHQL_URI,\n  loadEntitiesInBrowser: false\n};\n\nexport default { plugins, apollo };\n"],"file":"blaze.config.js"}

package/lib/helpers/static-route-handlers/robots-txt.js

@@ -17,7 +17,7 @@ require("core-js/modules/es.regexp.to-string.js");
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _client = require("@apollo/client");
 
 var _constants = require("../../constants");
 
@@ -26,7 +26,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
 var _templateObject;
 
 var storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || _constants.BLAZE_STATIC_ROUTE_STORE_KEY;
-var fileQuery = (0, _graphqlTag["default"])(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query {\n    files: getFiles(\n      where: { storeKey: \"", "\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n"])), storeKey);
+var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query {\n    files: getFiles(\n      where: { storeKey: \"", "\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n"])), storeKey);
 exports.fileQuery = fileQuery;
 var pattern = new RegExp(_constants.ROUTE_PATTERN_ROBOTS_TXT);
 exports.pattern = pattern;

package/lib/helpers/static-route-handlers/robots-txt.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["storeKey","process","env","BLAZE_STATIC_ROUTE_STORE_KEY","fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_ROBOTS_TXT","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;AAEA,IAAMA,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,IAA4CA,uCAA7D;AAEO,IAAMC,SAAS,OAAGC,sBAAH,wTAGML,QAHN,CAAf;;AAaA,IAAMM,OAAO,GAAG,IAAIC,MAAJ,CAAWC,mCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import gql from 'graphql-tag';\nimport { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nconst storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"${storeKey}\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_ROBOTS_TXT);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"robots-txt.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["storeKey","process","env","BLAZE_STATIC_ROUTE_STORE_KEY","fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_ROBOTS_TXT","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;AAEA,IAAMA,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,IAA4CA,uCAA7D;AAEO,IAAMC,SAAS,OAAGC,WAAH,wTAGML,QAHN,CAAf;;AAaA,IAAMM,OAAO,GAAG,IAAIC,MAAJ,CAAWC,mCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nconst storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"${storeKey}\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_ROBOTS_TXT);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"robots-txt.js"}

package/lib/helpers/static-route-handlers/sitemap-file.js

@@ -17,7 +17,7 @@ require("core-js/modules/es.string.split.js");
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _client = require("@apollo/client");
 
 require("cross-fetch/polyfill");
 
@@ -27,7 +27,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
 
 var _templateObject;
 
-var fileQuery = (0, _graphqlTag["default"])(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n"])));
+var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n"])));
 exports.fileQuery = fileQuery;
 
 function getVariables(_ref) {

package/lib/helpers/static-route-handlers/sitemap-file.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["fileQuery","gql","getVariables","asPath","filename","split","slice","where","storeKey","SITEMAP_STORE_KEY","pattern","ROUTE_PATTERN_SITEMAP_FILE_REGEX","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,sBAAH,0QAAf;;;AASP,SAASC,YAAT,OAAkC;AAAA,MAAVC,MAAU,QAAVA,MAAU;AAChC,MAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,MAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAEC,4BAAZ;AAA+BL,IAAAA,QAAQ,EAARA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA,KAAK,EAALA;AAAF,GAAP;AACD;;AAEM,IAAMG,OAAO,GAAGC,2CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWZ,SAAX,EAAsBE,YAAtB,CAAhB","sourcesContent":["import gql from 'graphql-tag';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n`;\n\nfunction getVariables({ asPath }) {\n  const filename = asPath.split('/').slice(-1)[0];\n  const where = { storeKey: SITEMAP_STORE_KEY, filename };\n  return { where };\n}\n\nexport const pattern = ROUTE_PATTERN_SITEMAP_FILE_REGEX;\n\nexport const handler = getHandler(fileQuery, getVariables);\n"],"file":"sitemap-file.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["fileQuery","gql","getVariables","asPath","filename","split","slice","where","storeKey","SITEMAP_STORE_KEY","pattern","ROUTE_PATTERN_SITEMAP_FILE_REGEX","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,WAAH,0QAAf;;;AASP,SAASC,YAAT,OAAkC;AAAA,MAAVC,MAAU,QAAVA,MAAU;AAChC,MAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,MAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAEC,4BAAZ;AAA+BL,IAAAA,QAAQ,EAARA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA,KAAK,EAALA;AAAF,GAAP;AACD;;AAEM,IAAMG,OAAO,GAAGC,2CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWZ,SAAX,EAAsBE,YAAtB,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n`;\n\nfunction getVariables({ asPath }) {\n  const filename = asPath.split('/').slice(-1)[0];\n  const where = { storeKey: SITEMAP_STORE_KEY, filename };\n  return { where };\n}\n\nexport const pattern = ROUTE_PATTERN_SITEMAP_FILE_REGEX;\n\nexport const handler = getHandler(fileQuery, getVariables);\n"],"file":"sitemap-file.js"}

package/lib/helpers/static-route-handlers/sitemap.js

@@ -17,7 +17,7 @@ require("core-js/modules/es.regexp.to-string.js");
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _client = require("@apollo/client");
 
 require("cross-fetch/polyfill");
 
@@ -27,7 +27,7 @@ var _genericFileHandler = _interopRequireDefault(require("./generic-file-handler
 
 var _templateObject;
 
-var fileQuery = (0, _graphqlTag["default"])(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n"])));
+var fileQuery = (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n"])));
 exports.fileQuery = fileQuery;
 var pattern = new RegExp(_constants.ROUTE_PATTERN_SITEMAP);
 exports.pattern = pattern;

package/lib/helpers/static-route-handlers/sitemap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_SITEMAP","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,sBAAH,yUAAf;;AAaA,IAAMC,OAAO,GAAG,IAAIC,MAAJ,CAAWC,gCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import gql from 'graphql-tag';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_SITEMAP);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"sitemap.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["fileQuery","gql","pattern","RegExp","ROUTE_PATTERN_SITEMAP","handler"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;AAEO,IAAMA,SAAS,OAAGC,WAAH,yUAAf;;AAaA,IAAMC,OAAO,GAAG,IAAIC,MAAJ,CAAWC,gCAAX,CAAhB;;AAEA,IAAMC,OAAO,GAAG,oCAAWL,SAAX,CAAhB","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_SITEMAP);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"sitemap.js"}

package/lib/hoc/withBlaze.js

@@ -65,9 +65,7 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _head = _interopRequireDefault(require("next/head"));
-
-var _reactApollo = require("react-apollo");
+var _ssr = require("@apollo/client/react/ssr");
 
 var _coreUi = _interopRequireDefault(require("@blaze-cms/core-ui"));
 
@@ -173,8 +171,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
       key: "setApolloClient",
       value: function setApolloClient() {
         if (!this.apolloClient) {
-          var apolloState = this.props.apolloState;
-          this.apolloClient = blazeApp.createClient(apolloState);
+          var _this$props = this.props,
+              apolloState = _this$props.apolloState,
+              processedBlazeEntities = _this$props.processedBlazeEntities;
+          this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
           (0, _coreAuthUi.setupCheckAccessToken)(this.apolloClient);
         }
       }
@@ -194,7 +194,7 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
       key: "getInitialProps",
       value: function () {
         var _getInitialProps = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(context) {
-          var _Component, router, AppTree, ctx, appProps, errorProps, requestApp, apolloClient, apolloState, sortedState, _appProps, _appProps$pageProps, pageProps;
+          var _Component, router, AppTree, ctx, appProps, errorProps, requestApp, apolloClient, _appProps, _appProps$pageProps, pageProps, mainProps, apolloState, sortedState;
 
           return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) {
@@ -209,11 +209,11 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
                   requestApp.ctx.req = ctx.req;
                   requestApp.ctx.res = ctx.res;
                   _context2.next = 10;
-                  return requestApp.init();
+                  return blazeApp.init();
 
                 case 10:
                   _context2.next = 12;
-                  return blazeApp.init();
+                  return requestApp.init();
 
                 case 12:
                   apolloClient = getApolloClient(ctx, requestApp);
@@ -232,26 +232,34 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
                   appProps = _context2.sent;
 
                 case 19:
-                  if (!isSsr) {
-                    _context2.next = 32;
+                  _appProps = appProps, _appProps$pageProps = _appProps.pageProps, pageProps = _appProps$pageProps === void 0 ? {} : _appProps$pageProps;
+                  mainProps = _objectSpread(_objectSpread({}, appProps), {}, {
+                    pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps)
+                  });
+
+                  if (isSsr) {
+                    _context2.next = 23;
                     break;
                   }
 
-                  _context2.prev = 20;
-                  _context2.next = 23;
-                  return (0, _reactApollo.getDataFromTree)( /*#__PURE__*/_react["default"].createElement(AppTree, (0, _extends2["default"])({}, appProps, {
+                  return _context2.abrupt("return", mainProps);
+
+                case 23:
+                  _context2.prev = 23;
+                  _context2.next = 26;
+                  return (0, _ssr.getDataFromTree)( /*#__PURE__*/_react["default"].createElement(AppTree, (0, _extends2["default"])({}, appProps, {
                     Component: _Component,
                     router: router,
                     apolloClient: apolloClient
                   })));
 
-                case 23:
-                  _context2.next = 31;
+                case 26:
+                  _context2.next = 34;
                   break;
 
-                case 25:
-                  _context2.prev = 25;
-                  _context2.t0 = _context2["catch"](20);
+                case 28:
+                  _context2.prev = 28;
+                  _context2.t0 = _context2["catch"](23);
                   errorProps = (0, _helpers.getErrorMessage)(_context2.t0);
                   if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
                   ctx.blazeApp.events.emit('monitor:log', {
@@ -259,27 +267,24 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
                   });
                   requestApp.log.error('Error while running `getDataFromTree`', _context2.t0);
 
-                case 31:
-                  _head["default"].rewind();
-
-                case 32:
+                case 34:
                   apolloState = apolloClient.cache.extract();
                   sortedState = Object.keys(apolloState).sort().reduce(function (acc, key) {
                     acc[key] = apolloState[key];
                     return acc;
                   }, {});
-                  _appProps = appProps, _appProps$pageProps = _appProps.pageProps, pageProps = _appProps$pageProps === void 0 ? {} : _appProps$pageProps;
-                  return _context2.abrupt("return", _objectSpread(_objectSpread({}, appProps), {}, {
-                    pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps),
-                    apolloState: sortedState
+                  return _context2.abrupt("return", _objectSpread(_objectSpread({}, mainProps), {}, {
+                    pageProps: _objectSpread(_objectSpread({}, mainProps.pageProps), errorProps),
+                    apolloState: sortedState,
+                    processedBlazeEntities: blazeApp.getProcessedEntities()
                   }));
 
-                case 36:
+                case 37:
                 case "end":
                   return _context2.stop();
               }
             }
-          }, _callee2, null, [[20, 25]]);
+          }, _callee2, null, [[23, 28]]);
         }));
 
         function getInitialProps(_x) {
@@ -292,10 +297,12 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
     return _class;
   }(_react.Component), (0, _defineProperty2["default"])(_class, "displayName", 'withBlaze(App)'), (0, _defineProperty2["default"])(_class, "propTypes", {
     apolloState: _propTypes["default"].object,
-    apolloClient: _propTypes["default"].object
+    apolloClient: _propTypes["default"].object,
+    processedBlazeEntities: _propTypes["default"].object
   }), (0, _defineProperty2["default"])(_class, "defaultProps", {
     apolloState: {},
-    apolloClient: null
+    apolloClient: null,
+    processedBlazeEntities: undefined
   }), _temp;
 }
 

package/lib/hoc/withBlaze.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","props","state","appLoaded","initComplete","init","setState","apolloState","setApolloClient","context","_Component","Component","router","AppTree","appProps","errorProps","req","res","getInitialProps","errorCode","statusCode","events","emit","error","log","Head","rewind","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","pageProps","PropTypes","object","withBlaze","buildConfig","forceSsr","window","blazeConfig","logNameSpace"],"mappings":"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","sourcesContent":["// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js\nimport React, { Component } from 'react';\nimport Head from 'next/head';\nimport { getDataFromTree } from 'react-apollo';\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    };\n\n    static defaultProps = {\n      apolloState: {},\n      apolloClient: null\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 requestApp.init();\n      await blazeApp.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      if (isSsr) {\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        Head.rewind();\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      const { pageProps = {} } = appProps;\n\n      return {\n        ...appProps,\n        pageProps: { ...pageProps, ...errorProps },\n        apolloState: sortedState\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 } = this.props;\n        this.apolloClient = blazeApp.createClient(apolloState);\n        setupCheckAccessToken(this.apolloClient);\n      }\n    }\n\n    render() {\n      const { appLoaded } = this.state;\n\n      if (!appLoaded && !isSsr) return '...loading';\n\n      this.setApolloClient();\n\n      return (\n        <ErrorBoundary app={this.blazeApp}>\n          <App {...this.props} apolloClient={this.apolloClient} />\n        </ErrorBoundary>\n      );\n    }\n  };\n}\n\nconst withBlaze = (App, buildConfig, { forceSsr = false } = {}) => {\n  const isSsr = forceSsr || typeof window === 'undefined';\n  const config = buildConfig ? buildConfig(blazeConfig) : blazeConfig;\n  const blazeApp = getBlazeUi({ config, logNameSpace: APP_LOG_NAMESPACE_MAIN });\n  blazeApp.init();\n\n  return getWrappedApp(isSsr, config, blazeApp, App);\n};\n\nexport default withBlaze;\n"],"file":"withBlaze.js"}
+{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","props","state","appLoaded","initComplete","init","setState","apolloState","processedBlazeEntities","setApolloClient","context","_Component","Component","router","AppTree","appProps","errorProps","req","res","getInitialProps","pageProps","mainProps","errorCode","statusCode","events","emit","error","log","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","getProcessedEntities","PropTypes","object","undefined","withBlaze","buildConfig","forceSsr","window","blazeConfig","logNameSpace"],"mappings":"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","sourcesContent":["// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js\nimport React, { Component } from 'react';\nimport { getDataFromTree } from '@apollo/client/react/ssr';\nimport getBlazeUi from '@blaze-cms/core-ui';\nimport { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport dynamic from 'next/dynamic'; // Next.js dynamic\nimport blazeConfig from '../blaze.config';\nimport { getErrorMessage } from '../helpers';\n\nconst ErrorBoundary = dynamic(() => import('@blaze-cms/core-errors-ui'));\n\nconst APP_LOG_NAMESPACE_MAIN = 'main';\n\nfunction getWrappedApp(isSsr, config, blazeApp, App) {\n  function getApolloClient(ctx, requestApp) {\n    return ctx.apolloClient || requestApp.getClient() || requestApp.createClient();\n  }\n\n  function getRequestApp(requestApp) {\n    return !requestApp && isSsr ? getBlazeUi({ config }) : blazeApp;\n  }\n  return class extends Component {\n    static displayName = 'withBlaze(App)';\n\n    static propTypes = {\n      apolloState: PropTypes.object,\n      apolloClient: PropTypes.object,\n      processedBlazeEntities: PropTypes.object\n    };\n\n    static defaultProps = {\n      apolloState: {},\n      apolloClient: null,\n      processedBlazeEntities: undefined\n    };\n\n    static async getInitialProps(context) {\n      const { Component: _Component, router, AppTree, ctx } = context;\n      let appProps = {};\n      let errorProps = {};\n\n      let requestApp = ctx.blazeApp;\n      requestApp = getRequestApp(requestApp);\n\n      requestApp.ctx.router = router;\n      requestApp.ctx.req = ctx.req;\n      requestApp.ctx.res = ctx.res;\n\n      await blazeApp.init();\n      await requestApp.init();\n\n      const apolloClient = getApolloClient(ctx, requestApp);\n\n      ctx.apolloClient = apolloClient;\n      ctx.blazeApp = requestApp;\n      if (App.getInitialProps) {\n        appProps = await App.getInitialProps(context);\n      }\n\n      const { pageProps = {} } = appProps;\n      const mainProps = {\n        ...appProps,\n        pageProps: { ...pageProps, ...errorProps }\n      };\n\n      if (!isSsr) return mainProps;\n\n      try {\n        await getDataFromTree(\n          <AppTree\n            {...appProps}\n            Component={_Component}\n            router={router}\n            apolloClient={apolloClient}\n          />\n        );\n      } catch (error) {\n        errorProps = getErrorMessage(error);\n        if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;\n        ctx.blazeApp.events.emit('monitor:log', { error });\n        requestApp.log.error('Error while running `getDataFromTree`', error);\n      }\n\n      const apolloState = apolloClient.cache.extract();\n      const sortedState = Object.keys(apolloState)\n        .sort()\n        .reduce((acc, key) => {\n          acc[key] = apolloState[key];\n          return acc;\n        }, {});\n\n      return {\n        ...mainProps,\n        pageProps: { ...mainProps.pageProps, ...errorProps },\n        apolloState: sortedState,\n        processedBlazeEntities: blazeApp.getProcessedEntities()\n      };\n    }\n\n    constructor(props) {\n      super(props);\n      this.apolloClient = props.apolloClient;\n      this.state = {\n        appLoaded: isSsr || blazeApp.initComplete()\n      };\n      this.blazeApp = blazeApp;\n    }\n\n    async componentDidMount() {\n      if (blazeApp.initComplete()) return;\n\n      await blazeApp.init();\n\n      this.setState({\n        appLoaded: blazeApp.initComplete()\n      });\n    }\n\n    setApolloClient() {\n      if (!this.apolloClient) {\n        const { apolloState, processedBlazeEntities } = this.props;\n        this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);\n        setupCheckAccessToken(this.apolloClient);\n      }\n    }\n\n    render() {\n      const { appLoaded } = this.state;\n\n      if (!appLoaded && !isSsr) return '...loading';\n\n      this.setApolloClient();\n\n      return (\n        <ErrorBoundary app={this.blazeApp}>\n          <App {...this.props} apolloClient={this.apolloClient} />\n        </ErrorBoundary>\n      );\n    }\n  };\n}\n\nconst withBlaze = (App, buildConfig, { forceSsr = false } = {}) => {\n  const isSsr = forceSsr || typeof window === 'undefined';\n  const config = buildConfig ? buildConfig(blazeConfig) : blazeConfig;\n  const blazeApp = getBlazeUi({ config, logNameSpace: APP_LOG_NAMESPACE_MAIN });\n  blazeApp.init();\n\n  return getWrappedApp(isSsr, config, blazeApp, App);\n};\n\nexport default withBlaze;\n"],"file":"withBlaze.js"}

package/lib/hooks/use-get-page.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _reactHooks = require("@apollo/react-hooks");
+var _client = require("@apollo/client");
 
 function useGetPage(queryData, id) {
-  var _useQuery = (0, _reactHooks.useQuery)(queryData, {
+  var _useQuery = (0, _client.useQuery)(queryData, {
     variables: {
       id: id
     }

package/lib/hooks/use-get-page.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useGetPage","queryData","id","variables","data","loading","error"],"mappings":";;;;;;;;;AAAA;;AAEA,SAASA,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,kBAAsC,0BAASD,SAAT,EAAoB;AAAEE,IAAAA,SAAS,EAAE;AAAED,MAAAA,EAAE,EAAFA;AAAF;AAAb,GAApB,CAAtC;AAAA,iCAAQE,IAAR;AAAA,MAAQA,IAAR,+BAAe,EAAf;AAAA,MAAmBC,OAAnB,aAAmBA,OAAnB;AAAA,MAA4BC,KAA5B,aAA4BA,KAA5B;;AAEA,SAAO;AAAEF,IAAAA,IAAI,EAAJA,IAAF;AAAQC,IAAAA,OAAO,EAAPA,OAAR;AAAiBC,IAAAA,KAAK,EAALA;AAAjB,GAAP;AACD;;eAEcN,U","sourcesContent":["import { useQuery } from '@apollo/react-hooks';\n\nfunction useGetPage(queryData, id) {\n  const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });\n\n  return { data, loading, error };\n}\n\nexport default useGetPage;\n"],"file":"use-get-page.js"}
+{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useGetPage","queryData","id","variables","data","loading","error"],"mappings":";;;;;;;;;AAAA;;AAEA,SAASA,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,kBAAsC,sBAASD,SAAT,EAAoB;AAAEE,IAAAA,SAAS,EAAE;AAAED,MAAAA,EAAE,EAAFA;AAAF;AAAb,GAApB,CAAtC;AAAA,iCAAQE,IAAR;AAAA,MAAQA,IAAR,+BAAe,EAAf;AAAA,MAAmBC,OAAnB,aAAmBA,OAAnB;AAAA,MAA4BC,KAA5B,aAA4BA,KAA5B;;AAEA,SAAO;AAAEF,IAAAA,IAAI,EAAJA,IAAF;AAAQC,IAAAA,OAAO,EAAPA,OAAR;AAAiBC,IAAAA,KAAK,EAALA;AAAjB,GAAP;AACD;;eAEcN,U","sourcesContent":["import { useQuery } from '@apollo/client';\n\nfunction useGetPage(queryData, id) {\n  const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });\n\n  return { data, loading, error };\n}\n\nexport default useGetPage;\n"],"file":"use-get-page.js"}

package/lib/index.js

@@ -65,7 +65,7 @@ Object.defineProperty(exports, "withBlaze", {
   }
 });
 
-var reactApollo = _interopRequireWildcard(require("react-apollo"));
+var reactApollo = _interopRequireWildcard(require("@apollo/client"));
 
 exports.reactApollo = reactApollo;
 

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["import * as reactApollo from 'react-apollo';\n\nexport { reactApollo };\nexport { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';\nexport { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';\nexport { default as withBlaze } from './hoc/withBlaze';\nexport { default as Resolver } from './pages/Resolver';\nexport { default as BlazeDocument } from './pages/document/_document';\nexport { default as router } from './server/routes';\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AAGA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["import * as reactApollo from '@apollo/client';\n\nexport { reactApollo };\nexport { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';\nexport { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';\nexport { default as withBlaze } from './hoc/withBlaze';\nexport { default as Resolver } from './pages/Resolver';\nexport { default as BlazeDocument } from './pages/document/_document';\nexport { default as router } from './server/routes';\n"],"file":"index.js"}

package/lib-es/application/query/index.js

@@ -1,17 +1,21 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 const pageDataFields = `
 id
 name
 preparedPageBuilderComponents
 canonicalUrl
 category {
+  id
   name
 }
 tags {
+  id
   name
 }
 slug
 image{
+  id
+  data
   url
 }
 formattedMetaTitle

package/lib-es/application/query/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","pageDataFields","checkUrlQuery","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":"AAAA,OAAOA,GAAP,MAAgB,aAAhB;AAEA,MAAMC,cAAc,GAAI;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAjBA;AAmBA,MAAMC,aAAa,GAAGF,GAAI;AAC1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,YAAYC,cAAe;AAC3B;AACA;AACA;AACA;AACA,CAbA;;AAeA,MAAME,YAAY,GAAG,CAAC;AAAEC,EAAAA,OAAO,EAAE;AAAEC,IAAAA,GAAF;AAAOC,IAAAA;AAAP,MAAwB,EAAnC;AAAuCC,EAAAA;AAAvC,CAAD,KAAwD;AAC3E,QAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,SAAOL,GAAI;AACb;AACA,kBAAkBQ,SAAU;AAC5B,UAAUP,cAAe;AACzB;AACA;AACA;AACA,GAPE;AAQD,CAXD;;AAaA,MAAMQ,iBAAiB,GAAGT,GAAI;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CARA;AAUA,SAASE,aAAT,EAAwBC,YAAxB,EAAsCM,iBAAtC","sourcesContent":["import gql from 'graphql-tag';\n\nconst pageDataFields = `\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  name\n}\ntags {\n  name\n}\nslug\nimage{\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename`;\n\nconst checkUrlQuery = gql`\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ${pageDataFields}\n        }\n      }\n    }\n  }\n`;\n\nconst getPageQuery = ({ actions: { get, getPublished } = {}, isPreview }) => {\n  const getMethod = !isPreview && getPublished ? getPublished : get;\n\n  return gql`\n    query pageData($id: String!) {\n      pageData: ${getMethod}(id: $id) {\n        ${pageDataFields}\n        url\n      }\n    }\n  `;\n};\n\nconst GET_ENTITY_SCHEMA = gql`\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n`;\n\nexport { checkUrlQuery, getPageQuery, GET_ENTITY_SCHEMA };\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","pageDataFields","checkUrlQuery","getPageQuery","actions","get","getPublished","isPreview","getMethod","GET_ENTITY_SCHEMA"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AAEA,MAAMC,cAAc,GAAI;AACxB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WArBA;AAuBA,MAAMC,aAAa,GAAGF,GAAI;AAC1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,YAAYC,cAAe;AAC3B;AACA;AACA;AACA;AACA,CAbA;;AAeA,MAAME,YAAY,GAAG,CAAC;AAAEC,EAAAA,OAAO,EAAE;AAAEC,IAAAA,GAAF;AAAOC,IAAAA;AAAP,MAAwB,EAAnC;AAAuCC,EAAAA;AAAvC,CAAD,KAAwD;AAC3E,QAAMC,SAAS,GAAG,CAACD,SAAD,IAAcD,YAAd,GAA6BA,YAA7B,GAA4CD,GAA9D;AAEA,SAAOL,GAAI;AACb;AACA,kBAAkBQ,SAAU;AAC5B,UAAUP,cAAe;AACzB;AACA;AACA;AACA,GAPE;AAQD,CAXD;;AAaA,MAAMQ,iBAAiB,GAAGT,GAAI;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CARA;AAUA,SAASE,aAAT,EAAwBC,YAAxB,EAAsCM,iBAAtC","sourcesContent":["import { gql } from '@apollo/client';\n\nconst pageDataFields = `\nid\nname\npreparedPageBuilderComponents\ncanonicalUrl\ncategory {\n  id\n  name\n}\ntags {\n  id\n  name\n}\nslug\nimage{\n  id\n  data\n  url\n}\nformattedMetaTitle\nformattedMetaDescription\n__typename`;\n\nconst checkUrlQuery = gql`\n  query checkUrl($url: String!) {\n    checkUrl(url: $url) {\n      itemId\n      itemEntity\n      urlTo\n      pageData: record {\n        ...on ContentContentInterface {\n          ${pageDataFields}\n        }\n      }\n    }\n  }\n`;\n\nconst getPageQuery = ({ actions: { get, getPublished } = {}, isPreview }) => {\n  const getMethod = !isPreview && getPublished ? getPublished : get;\n\n  return gql`\n    query pageData($id: String!) {\n      pageData: ${getMethod}(id: $id) {\n        ${pageDataFields}\n        url\n      }\n    }\n  `;\n};\n\nconst GET_ENTITY_SCHEMA = gql`\n  query getEntitySchema($id: String!) {\n    entitySchema: getEntitySchema(id: $id) {\n      id\n      identifier\n      actions\n    }\n  }\n`;\n\nexport { checkUrlQuery, getPageQuery, GET_ENTITY_SCHEMA };\n"],"file":"index.js"}

package/lib-es/blaze.config.js

@@ -10,7 +10,8 @@ plugins.set(googleMaps, {});
 plugins.set(previewFe, {});
 plugins.set(authFe, {});
 const apollo = {
-  uri: process.env.BLAZE_GRAPHQL_URI
+  uri: process.env.BLAZE_GRAPHQL_URI,
+  loadEntitiesInBrowser: false
 };
 export default {
   plugins,

package/lib-es/blaze.config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/blaze.config.js"],"names":["pageBuilder","gtm","googleMaps","previewFe","authFe","plugins","Map","set","apollo","uri","process","env","BLAZE_GRAPHQL_URI"],"mappings":"AAAA,OAAOA,WAAP,MAAwB,mCAAxB;AACA,OAAOC,GAAP,MAAgB,0BAAhB;AACA,OAAOC,UAAP,MAAuB,kCAAvB;AACA,OAAOC,SAAP,MAAsB,8BAAtB;AACA,OAAOC,MAAP,MAAmB,2BAAnB;AAEA,MAAMC,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYP,WAAZ,EAAyB,EAAzB;AACAK,OAAO,CAACE,GAAR,CAAYN,GAAZ,EAAiB,EAAjB;AACAI,OAAO,CAACE,GAAR,CAAYL,UAAZ,EAAwB,EAAxB;AACAG,OAAO,CAACE,GAAR,CAAYJ,SAAZ,EAAuB,EAAvB;AACAE,OAAO,CAACE,GAAR,CAAYH,MAAZ,EAAoB,EAApB;AAEA,MAAMI,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC;AADJ,CAAf;AAIA,eAAe;AAAEP,EAAAA,OAAF;AAAWG,EAAAA;AAAX,CAAf","sourcesContent":["import pageBuilder from '@blaze-cms/plugin-page-builder-fe';\nimport gtm from '@blaze-cms/plugin-gtm-fe';\nimport googleMaps from '@blaze-cms/plugin-google-maps-fe';\nimport previewFe from '@blaze-cms/plugin-preview-fe';\nimport authFe from '@blaze-cms/plugin-auth-fe';\n\nconst plugins = new Map();\n\nplugins.set(pageBuilder, {});\nplugins.set(gtm, {});\nplugins.set(googleMaps, {});\nplugins.set(previewFe, {});\nplugins.set(authFe, {});\n\nconst apollo = {\n  uri: process.env.BLAZE_GRAPHQL_URI\n};\n\nexport default { plugins, apollo };\n"],"file":"blaze.config.js"}
+{"version":3,"sources":["../src/blaze.config.js"],"names":["pageBuilder","gtm","googleMaps","previewFe","authFe","plugins","Map","set","apollo","uri","process","env","BLAZE_GRAPHQL_URI","loadEntitiesInBrowser"],"mappings":"AAAA,OAAOA,WAAP,MAAwB,mCAAxB;AACA,OAAOC,GAAP,MAAgB,0BAAhB;AACA,OAAOC,UAAP,MAAuB,kCAAvB;AACA,OAAOC,SAAP,MAAsB,8BAAtB;AACA,OAAOC,MAAP,MAAmB,2BAAnB;AAEA,MAAMC,OAAO,GAAG,IAAIC,GAAJ,EAAhB;AAEAD,OAAO,CAACE,GAAR,CAAYP,WAAZ,EAAyB,EAAzB;AACAK,OAAO,CAACE,GAAR,CAAYN,GAAZ,EAAiB,EAAjB;AACAI,OAAO,CAACE,GAAR,CAAYL,UAAZ,EAAwB,EAAxB;AACAG,OAAO,CAACE,GAAR,CAAYJ,SAAZ,EAAuB,EAAvB;AACAE,OAAO,CAACE,GAAR,CAAYH,MAAZ,EAAoB,EAApB;AAEA,MAAMI,MAAM,GAAG;AACbC,EAAAA,GAAG,EAAEC,OAAO,CAACC,GAAR,CAAYC,iBADJ;AAEbC,EAAAA,qBAAqB,EAAE;AAFV,CAAf;AAKA,eAAe;AAAER,EAAAA,OAAF;AAAWG,EAAAA;AAAX,CAAf","sourcesContent":["import pageBuilder from '@blaze-cms/plugin-page-builder-fe';\nimport gtm from '@blaze-cms/plugin-gtm-fe';\nimport googleMaps from '@blaze-cms/plugin-google-maps-fe';\nimport previewFe from '@blaze-cms/plugin-preview-fe';\nimport authFe from '@blaze-cms/plugin-auth-fe';\n\nconst plugins = new Map();\n\nplugins.set(pageBuilder, {});\nplugins.set(gtm, {});\nplugins.set(googleMaps, {});\nplugins.set(previewFe, {});\nplugins.set(authFe, {});\n\nconst apollo = {\n  uri: process.env.BLAZE_GRAPHQL_URI,\n  loadEntitiesInBrowser: false\n};\n\nexport default { plugins, apollo };\n"],"file":"blaze.config.js"}

package/lib-es/helpers/static-route-handlers/robots-txt.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';
 import getHandler from './generic-file-handler';
 const storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;

package/lib-es/helpers/static-route-handlers/robots-txt.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["gql","ROUTE_PATTERN_ROBOTS_TXT","BLAZE_STATIC_ROUTE_STORE_KEY","getHandler","storeKey","process","env","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,OAAOA,GAAP,MAAgB,aAAhB;AACA,SAASC,wBAAT,EAAmCC,4BAAnC,QAAuE,iBAAvE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,MAAMC,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYJ,4BAAZ,IAA4CA,4BAA7D;AAEA,OAAO,MAAMK,SAAS,GAAGP,GAAI;AAC7B;AACA;AACA,4BAA4BI,QAAS;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWR,wBAAX,CAAhB;AAEP,OAAO,MAAMS,OAAO,GAAGP,UAAU,CAACI,SAAD,CAA1B","sourcesContent":["import gql from 'graphql-tag';\nimport { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nconst storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"${storeKey}\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_ROBOTS_TXT);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"robots-txt.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/robots-txt.js"],"names":["gql","ROUTE_PATTERN_ROBOTS_TXT","BLAZE_STATIC_ROUTE_STORE_KEY","getHandler","storeKey","process","env","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,SAASC,wBAAT,EAAmCC,4BAAnC,QAAuE,iBAAvE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,MAAMC,QAAQ,GAAGC,OAAO,CAACC,GAAR,CAAYJ,4BAAZ,IAA4CA,4BAA7D;AAEA,OAAO,MAAMK,SAAS,GAAGP,GAAI;AAC7B;AACA;AACA,4BAA4BI,QAAS;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWR,wBAAX,CAAhB;AAEP,OAAO,MAAMS,OAAO,GAAGP,UAAU,CAACI,SAAD,CAA1B","sourcesContent":["import { gql } from '@apollo/client';\nimport { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nconst storeKey = process.env.BLAZE_STATIC_ROUTE_STORE_KEY || BLAZE_STATIC_ROUTE_STORE_KEY;\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"${storeKey}\", filename: \"robots.txt\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_ROBOTS_TXT);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"robots-txt.js"}

package/lib-es/helpers/static-route-handlers/sitemap-file.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import 'cross-fetch/polyfill';
 import { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';
 import getHandler from './generic-file-handler';

package/lib-es/helpers/static-route-handlers/sitemap-file.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["gql","ROUTE_PATTERN_SITEMAP_FILE_REGEX","SITEMAP_STORE_KEY","getHandler","fileQuery","getVariables","asPath","filename","split","slice","where","storeKey","pattern","handler"],"mappings":"AAAA,OAAOA,GAAP,MAAgB,aAAhB;AACA,OAAO,sBAAP;AACA,SAASC,gCAAT,EAA2CC,iBAA3C,QAAoE,iBAApE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGJ,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA,CAPO;;AASP,SAASK,YAAT,CAAsB;AAAEC,EAAAA;AAAF,CAAtB,EAAkC;AAChC,QAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,QAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAET,iBAAZ;AAA+BK,IAAAA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA;AAAF,GAAP;AACD;;AAED,OAAO,MAAME,OAAO,GAAGX,gCAAhB;AAEP,OAAO,MAAMY,OAAO,GAAGV,UAAU,CAACC,SAAD,EAAYC,YAAZ,CAA1B","sourcesContent":["import gql from 'graphql-tag';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n`;\n\nfunction getVariables({ asPath }) {\n  const filename = asPath.split('/').slice(-1)[0];\n  const where = { storeKey: SITEMAP_STORE_KEY, filename };\n  return { where };\n}\n\nexport const pattern = ROUTE_PATTERN_SITEMAP_FILE_REGEX;\n\nexport const handler = getHandler(fileQuery, getVariables);\n"],"file":"sitemap-file.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap-file.js"],"names":["gql","ROUTE_PATTERN_SITEMAP_FILE_REGEX","SITEMAP_STORE_KEY","getHandler","fileQuery","getVariables","asPath","filename","split","slice","where","storeKey","pattern","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,OAAO,sBAAP;AACA,SAASC,gCAAT,EAA2CC,iBAA3C,QAAoE,iBAApE;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGJ,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA,CAPO;;AASP,SAASK,YAAT,CAAsB;AAAEC,EAAAA;AAAF,CAAtB,EAAkC;AAChC,QAAMC,QAAQ,GAAGD,MAAM,CAACE,KAAP,CAAa,GAAb,EAAkBC,KAAlB,CAAwB,CAAC,CAAzB,EAA4B,CAA5B,CAAjB;AACA,QAAMC,KAAK,GAAG;AAAEC,IAAAA,QAAQ,EAAET,iBAAZ;AAA+BK,IAAAA;AAA/B,GAAd;AACA,SAAO;AAAEG,IAAAA;AAAF,GAAP;AACD;;AAED,OAAO,MAAME,OAAO,GAAGX,gCAAhB;AAEP,OAAO,MAAMY,OAAO,GAAGV,UAAU,CAACC,SAAD,EAAYC,YAAZ,CAA1B","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query getFiles($where: JSON) {\n    files: getFiles(where: $where, limit: 1, sort: [{ property: \"created\", direction: \"desc\" }]) {\n      mimetype\n      url\n    }\n  }\n`;\n\nfunction getVariables({ asPath }) {\n  const filename = asPath.split('/').slice(-1)[0];\n  const where = { storeKey: SITEMAP_STORE_KEY, filename };\n  return { where };\n}\n\nexport const pattern = ROUTE_PATTERN_SITEMAP_FILE_REGEX;\n\nexport const handler = getHandler(fileQuery, getVariables);\n"],"file":"sitemap-file.js"}

package/lib-es/helpers/static-route-handlers/sitemap.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import 'cross-fetch/polyfill';
 import { ROUTE_PATTERN_SITEMAP } from '../../constants';
 import getHandler from './generic-file-handler';

package/lib-es/helpers/static-route-handlers/sitemap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["gql","ROUTE_PATTERN_SITEMAP","getHandler","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,OAAOA,GAAP,MAAgB,aAAhB;AACA,OAAO,sBAAP;AACA,SAASC,qBAAT,QAAsC,iBAAtC;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGH,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWJ,qBAAX,CAAhB;AAEP,OAAO,MAAMK,OAAO,GAAGJ,UAAU,CAACC,SAAD,CAA1B","sourcesContent":["import gql from 'graphql-tag';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_SITEMAP);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"sitemap.js"}
+{"version":3,"sources":["../../../src/helpers/static-route-handlers/sitemap.js"],"names":["gql","ROUTE_PATTERN_SITEMAP","getHandler","fileQuery","pattern","RegExp","handler"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;AACA,OAAO,sBAAP;AACA,SAASC,qBAAT,QAAsC,iBAAtC;AACA,OAAOC,UAAP,MAAuB,wBAAvB;AAEA,OAAO,MAAMC,SAAS,GAAGH,GAAI;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAXO;AAaP,OAAO,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAWJ,qBAAX,CAAhB;AAEP,OAAO,MAAMK,OAAO,GAAGJ,UAAU,CAACC,SAAD,CAA1B","sourcesContent":["import { gql } from '@apollo/client';\nimport 'cross-fetch/polyfill';\nimport { ROUTE_PATTERN_SITEMAP } from '../../constants';\nimport getHandler from './generic-file-handler';\n\nexport const fileQuery = gql`\n  query {\n    files: getFiles(\n      where: { storeKey: \"default_sitemap\", filename: \"sitemap-index.xml\" }\n      limit: 1\n      sort: [{ property: \"created\", direction: \"desc\" }]\n    ) {\n      mimetype\n      url\n    }\n  }\n`;\n\nexport const pattern = new RegExp(ROUTE_PATTERN_SITEMAP);\n\nexport const handler = getHandler(fileQuery);\n"],"file":"sitemap.js"}

package/lib-es/hoc/withBlaze.js

@@ -7,8 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 // see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js
 import React, { Component } from 'react';
-import Head from 'next/head';
-import { getDataFromTree } from 'react-apollo';
+import { getDataFromTree } from '@apollo/client/react/ssr';
 import getBlazeUi from '@blaze-cms/core-ui';
 import { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';
 import PropTypes from 'prop-types';
@@ -47,8 +46,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
       requestApp.ctx.router = router;
       requestApp.ctx.req = ctx.req;
       requestApp.ctx.res = ctx.res;
-      await requestApp.init();
       await blazeApp.init();
+      await requestApp.init();
       const apolloClient = getApolloClient(ctx, requestApp);
       ctx.apolloClient = apolloClient;
       ctx.blazeApp = requestApp;
@@ -57,23 +56,29 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
         appProps = await App.getInitialProps(context);
       }
 
-      if (isSsr) {
-        try {
-          await getDataFromTree( /*#__PURE__*/React.createElement(AppTree, _extends({}, appProps, {
-            Component: _Component,
-            router: router,
-            apolloClient: apolloClient
-          })));
-        } catch (error) {
-          errorProps = getErrorMessage(error);
-          if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
-          ctx.blazeApp.events.emit('monitor:log', {
-            error
-          });
-          requestApp.log.error('Error while running `getDataFromTree`', error);
-        }
-
-        Head.rewind();
+      const {
+        pageProps = {}
+      } = appProps;
+
+      const mainProps = _objectSpread(_objectSpread({}, appProps), {}, {
+        pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps)
+      });
+
+      if (!isSsr) return mainProps;
+
+      try {
+        await getDataFromTree( /*#__PURE__*/React.createElement(AppTree, _extends({}, appProps, {
+          Component: _Component,
+          router: router,
+          apolloClient: apolloClient
+        })));
+      } catch (error) {
+        errorProps = getErrorMessage(error);
+        if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
+        ctx.blazeApp.events.emit('monitor:log', {
+          error
+        });
+        requestApp.log.error('Error while running `getDataFromTree`', error);
       }
 
       const apolloState = apolloClient.cache.extract();
@@ -81,12 +86,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
         acc[key] = apolloState[key];
         return acc;
       }, {});
-      const {
-        pageProps = {}
-      } = appProps;
-      return _objectSpread(_objectSpread({}, appProps), {}, {
-        pageProps: _objectSpread(_objectSpread({}, pageProps), errorProps),
-        apolloState: sortedState
+      return _objectSpread(_objectSpread({}, mainProps), {}, {
+        pageProps: _objectSpread(_objectSpread({}, mainProps.pageProps), errorProps),
+        apolloState: sortedState,
+        processedBlazeEntities: blazeApp.getProcessedEntities()
       });
     }
 
@@ -110,9 +113,10 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
     setApolloClient() {
       if (!this.apolloClient) {
         const {
-          apolloState
+          apolloState,
+          processedBlazeEntities
         } = this.props;
-        this.apolloClient = blazeApp.createClient(apolloState);
+        this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
         setupCheckAccessToken(this.apolloClient);
       }
     }
@@ -132,10 +136,12 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
 
   }, _defineProperty(_class, "displayName", 'withBlaze(App)'), _defineProperty(_class, "propTypes", {
     apolloState: PropTypes.object,
-    apolloClient: PropTypes.object
+    apolloClient: PropTypes.object,
+    processedBlazeEntities: PropTypes.object
   }), _defineProperty(_class, "defaultProps", {
     apolloState: {},
-    apolloClient: null
+    apolloClient: null,
+    processedBlazeEntities: undefined
   }), _temp;
 }
 

package/lib-es/hoc/withBlaze.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["React","Component","Head","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","error","errorCode","statusCode","events","emit","log","rewind","apolloState","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","pageProps","constructor","props","state","appLoaded","initComplete","componentDidMount","setState","setApolloClient","render","object","withBlaze","buildConfig","forceSsr","window","logNameSpace"],"mappings":"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","sourcesContent":["// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js\nimport React, { Component } from 'react';\nimport Head from 'next/head';\nimport { getDataFromTree } from 'react-apollo';\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    };\n\n    static defaultProps = {\n      apolloState: {},\n      apolloClient: null\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 requestApp.init();\n      await blazeApp.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      if (isSsr) {\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        Head.rewind();\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      const { pageProps = {} } = appProps;\n\n      return {\n        ...appProps,\n        pageProps: { ...pageProps, ...errorProps },\n        apolloState: sortedState\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 } = this.props;\n        this.apolloClient = blazeApp.createClient(apolloState);\n        setupCheckAccessToken(this.apolloClient);\n      }\n    }\n\n    render() {\n      const { appLoaded } = this.state;\n\n      if (!appLoaded && !isSsr) return '...loading';\n\n      this.setApolloClient();\n\n      return (\n        <ErrorBoundary app={this.blazeApp}>\n          <App {...this.props} apolloClient={this.apolloClient} />\n        </ErrorBoundary>\n      );\n    }\n  };\n}\n\nconst withBlaze = (App, buildConfig, { forceSsr = false } = {}) => {\n  const isSsr = forceSsr || typeof window === 'undefined';\n  const config = buildConfig ? buildConfig(blazeConfig) : blazeConfig;\n  const blazeApp = getBlazeUi({ config, logNameSpace: APP_LOG_NAMESPACE_MAIN });\n  blazeApp.init();\n\n  return getWrappedApp(isSsr, config, blazeApp, App);\n};\n\nexport default withBlaze;\n"],"file":"withBlaze.js"}
+{"version":3,"sources":["../../src/hoc/withBlaze.js"],"names":["React","Component","getDataFromTree","getBlazeUi","setupCheckAccessToken","PropTypes","dynamic","blazeConfig","getErrorMessage","ErrorBoundary","APP_LOG_NAMESPACE_MAIN","getWrappedApp","isSsr","config","blazeApp","App","getApolloClient","ctx","requestApp","apolloClient","getClient","createClient","getRequestApp","getInitialProps","context","_Component","router","AppTree","appProps","errorProps","req","res","init","pageProps","mainProps","error","errorCode","statusCode","events","emit","log","apolloState","cache","extract","sortedState","Object","keys","sort","reduce","acc","key","processedBlazeEntities","getProcessedEntities","constructor","props","state","appLoaded","initComplete","componentDidMount","setState","setApolloClient","render","object","undefined","withBlaze","buildConfig","forceSsr","window","logNameSpace"],"mappings":"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","sourcesContent":["// see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js\nimport React, { Component } from 'react';\nimport { getDataFromTree } from '@apollo/client/react/ssr';\nimport getBlazeUi from '@blaze-cms/core-ui';\nimport { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';\nimport PropTypes from 'prop-types';\nimport dynamic from 'next/dynamic'; // Next.js dynamic\nimport blazeConfig from '../blaze.config';\nimport { getErrorMessage } from '../helpers';\n\nconst ErrorBoundary = dynamic(() => import('@blaze-cms/core-errors-ui'));\n\nconst APP_LOG_NAMESPACE_MAIN = 'main';\n\nfunction getWrappedApp(isSsr, config, blazeApp, App) {\n  function getApolloClient(ctx, requestApp) {\n    return ctx.apolloClient || requestApp.getClient() || requestApp.createClient();\n  }\n\n  function getRequestApp(requestApp) {\n    return !requestApp && isSsr ? getBlazeUi({ config }) : blazeApp;\n  }\n  return class extends Component {\n    static displayName = 'withBlaze(App)';\n\n    static propTypes = {\n      apolloState: PropTypes.object,\n      apolloClient: PropTypes.object,\n      processedBlazeEntities: PropTypes.object\n    };\n\n    static defaultProps = {\n      apolloState: {},\n      apolloClient: null,\n      processedBlazeEntities: undefined\n    };\n\n    static async getInitialProps(context) {\n      const { Component: _Component, router, AppTree, ctx } = context;\n      let appProps = {};\n      let errorProps = {};\n\n      let requestApp = ctx.blazeApp;\n      requestApp = getRequestApp(requestApp);\n\n      requestApp.ctx.router = router;\n      requestApp.ctx.req = ctx.req;\n      requestApp.ctx.res = ctx.res;\n\n      await blazeApp.init();\n      await requestApp.init();\n\n      const apolloClient = getApolloClient(ctx, requestApp);\n\n      ctx.apolloClient = apolloClient;\n      ctx.blazeApp = requestApp;\n      if (App.getInitialProps) {\n        appProps = await App.getInitialProps(context);\n      }\n\n      const { pageProps = {} } = appProps;\n      const mainProps = {\n        ...appProps,\n        pageProps: { ...pageProps, ...errorProps }\n      };\n\n      if (!isSsr) return mainProps;\n\n      try {\n        await getDataFromTree(\n          <AppTree\n            {...appProps}\n            Component={_Component}\n            router={router}\n            apolloClient={apolloClient}\n          />\n        );\n      } catch (error) {\n        errorProps = getErrorMessage(error);\n        if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;\n        ctx.blazeApp.events.emit('monitor:log', { error });\n        requestApp.log.error('Error while running `getDataFromTree`', error);\n      }\n\n      const apolloState = apolloClient.cache.extract();\n      const sortedState = Object.keys(apolloState)\n        .sort()\n        .reduce((acc, key) => {\n          acc[key] = apolloState[key];\n          return acc;\n        }, {});\n\n      return {\n        ...mainProps,\n        pageProps: { ...mainProps.pageProps, ...errorProps },\n        apolloState: sortedState,\n        processedBlazeEntities: blazeApp.getProcessedEntities()\n      };\n    }\n\n    constructor(props) {\n      super(props);\n      this.apolloClient = props.apolloClient;\n      this.state = {\n        appLoaded: isSsr || blazeApp.initComplete()\n      };\n      this.blazeApp = blazeApp;\n    }\n\n    async componentDidMount() {\n      if (blazeApp.initComplete()) return;\n\n      await blazeApp.init();\n\n      this.setState({\n        appLoaded: blazeApp.initComplete()\n      });\n    }\n\n    setApolloClient() {\n      if (!this.apolloClient) {\n        const { apolloState, processedBlazeEntities } = this.props;\n        this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);\n        setupCheckAccessToken(this.apolloClient);\n      }\n    }\n\n    render() {\n      const { appLoaded } = this.state;\n\n      if (!appLoaded && !isSsr) return '...loading';\n\n      this.setApolloClient();\n\n      return (\n        <ErrorBoundary app={this.blazeApp}>\n          <App {...this.props} apolloClient={this.apolloClient} />\n        </ErrorBoundary>\n      );\n    }\n  };\n}\n\nconst withBlaze = (App, buildConfig, { forceSsr = false } = {}) => {\n  const isSsr = forceSsr || typeof window === 'undefined';\n  const config = buildConfig ? buildConfig(blazeConfig) : blazeConfig;\n  const blazeApp = getBlazeUi({ config, logNameSpace: APP_LOG_NAMESPACE_MAIN });\n  blazeApp.init();\n\n  return getWrappedApp(isSsr, config, blazeApp, App);\n};\n\nexport default withBlaze;\n"],"file":"withBlaze.js"}

package/lib-es/hooks/use-get-page.js

@@ -1,4 +1,4 @@
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 
 function useGetPage(queryData, id) {
   const {

package/lib-es/hooks/use-get-page.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useQuery","useGetPage","queryData","id","data","loading","error","variables"],"mappings":"AAAA,SAASA,QAAT,QAAyB,qBAAzB;;AAEA,SAASC,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,QAAM;AAAEC,IAAAA,IAAI,GAAG,EAAT;AAAaC,IAAAA,OAAb;AAAsBC,IAAAA;AAAtB,MAAgCN,QAAQ,CAACE,SAAD,EAAY;AAAEK,IAAAA,SAAS,EAAE;AAAEJ,MAAAA;AAAF;AAAb,GAAZ,CAA9C;AAEA,SAAO;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,GAAP;AACD;;AAED,eAAeL,UAAf","sourcesContent":["import { useQuery } from '@apollo/react-hooks';\n\nfunction useGetPage(queryData, id) {\n  const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });\n\n  return { data, loading, error };\n}\n\nexport default useGetPage;\n"],"file":"use-get-page.js"}
+{"version":3,"sources":["../../src/hooks/use-get-page.js"],"names":["useQuery","useGetPage","queryData","id","data","loading","error","variables"],"mappings":"AAAA,SAASA,QAAT,QAAyB,gBAAzB;;AAEA,SAASC,UAAT,CAAoBC,SAApB,EAA+BC,EAA/B,EAAmC;AACjC,QAAM;AAAEC,IAAAA,IAAI,GAAG,EAAT;AAAaC,IAAAA,OAAb;AAAsBC,IAAAA;AAAtB,MAAgCN,QAAQ,CAACE,SAAD,EAAY;AAAEK,IAAAA,SAAS,EAAE;AAAEJ,MAAAA;AAAF;AAAb,GAAZ,CAA9C;AAEA,SAAO;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,OAAR;AAAiBC,IAAAA;AAAjB,GAAP;AACD;;AAED,eAAeL,UAAf","sourcesContent":["import { useQuery } from '@apollo/client';\n\nfunction useGetPage(queryData, id) {\n  const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });\n\n  return { data, loading, error };\n}\n\nexport default useGetPage;\n"],"file":"use-get-page.js"}

package/lib-es/index.js

@@ -1,4 +1,4 @@
-import * as reactApollo from 'react-apollo';
+import * as reactApollo from '@apollo/client';
 export { reactApollo };
 export { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';
 export { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';

package/lib-es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["reactApollo","SearchPublishedContent","MainContext","MainContextProvider","default","withBlaze","Resolver","BlazeDocument","router"],"mappings":"AAAA,OAAO,KAAKA,WAAZ,MAA6B,cAA7B;AAEA,SAASA,WAAT;AACA,SAASC,sBAAT,QAAuC,6BAAvC;AACA,SAASC,WAAT,EAAsBC,mBAAtB,QAAiD,8BAAjD;AACA,SAASC,OAAO,IAAIC,SAApB,QAAqC,iBAArC;AACA,SAASD,OAAO,IAAIE,QAApB,QAAoC,kBAApC;AACA,SAASF,OAAO,IAAIG,aAApB,QAAyC,4BAAzC;AACA,SAASH,OAAO,IAAII,MAApB,QAAkC,iBAAlC","sourcesContent":["import * as reactApollo from 'react-apollo';\n\nexport { reactApollo };\nexport { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';\nexport { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';\nexport { default as withBlaze } from './hoc/withBlaze';\nexport { default as Resolver } from './pages/Resolver';\nexport { default as BlazeDocument } from './pages/document/_document';\nexport { default as router } from './server/routes';\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["reactApollo","SearchPublishedContent","MainContext","MainContextProvider","default","withBlaze","Resolver","BlazeDocument","router"],"mappings":"AAAA,OAAO,KAAKA,WAAZ,MAA6B,gBAA7B;AAEA,SAASA,WAAT;AACA,SAASC,sBAAT,QAAuC,6BAAvC;AACA,SAASC,WAAT,EAAsBC,mBAAtB,QAAiD,8BAAjD;AACA,SAASC,OAAO,IAAIC,SAApB,QAAqC,iBAArC;AACA,SAASD,OAAO,IAAIE,QAApB,QAAoC,kBAApC;AACA,SAASF,OAAO,IAAIG,aAApB,QAAyC,4BAAzC;AACA,SAASH,OAAO,IAAII,MAApB,QAAkC,iBAAlC","sourcesContent":["import * as reactApollo from '@apollo/client';\n\nexport { reactApollo };\nexport { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';\nexport { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';\nexport { default as withBlaze } from './hoc/withBlaze';\nexport { default as Resolver } from './pages/Resolver';\nexport { default as BlazeDocument } from './pages/document/_document';\nexport { default as router } from './server/routes';\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/nextjs-tools",
-  "version": "0.118.0",
+  "version": "0.119.0-alpha.0",
   "description": "Blaze nextjs tools",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,38 +27,37 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/core-auth-ui": "^0.118.0",
+    "@apollo/client": "^3.5.7",
+    "@blaze-cms/core-auth-ui": "^0.119.0-alpha.0",
     "@blaze-cms/core-errors": "^0.118.0",
-    "@blaze-cms/core-errors-ui": "^0.92.0",
-    "@blaze-cms/core-ui": "^0.118.0",
-    "@blaze-cms/nextjs-components": "^0.118.0",
-    "@blaze-cms/plugin-auth-fe": "^0.118.0",
-    "@blaze-cms/plugin-google-maps-fe": "^0.118.0",
-    "@blaze-cms/plugin-gtm-fe": "^0.118.0",
-    "@blaze-cms/plugin-page-builder-fe": "^0.118.0",
-    "@blaze-cms/plugin-preview-fe": "^0.118.0",
-    "@blaze-cms/plugin-search-ui": "^0.118.0",
-    "@blaze-cms/react-page-builder": "^0.118.0",
+    "@blaze-cms/core-errors-ui": "^0.119.0-alpha.0",
+    "@blaze-cms/core-ui": "^0.119.0-alpha.0",
+    "@blaze-cms/nextjs-components": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-auth-fe": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-google-maps-fe": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-gtm-fe": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-page-builder-fe": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-preview-fe": "^0.119.0-alpha.0",
+    "@blaze-cms/plugin-search-ui": "^0.119.0-alpha.0",
+    "@blaze-cms/react-page-builder": "^0.119.0-alpha.0",
     "@blaze-cms/setup-ui": "^0.92.0",
     "autoprefixer": "^10.2.3",
     "core-js": "^3.2.1",
     "cross-fetch": "^3.0.2",
-    "graphql-tag": "^2.10.1",
     "jsonwebtoken": "^8.5.1",
     "nextjs-dynamic-routes": "^2.5.1",
     "postcss": "8.2.8",
     "postcss-loader": "4.2.0",
     "postcss-preset-env": "6.7.0",
     "query-string": "^6.9.0",
-    "react-apollo": "^3.1.1",
     "react-icons": "^4.3.1",
     "regenerator-runtime": "^0.13.3",
     "sass": "1.32.8"
   },
   "peerDependencies": {
-    "next": "10.0.5",
+    "next": "12.x",
     "prop-types": "^15.7.2",
-    "react": "^16.13.1"
+    "react": "^17.0.2"
   },
   "devDependencies": {
     "nock": "^13.0.5"
@@ -67,5 +66,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "6814f1366b463d508604959b0f688c9dc170ccf8"
+  "gitHead": "2ea69a86608ec124c0da9fc26ae11471821fbd01"
 }

package/src/application/query/index.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 
 const pageDataFields = `
 id
@@ -6,13 +6,17 @@ name
 preparedPageBuilderComponents
 canonicalUrl
 category {
+  id
   name
 }
 tags {
+  id
   name
 }
 slug
 image{
+  id
+  data
   url
 }
 formattedMetaTitle

package/src/blaze.config.js

@@ -13,7 +13,8 @@ plugins.set(previewFe, {});
 plugins.set(authFe, {});
 
 const apollo = {
-  uri: process.env.BLAZE_GRAPHQL_URI
+  uri: process.env.BLAZE_GRAPHQL_URI,
+  loadEntitiesInBrowser: false
 };
 
 export default { plugins, apollo };

package/src/helpers/static-route-handlers/robots-txt.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import { ROUTE_PATTERN_ROBOTS_TXT, BLAZE_STATIC_ROUTE_STORE_KEY } from '../../constants';
 import getHandler from './generic-file-handler';
 

package/src/helpers/static-route-handlers/sitemap-file.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import 'cross-fetch/polyfill';
 import { ROUTE_PATTERN_SITEMAP_FILE_REGEX, SITEMAP_STORE_KEY } from '../../constants';
 import getHandler from './generic-file-handler';

package/src/helpers/static-route-handlers/sitemap.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import 'cross-fetch/polyfill';
 import { ROUTE_PATTERN_SITEMAP } from '../../constants';
 import getHandler from './generic-file-handler';

package/src/hoc/withBlaze.js

@@ -1,7 +1,6 @@
 // see: https://github.com/zeit/next.js/blob/canary/examples/with-apollo-auth/lib/withApollo.js
 import React, { Component } from 'react';
-import Head from 'next/head';
-import { getDataFromTree } from 'react-apollo';
+import { getDataFromTree } from '@apollo/client/react/ssr';
 import getBlazeUi from '@blaze-cms/core-ui';
 import { setupCheckAccessToken } from '@blaze-cms/core-auth-ui';
 import PropTypes from 'prop-types';
@@ -26,12 +25,14 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
 
     static propTypes = {
       apolloState: PropTypes.object,
-      apolloClient: PropTypes.object
+      apolloClient: PropTypes.object,
+      processedBlazeEntities: PropTypes.object
     };
 
     static defaultProps = {
       apolloState: {},
-      apolloClient: null
+      apolloClient: null,
+      processedBlazeEntities: undefined
     };
 
     static async getInitialProps(context) {
@@ -46,8 +47,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
       requestApp.ctx.req = ctx.req;
       requestApp.ctx.res = ctx.res;
 
-      await requestApp.init();
       await blazeApp.init();
+      await requestApp.init();
 
       const apolloClient = getApolloClient(ctx, requestApp);
 
@@ -57,24 +58,28 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
         appProps = await App.getInitialProps(context);
       }
 
-      if (isSsr) {
-        try {
-          await getDataFromTree(
-            <AppTree
-              {...appProps}
-              Component={_Component}
-              router={router}
-              apolloClient={apolloClient}
-            />
-          );
-        } catch (error) {
-          errorProps = getErrorMessage(error);
-          if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
-          ctx.blazeApp.events.emit('monitor:log', { error });
-          requestApp.log.error('Error while running `getDataFromTree`', error);
-        }
-
-        Head.rewind();
+      const { pageProps = {} } = appProps;
+      const mainProps = {
+        ...appProps,
+        pageProps: { ...pageProps, ...errorProps }
+      };
+
+      if (!isSsr) return mainProps;
+
+      try {
+        await getDataFromTree(
+          <AppTree
+            {...appProps}
+            Component={_Component}
+            router={router}
+            apolloClient={apolloClient}
+          />
+        );
+      } catch (error) {
+        errorProps = getErrorMessage(error);
+        if (errorProps.errorCode) ctx.res.statusCode = errorProps.errorCode;
+        ctx.blazeApp.events.emit('monitor:log', { error });
+        requestApp.log.error('Error while running `getDataFromTree`', error);
       }
 
       const apolloState = apolloClient.cache.extract();
@@ -85,12 +90,11 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
           return acc;
         }, {});
 
-      const { pageProps = {} } = appProps;
-
       return {
-        ...appProps,
-        pageProps: { ...pageProps, ...errorProps },
-        apolloState: sortedState
+        ...mainProps,
+        pageProps: { ...mainProps.pageProps, ...errorProps },
+        apolloState: sortedState,
+        processedBlazeEntities: blazeApp.getProcessedEntities()
       };
     }
 
@@ -115,8 +119,8 @@ function getWrappedApp(isSsr, config, blazeApp, App) {
 
     setApolloClient() {
       if (!this.apolloClient) {
-        const { apolloState } = this.props;
-        this.apolloClient = blazeApp.createClient(apolloState);
+        const { apolloState, processedBlazeEntities } = this.props;
+        this.apolloClient = blazeApp.createClient(apolloState, processedBlazeEntities);
         setupCheckAccessToken(this.apolloClient);
       }
     }

package/src/hooks/use-get-page.js

@@ -1,4 +1,4 @@
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 
 function useGetPage(queryData, id) {
   const { data = {}, loading, error } = useQuery(queryData, { variables: { id } });

package/src/index.js

@@ -1,4 +1,4 @@
-import * as reactApollo from 'react-apollo';
+import * as reactApollo from '@apollo/client';
 
 export { reactApollo };
 export { SearchPublishedContent } from '@blaze-cms/plugin-search-ui';

package/tests/unit/src/components/DebugSidebar/DebugSidebar.test.js

@@ -1,6 +1,6 @@
 import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
 import { render, act, fireEvent } from '@testing-library/react';
 import { DebugSidebar } from '../../../../../src/components';
 

package/tests/unit/src/containers/ContentContainer.test.js

@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
 import { render } from '@testing-library/react';
 import { buildPBComponents, getLightboxImages } from '@blaze-cms/plugin-page-builder-fe';
 import { ContentContainer } from '../../../../src/containers';

package/tests/unit/src/helpers/static-route-handlers/generic-file-handler.test.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import getHandler from '../../../../../src/helpers/static-route-handlers/generic-file-handler';
 import { getStaticFileHandlerTests } from '../../../../helpers/tests/static-file-handler-tests';
 

package/tests/unit/src/hoc/withBlaze.test.js

@@ -11,12 +11,14 @@ jest.mock('@blaze-cms/core-ui', () => {
       extract: jest.fn(() => ({ cache: true }))
     }
   };
+
   const mockBlaze = {
     ctx: { req: {}, res: {} },
     initComplete: jest.fn(() => true),
     init: jest.fn(async () => true),
     getClient: jest.fn(() => null),
     createClient: jest.fn(() => apolloClient),
+    getProcessedEntities: jest.fn(() => ({ typePolicyQueryFields: {}, possibleTypes: {} })),
     events: {
       emit: jest.fn()
     },
@@ -37,7 +39,15 @@ describe('withBlaze HOC', () => {
   const props = {
     test: true
   };
-  const expectedProps = [{ ...props, apolloClient: blazeMock.createClient(), apolloState: {} }, {}];
+  const expectedProps = [
+    {
+      ...props,
+      apolloClient: blazeMock.createClient(),
+      apolloState: {},
+      processedBlazeEntities: undefined
+    },
+    {}
+  ];
 
   const Component = 'Component';
   const AppTree = jest.fn(() => null);
@@ -67,6 +77,7 @@ describe('withBlaze HOC', () => {
   it('should wrap component and use buildConfig function', async () => {
     const AppWithBlaze = withBlaze(App);
     const { asFragment, queryByText } = render(<AppWithBlaze {...props} />);
+
     await waitFor(() => expect(queryByText(appString)).toBeDefined());
 
     expect(App).toHaveBeenCalledWith(...expectedProps);
@@ -100,7 +111,12 @@ describe('withBlaze HOC', () => {
     expect(buildConfig).toHaveBeenCalledWith(blazeConfig);
 
     const initialProps = await AppWithBlaze.getInitialProps(context);
-    expect(initialProps).toEqual({ ...appProps, pageProps: {}, apolloState: { cache: true } });
+    expect(initialProps).toEqual({
+      ...appProps,
+      pageProps: {},
+      apolloState: { cache: true },
+      processedBlazeEntities: blazeMock.getProcessedEntities()
+    });
     expect(App.getInitialProps).toHaveBeenCalledWith(context);
     const [firstApprTreeCall] = AppTree.mock.calls;
     expect(firstApprTreeCall[0]).toEqual({
@@ -110,6 +126,7 @@ describe('withBlaze HOC', () => {
       apolloClient: blazeMock.createClient()
     });
     expect(blazeMock.init).toHaveBeenCalledTimes(3);
+    expect(blazeMock.getProcessedEntities).toHaveBeenCalledTimes(2);
   });
 
   it('should add getInitialProps and not render in client', async () => {