@sitecore-jss/sitecore-jss-nextjs 22.7.0-canary.1 → 22.7.0-canary.10

package/dist/cjs/components/Link.js

@@ -39,7 +39,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Link = void 0;
 const react_1 = __importStar(require("react"));
-const prop_types_1 = __importDefault(require("prop-types"));
 const link_1 = __importDefault(require("next/link"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 /**
@@ -68,7 +67,9 @@ exports.Link = (0, react_1.forwardRef)((props, ref) => {
         // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
         if (isMatching && !isFileUrl) {
             delete htmlLinkProps.emptyFieldEditingComponent;
-            return (react_1.default.createElement(link_1.default, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }),
+            return (react_1.default.createElement(link_1.default, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }, (process.env.TEST
+                ? { 'data-nextjs-link': true, 'data-nextjs-link-prefetch': props.prefetch }
+                : {})),
                 text,
                 children));
         }
@@ -77,7 +78,6 @@ exports.Link = (0, react_1.forwardRef)((props, ref) => {
     const reactLinkProps = Object.assign({}, props);
     delete reactLinkProps.internalLinkMatcher;
     delete reactLinkProps.prefetch;
-    return react_1.default.createElement(sitecore_jss_react_1.Link, Object.assign({}, reactLinkProps, { ref: ref }));
+    return (react_1.default.createElement(sitecore_jss_react_1.Link, Object.assign({}, reactLinkProps, { ref: ref }, (process.env.TEST ? { 'data-react-link': true } : {}))));
 });
 exports.Link.displayName = 'NextLink';
-exports.Link.propTypes = Object.assign({ internalLinkMatcher: prop_types_1.default.instanceOf(RegExp) }, sitecore_jss_react_1.LinkPropTypes);

package/dist/cjs/components/NextImage.js

@@ -16,7 +16,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NextImage = void 0;
 const media_1 = require("@sitecore-jss/sitecore-jss/media");
-const prop_types_1 = __importDefault(require("prop-types"));
 const react_1 = __importDefault(require("react"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 const image_1 = __importDefault(require("next/image"));
@@ -63,26 +62,8 @@ exports.NextImage = (0, sitecore_jss_react_1.withFieldMetadata)((0, sitecore_jss
         delete imageProps.height;
     }
     if (attrs) {
-        return react_1.default.createElement(image_1.default, Object.assign({ alt: "" }, imageProps));
+        return (react_1.default.createElement(image_1.default, Object.assign({ alt: "" }, imageProps, (process.env.TEST ? { 'data-unoptimized': unoptimized } : {}))));
     }
     return null; // we can't handle the truth
 }, { defaultEmptyFieldEditingComponent: sitecore_jss_react_3.DefaultEmptyFieldEditingComponentImage }));
-exports.NextImage.propTypes = {
-    field: prop_types_1.default.oneOfType([
-        prop_types_1.default.shape({
-            src: prop_types_1.default.string.isRequired,
-        }),
-        prop_types_1.default.shape({
-            value: prop_types_1.default.object,
-            editable: prop_types_1.default.string,
-        }),
-    ]),
-    editable: prop_types_1.default.bool,
-    mediaUrlPrefix: prop_types_1.default.instanceOf(RegExp),
-    imageParams: prop_types_1.default.objectOf(prop_types_1.default.oneOfType([prop_types_1.default.number.isRequired, prop_types_1.default.string.isRequired]).isRequired),
-    emptyFieldEditingComponent: prop_types_1.default.oneOfType([
-        prop_types_1.default.object,
-        prop_types_1.default.func,
-    ]),
-};
 exports.NextImage.displayName = 'NextImage';

package/dist/cjs/components/RichText.js

@@ -33,13 +33,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RichText = exports.prefetched = void 0;
 const react_1 = __importStar(require("react"));
-const prop_types_1 = __importDefault(require("prop-types"));
 const router_1 = require("next/router");
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 exports.prefetched = {};
@@ -93,5 +89,4 @@ const RichText = (props) => {
     return react_1.default.createElement(sitecore_jss_react_1.RichText, Object.assign({ ref: richTextRef, editable: editable }, rest));
 };
 exports.RichText = RichText;
-exports.RichText.propTypes = Object.assign({ internalLinksSelector: prop_types_1.default.string }, sitecore_jss_react_1.RichTextPropTypes);
 exports.RichText.displayName = 'NextRichText';

package/dist/cjs/middleware/personalize-middleware.js

@@ -26,7 +26,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     constructor(config) {
         super(config);
         this.config = config;
-        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+        this.handler = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -86,6 +86,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 params,
                 language,
                 timeout,
+                options,
             }, req).then((personalization) => {
                 const variantId = personalization.variantId;
                 if (variantId) {
@@ -124,9 +125,9 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
      * @returns middleware handler
      */
     getHandler() {
-        return (req, res) => __awaiter(this, void 0, void 0, function* () {
+        return (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.handler(req, res);
+                return yield this.handler(req, res, options);
             }
             catch (error) {
                 console.log('Personalize middleware failed:');
@@ -149,7 +150,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         });
     }
     personalize(_a, request_1) {
-        return __awaiter(this, arguments, void 0, function* ({ params, friendlyId, language, timeout, variantIds, }, request) {
+        return __awaiter(this, arguments, void 0, function* ({ params, friendlyId, language, timeout, variantIds, options, }, request) {
             var _b;
             sitecore_jss_1.debug.personalize('executing experience for %s %o', friendlyId, params);
             return (yield (0, server_3.personalize)(request, {
@@ -159,6 +160,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 params,
                 language,
                 pageVariantIds: variantIds,
+                geo: options === null || options === void 0 ? void 0 : options.geo,
             }, { timeout }));
         });
     }

package/dist/esm/components/Link.js

@@ -10,9 +10,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React, { forwardRef } from 'react';
-import PropTypes from 'prop-types';
 import NextLink from 'next/link';
-import { Link as ReactLink, LinkPropTypes, } from '@sitecore-jss/sitecore-jss-react';
+import { Link as ReactLink, } from '@sitecore-jss/sitecore-jss-react';
 /**
  * Matches relative URLs that end with a file extension.
  */
@@ -39,7 +38,9 @@ export const Link = forwardRef((props, ref) => {
         // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
         if (isMatching && !isFileUrl) {
             delete htmlLinkProps.emptyFieldEditingComponent;
-            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }),
+            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class, prefetch: props.prefetch }, htmlLinkProps, { ref: ref }, (process.env.TEST
+                ? { 'data-nextjs-link': true, 'data-nextjs-link-prefetch': props.prefetch }
+                : {})),
                 text,
                 children));
         }
@@ -48,7 +49,6 @@ export const Link = forwardRef((props, ref) => {
     const reactLinkProps = Object.assign({}, props);
     delete reactLinkProps.internalLinkMatcher;
     delete reactLinkProps.prefetch;
-    return React.createElement(ReactLink, Object.assign({}, reactLinkProps, { ref: ref }));
+    return (React.createElement(ReactLink, Object.assign({}, reactLinkProps, { ref: ref }, (process.env.TEST ? { 'data-react-link': true } : {}))));
 });
 Link.displayName = 'NextLink';
-Link.propTypes = Object.assign({ internalLinkMatcher: PropTypes.instanceOf(RegExp) }, LinkPropTypes);

package/dist/esm/components/NextImage.js

@@ -10,7 +10,6 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { mediaApi } from '@sitecore-jss/sitecore-jss/media';
-import PropTypes from 'prop-types';
 import React from 'react';
 import { getEEMarkup, withFieldMetadata, SitecoreContextReactContext, } from '@sitecore-jss/sitecore-jss-react';
 import Image from 'next/image';
@@ -57,26 +56,8 @@ export const NextImage = withFieldMetadata(withEmptyFieldEditingComponent((_a) =
         delete imageProps.height;
     }
     if (attrs) {
-        return React.createElement(Image, Object.assign({ alt: "" }, imageProps));
+        return (React.createElement(Image, Object.assign({ alt: "" }, imageProps, (process.env.TEST ? { 'data-unoptimized': unoptimized } : {}))));
     }
     return null; // we can't handle the truth
 }, { defaultEmptyFieldEditingComponent: DefaultEmptyFieldEditingComponentImage }));
