@blaze-cms/nextjs-tools 0.146.0-core-styles.43 → 0.146.0-node18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/nextjs-tools",
-  "version": "0.146.0-core-styles.43",
+  "version": "0.146.0-node18.0",
   "description": "Blaze nextjs tools",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -10,15 +10,15 @@
   },
   "scripts": {
     "test": "jest",
-    "lint": "yarn run lint:js",
+    "lint": "npm run lint:js",
     "lint:js": "eslint .",
     "clean": "rm -Rf ./lib/ && rm -Rf ./lib-es/",
     "build:cjs": "BABEL_ENV=cjs ../../node_modules/.bin/babel ./src --out-dir ./lib --source-maps --root-mode upward",
     "build:esm": "BABEL_ENV=esm ../../node_modules/.bin/babel ./src --out-dir ./lib-es --source-maps --root-mode upward",
-    "build": "yarn run build:cjs && yarn run build:esm",
-    "build:clean": "yarn run clean && yarn run build",
-    "prepublishOnly": "yarn run build:clean",
-    "postpublish": "yarn run clean"
+    "build": "npm run build:cjs && npm run build:esm",
+    "build:clean": "npm run clean && npm run build",
+    "prepublishOnly": "npm run build:clean",
+    "postpublish": "npm run clean"
   },
   "author": {
     "email": "hello@thebyte9.com",
@@ -27,26 +27,26 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@apollo/client": "3.5.x",
-    "@blaze-cms/core-auth-ui": "0.146.0-core-styles.41",
-    "@blaze-cms/core-errors": "0.146.0-core-styles.41",
-    "@blaze-cms/core-errors-ui": "0.145.1-core-styles.0",
-    "@blaze-cms/core-ui": "0.146.0-core-styles.41",
-    "@blaze-cms/nextjs-components": "0.146.0-core-styles.42",
-    "@blaze-cms/plugin-auth-fe": "0.146.0-core-styles.41",
-    "@blaze-cms/plugin-auth-local-fe": "0.146.0-core-styles.41",
-    "@blaze-cms/plugin-google-maps-fe": "0.146.0-core-styles.43",
-    "@blaze-cms/plugin-gtm-fe": "0.146.0-core-styles.43",
-    "@blaze-cms/plugin-page-builder-fe": "0.146.0-core-styles.43",
-    "@blaze-cms/plugin-preview-fe": "0.146.0-core-styles.41",
-    "@blaze-cms/plugin-search-ui": "0.146.0-core-styles.41",
-    "@blaze-cms/plugin-structured-data-fe": "0.145.1-core-styles.0",
-    "@blaze-cms/react-page-builder": "0.146.0-core-styles.43",
-    "@blaze-cms/setup-ui": "0.145.1-core-styles.0",
+    "@apollo/client": "^3.9.2",
+    "@blaze-cms/core-auth-ui": "0.146.0-node18.0",
+    "@blaze-cms/core-errors": "0.146.0-node18.0",
+    "@blaze-cms/core-errors-ui": "0.146.0-node18.0",
+    "@blaze-cms/core-ui": "0.146.0-node18.0",
+    "@blaze-cms/nextjs-components": "0.146.0-node18.0",
+    "@blaze-cms/plugin-auth-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-auth-local-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-google-maps-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-gtm-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-page-builder-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-preview-fe": "0.146.0-node18.0",
+    "@blaze-cms/plugin-search-ui": "0.146.0-node18.0",
+    "@blaze-cms/plugin-structured-data-fe": "0.146.0-node18.0",
+    "@blaze-cms/react-page-builder": "0.146.0-node18.0",
+    "@blaze-cms/setup-ui": "0.146.0-node18.0",
     "autoprefixer": "^10.2.3",
     "core-js": "^3.2.1",
     "cross-fetch": "^3.0.2",
-    "graphql": "^16.2.0",
+    "graphql": "^15.2.0",
     "jsonwebtoken": "^8.5.1",
     "nextjs-dynamic-routes": "^2.5.1",
     "postcss": "8.2.8",
@@ -58,9 +58,9 @@
     "sass": "1.32.8"
   },
   "peerDependencies": {
-    "next": "12.x",
+    "next": "14.1.0",
     "prop-types": "^15.7.2",
-    "react": "^17.0.2"
+    "react": "^18.2.0"
   },
   "devDependencies": {
     "nock": "^13.0.5"
@@ -69,5 +69,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "a59ac0d9940f1e6022d9b832c468953a602b892c"
+  "gitHead": "c60370714e89e0c96f2169d61e4c56bc542f7686"
 }