-NextImage.propTypes = {
-    field: PropTypes.oneOfType([
-        PropTypes.shape({
-            src: PropTypes.string.isRequired,
-        }),
-        PropTypes.shape({
-            value: PropTypes.object,
-            editable: PropTypes.string,
-        }),
-    ]),
-    editable: PropTypes.bool,
-    mediaUrlPrefix: PropTypes.instanceOf(RegExp),
-    imageParams: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.number.isRequired, PropTypes.string.isRequired]).isRequired),
-    emptyFieldEditingComponent: PropTypes.oneOfType([
-        PropTypes.object,
-        PropTypes.func,
-    ]),
-};
 NextImage.displayName = 'NextImage';

package/dist/esm/components/RichText.js

@@ -10,9 +10,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React, { useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
 import { useRouter } from 'next/router';
-import { RichText as ReactRichText, RichTextPropTypes, } from '@sitecore-jss/sitecore-jss-react';
+import { RichText as ReactRichText, } from '@sitecore-jss/sitecore-jss-react';
 export const prefetched = {};
 export const RichText = (props) => {
     const { internalLinksSelector = 'a[href^="/"]', prefetchLinks = true, editable = true } = props, rest = __rest(props, ["internalLinksSelector", "prefetchLinks", "editable"]);
@@ -63,5 +62,4 @@ export const RichText = (props) => {
     };
     return React.createElement(ReactRichText, Object.assign({ ref: richTextRef, editable: editable }, rest));
 };
-RichText.propTypes = Object.assign({ internalLinksSelector: PropTypes.string }, RichTextPropTypes);
 RichText.displayName = 'NextRichText';

package/dist/esm/middleware/personalize-middleware.js

@@ -23,7 +23,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
     constructor(config) {
         super(config);
         this.config = config;
-        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+        this.handler = (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -83,6 +83,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                 params,
                 language,
                 timeout,
+                options,
             }, req).then((personalization) => {
                 const variantId = personalization.variantId;
                 if (variantId) {
@@ -121,9 +122,9 @@ export class PersonalizeMiddleware extends MiddlewareBase {
      * @returns middleware handler
      */
     getHandler() {
-        return (req, res) => __awaiter(this, void 0, void 0, function* () {
+        return (req, res, options) => __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.handler(req, res);
+                return yield this.handler(req, res, options);
             }
             catch (error) {
                 console.log('Personalize middleware failed:');
@@ -146,7 +147,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
         });
     }
     personalize(_a, request_1) {
-        return __awaiter(this, arguments, void 0, function* ({ params, friendlyId, language, timeout, variantIds, }, request) {
+        return __awaiter(this, arguments, void 0, function* ({ params, friendlyId, language, timeout, variantIds, options, }, request) {
             var _b;
             debug.personalize('executing experience for %s %o', friendlyId, params);
             return (yield personalize(request, {
@@ -156,6 +157,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                 params,
                 language,
                 pageVariantIds: variantIds,
+                geo: options === null || options === void 0 ? void 0 : options.geo,
             }, { timeout }));
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.7.0-canary.1",
+  "version": "22.7.0-canary.10",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -9,6 +9,7 @@
     "clean": "del-cli dist types",
     "lint": "eslint \"./src/**/*.tsx\" \"./src/**/*.ts\"",
     "test": "mocha --require ./test/setup.js \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit",
+    "test-dev": "mocha --require ./test/setup.js \"./src/**/RichText.test.tsx\" --exit",
     "prepublishOnly": "npm run build",
     "coverage": "nyc npm test",
     "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --outputFileStrategy Members --parametersFormat table --readme none --out ../../ref-docs/sitecore-jss-nextjs --entryPoints src/index.ts --entryPoints src/monitoring/index.ts --entryPoints src/editing/index.ts --entryPoints src/middleware/index.ts --entryPoints src/context/index.ts --entryPoints src/utils/index.ts --entryPoints src/site/index.ts --entryPoints src/graphql/index.ts --githubPages false"
@@ -29,62 +30,58 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "devDependencies": {
-    "@sitecore-cloudsdk/core": "^0.5.0",
-    "@sitecore-cloudsdk/personalize": "^0.5.0",
+    "@sitecore-cloudsdk/core": "^0.5.1",
+    "@sitecore-cloudsdk/personalize": "^0.5.1",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.3.0",
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/chai-string": "^1.4.2",
-    "@types/enzyme": "^3.10.12",
     "@types/mocha": "^10.0.1",
     "@types/node": "~22.9.0",
-    "@types/prop-types": "^15.7.5",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.0.10",
+    "@types/react": "^19.1.2",
+    "@types/react-dom": "^19.1.3",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",
     "chalk": "^4.1.2",
-    "cheerio": "1.0.0-rc.12",
     "cross-fetch": "^3.1.5",
     "del-cli": "^5.0.0",
-    "enzyme": "^3.11.0",
     "eslint": "^8.56.0",
-    "eslint-plugin-react": "^7.32.1",
+    "eslint-plugin-react": "^7.37.5",
     "jsdom": "^21.1.0",
     "mocha": "^10.2.0",
-    "next": "^14.2.18",
+    "next": "^15.3.1",
     "nock": "^13.3.0",
     "nyc": "^15.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.1",
     "typescript": "~5.4.0"
   },
   "peerDependencies": {
-    "@sitecore-cloudsdk/core": "^0.5.0",
-    "@sitecore-cloudsdk/events": "^0.5.0",
-    "@sitecore-cloudsdk/personalize": "^0.5.0",
-    "next": "^14.2.18",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@sitecore-cloudsdk/core": "^0.5.1",
+    "@sitecore-cloudsdk/events": "^0.5.1",
+    "@sitecore-cloudsdk/personalize": "^0.5.1",
+    "next": "^15.3.1",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.7.0-canary.1",
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.7.0-canary.1",
-    "@sitecore-jss/sitecore-jss-react": "22.7.0-canary.1",
+    "@sitecore-jss/sitecore-jss": "22.7.0-canary.10",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.7.0-canary.10",
+    "@sitecore-jss/sitecore-jss-react": "22.7.0-canary.10",
     "@vercel/kv": "^0.2.1",
-    "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "31b27434eca1cdfcc402ad567b7ecff70670f675",
+  "gitHead": "98bc01faa6487f50b8f39498af7eac98ecc86445",
   "files": [
     "dist",
     "types",

package/types/components/ComponentPropsContext.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@types/react" />
-import React, { ReactNode } from 'react';
+import React, { ReactNode, JSX } from 'react';
 import { ComponentPropsCollection } from '../sharedTypes/component-props';
 /**
  * Component props context which we are using in order to store data fetched on components level (getStaticProps/getServerSideProps)

package/types/components/RichText.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="@types/react" />
-import React from 'react';
-import PropTypes from 'prop-types';
+import { JSX } from 'react';
 import { RichTextProps as ReactRichTextProps } from '@sitecore-jss/sitecore-jss-react';
 export type RichTextProps = ReactRichTextProps & {
     /**
@@ -23,18 +21,5 @@ export declare const prefetched: {
 };
 export declare const RichText: {
     (props: RichTextProps): JSX.Element;
-    propTypes: {
-        field: PropTypes.Requireable<PropTypes.InferProps<{
-            value: PropTypes.Requireable<string>;
-            editable: PropTypes.Requireable<string>;
-            metadata: PropTypes.Requireable<{
-                [x: string]: any;
-            }>;
-        }>>;
-        tag: PropTypes.Requireable<string>;
-        editable: PropTypes.Requireable<boolean>;
-        emptyFieldEditingComponent: PropTypes.Requireable<NonNullable<React.ComponentClass<unknown, any> | React.FC<unknown>>>;
-        internalLinksSelector: PropTypes.Requireable<string>;
-    };
     displayName: string;
 };

package/types/middleware/personalize-middleware.d.ts

@@ -38,6 +38,23 @@ export type PersonalizeMiddlewareConfig = MiddlewareBaseConfig & {
      */
     scope?: string;
 };
+/**
+ * Personalization options
+ */
+export type PersonalizeOptions = {
+    /**
+     * Geolocation data used for personalization
+     */
+    geo?: PersonalizeGeoData;
+};
+/**
+ * Represents the geolocation data used for personalization
+ */
+export type PersonalizeGeoData = {
+    city?: string;
+    country?: string;
+    region?: string;
+};
 /**
  * Object model of Experience Context data
  */
@@ -72,19 +89,20 @@ export declare class PersonalizeMiddleware extends MiddlewareBase {
      * Gets the Next.js middleware handler with error handling
      * @returns middleware handler
      */
-    getHandler(): (req: NextRequest, res?: NextResponse) => Promise<NextResponse>;
+    getHandler(): (req: NextRequest, res?: NextResponse, options?: PersonalizeOptions) => Promise<NextResponse>;
     protected initPersonalizeServer({ hostname, siteName, request, response, }: {
         hostname: string;
         siteName: string;
         request: NextRequest;
         response: NextResponse;
     }): Promise<void>;
-    protected personalize({ params, friendlyId, language, timeout, variantIds, }: {
+    protected personalize({ params, friendlyId, language, timeout, variantIds, options, }: {
         params: ExperienceParams;
         friendlyId: string;
         language: string;
         timeout?: number;
         variantIds?: string[];
+        options?: PersonalizeOptions;
     }, request: NextRequest): Promise<{
         variantId: string;
     }>;