package/src/components/DebugSidebar/index.js

@@ -10,14 +10,11 @@ const DebugSidebar = ({ itemEntity, itemId, debugMode }) => {
   const [isDebugMode, setIsDebugMode] = useState(debugMode);
   const [isOpen, setIsOpen] = useState(true);
 
-  useEffect(
-    () => {
-      if (debugMode === true) {
-        setIsDebugMode(debugMode);
-      } else setBlazeDebug(setIsDebugMode);
-    },
-    [debugMode]
-  );
+  useEffect(() => {
+    if (debugMode === true) {
+      setIsDebugMode(debugMode);
+    } else setBlazeDebug(setIsDebugMode);
+  }, [debugMode]);
 
   const divClass = classnames('debug-sidebar', {
     'debug-sidebar--open': isOpen,

package/src/helpers/check-url.js

@@ -6,7 +6,8 @@ import {
   DOUBLE_SLASH,
   COLON,
   NOT_FOUND_STATUS_CODE,
-  BLAZE_X_FRAME_OPTIONS_DEFAULT
+  BLAZE_X_FRAME_OPTIONS_DEFAULT,
+  ROUTE_REGEX
 } from '../constants';
 import { checkUrlQuery } from '../application/query';
 import checkParent from './check-parent';
@@ -15,7 +16,7 @@ import handleStaticRoutes from './handle-static-routes';
 import getPageData from './get-page-data';
 import getRootSelectorClasses from './get-root-selector-classes';
 
-const getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT || 1);
+const getRootClassesLimit = () => Number(process.env.BLAZE_ROOT_SELECTOR_CLASSES_LIMIT);
 
 const checkUrl = async props => {
   const { asPath, apolloClient, res, req, query, blazeApp, disableSsr } = props;
@@ -89,6 +90,9 @@ const getFullUrl = (req, asPath) => {
 
 const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blazeApp }) => {
   try {
+    if (!ROUTE_REGEX.test(url)) {
+      throw Error('Invalid URL');
+    }
     const {
       data: {
         checkUrl: { itemId, itemEntity, urlTo, pageData = {} }
@@ -99,7 +103,6 @@ const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blaz
         url
       }
     });
-
     const { cacheControlMaxAge = null } = pageData || {}; // pageData can be null when there is no page
     if (res && cacheControlMaxAge !== null && cacheControlMaxAge >= 0) {
       res.setHeader('Cache-Control', `max-age=${cacheControlMaxAge}`);
@@ -136,7 +139,6 @@ const doUrlCheck = async ({ asPath, url, apolloClient, res, handle404Error, blaz
 
 const handleError = (err, res, handle404Error, blazeApp) => {
   blazeApp.events.emit('monitor:log', { error: err });
-
   if (!res) return {};
   if (err.networkError) {
     res.writeHead(500, { 'Content-Type': 'text/plain' });

package/src/index.js

@@ -6,4 +6,4 @@ export { MainContext, MainContextProvider } from '@blaze-cms/nextjs-components';
 export { default as withBlaze } from './hoc/withBlaze';
 export { default as Resolver } from './pages/Resolver';
 export { default as BlazeDocument } from './pages/document/_document';
-export { default as router } from './server/routes';
+// export { default as router } from './server/routes';

package/src/pages/Resolver.js

@@ -35,6 +35,7 @@ const Resolver = props => {
         if (url.hash) url.searchParams.set('_h', Date.now());
         asPath = url;
       }
+
       router.push('/Resolver', asPath);
     }
     return '';
@@ -56,7 +57,6 @@ const Resolver = props => {
         isPreview={isPreview}
         fullUrl={fullUrl}
       />
-
       <DebugSidebar itemId={itemId} itemEntity={itemEntity} />
     </div>
   );

package/src/pages/document/_document.js

@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Document, { Html, Head } from 'next/document';
+// import Head from 'next/head';
 import DocumentBody from './DocumentBody';
 import { renderAppleTags } from '../../helpers';
 
 const BlazeDocument = ({ children }) => (
   <Html lang="en">
     <Head>
-      <link rel="icon" href="/static/img/favicon.png" type="image/x-icon" />
+      {/* <link rel="icon" href="/static/img/favicon.png" type="image/x-icon" /> */}
       {renderAppleTags()}
     </Head>
     {children}

package/src/server/index.js

@@ -1,12 +1,13 @@
 const { createServer } = require('http');
-const Router = require('./routes');
 
 const port = parseInt(process.env.PORT, 10) || 3000;
 
-async function prepareServer(nextApp) {
-  const handler = Router.getRequestHandler(nextApp);
+async function prepareServer(app) {
+  // eslint-disable-next-line no-console
+  console.warn('server.js is deprecated. Run directly with "next" cli instead.');
+  const handler = app.getRequestHandler();
 
-  await nextApp.prepare();
+  await app.prepare();
 
   return { run: () => createServer(handler).listen(port), handler };
 }

package/tests/helpers/tests/static-file-handler-tests.js

@@ -39,14 +39,12 @@ export const getStaticFileHandlerTests = (staticHandler, asPath, getVariables) =
   });
 
   describe('Standard', () => {
-    const scope = nock(host)
-      .get(path)
-      .reply(200, responseText, {
-        etag,
-        'content-length': contentLength,
-        'last-modified': lastModified,
-        'other-header': 'header'
-      });
+    const scope = nock(host).get(path).reply(200, responseText, {
+      etag,
+      'content-length': contentLength,
+      'last-modified': lastModified,
+      'other-header': 'header'
+    });
 
     beforeAll(async () => {
       await handler({ apolloClient, res, asPath });
@@ -82,9 +80,7 @@ export const getStaticFileHandlerTests = (staticHandler, asPath, getVariables) =
   });
 
   it('should not set headers if not present in file request', async () => {
-    const scopeNoHeaders = nock(host)
-      .get(path)
-      .reply(200, responseText);
+    const scopeNoHeaders = nock(host).get(path).reply(200, responseText);
     res.setHeader.mockClear();
     await handler({ apolloClient, res, asPath });
     expect(scopeNoHeaders.isDone()).toEqual(true);

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

@@ -9,6 +9,9 @@ exports[`DebugSidebar component should render without throwing error (isDebugMod
     <a
       aria-label="Blaze admin"
       href="/"
+    />
+    <a
+      href="/"
     >
       <img
         alt="blaze-logo"

package/tests/unit/src/helpers/handle-static-routes.test.js

@@ -5,7 +5,7 @@ import { ROUTE_PATTERN_SITEMAP } from '../../../../src/constants';
 import { handler } from '../../../../src/helpers/static-route-handlers/sitemap';
 
 jest.mock('../../../../src/helpers/static-route-handlers/sitemap', () => ({
-  pattern: new RegExp('/sitemap.xml'),
+  pattern: /\/sitemap.xml/,
   handler: jest.fn(async () => 'Sitemap content')
 }));
 

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

@@ -29,7 +29,12 @@ jest.mock('@blaze-cms/core-ui', () => {
       error: jest.fn()
     },
     openQueryChecker: {
-      checkOpenQueries: jest.fn(() => new Promise(resolve => setTimeout(resolve, 1000)))
+      checkOpenQueries: jest.fn(
+        () =>
+          new Promise(resolve => {
+            setTimeout(resolve, 1000);
+          })
+      )
     }
   };
   return jest.fn(() => mockBlaze);
@@ -77,17 +82,12 @@ describe('withBlaze HOC', () => {
     context.ctx.res = { ...defaultRes };
   });
 
-  it('should be defined', () => {
-    expect(withBlaze).toBeDefined();
-  });
-
   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);
     expect(blazeMock.init).toHaveBeenCalledTimes(1);
     expect(blazeMock.initComplete).toHaveBeenCalledTimes(2);