Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sitecore-jss-nextjs] Enable NextImage to use built-in image optimization from vercel #1726

Merged
merged 3 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Our versioning strategy is as follows:
* `[templates/nextjs-sxa]` Fixed Image component when there is using Banner variant which set property background-image when image is empty. ([#1689](https://github.com/Sitecore/jss/pull/1689)) ([#1692](https://github.com/Sitecore/jss/pull/1692))
* `[templates/nextjs-sxa]` Fix feature `show Grid column` in Experience Editor. ([#1704](https://github.com/Sitecore/jss/pull/1704))
* `[sitecore-jss-nextjs] [templates/nextjs-xmcloud]` SDK initialization rejections are now correctly handled. Errors should no longer occur after getSDK() promises resolve when they shouldn't (for example, getting Events SDK in development environment) ([#1712](https://github.com/Sitecore/jss/pull/1712) [#1715](https://github.com/Sitecore/jss/pull/1715) [#1716](https://github.com/Sitecore/jss/pull/1716))
* `[sitecore-jss-nextjs]` Remove custom loader function i.e. `sitecoreLoader` to enable NextImage to use built-in image optimization from vercel. ([#1726](https://github.com/Sitecore/jss/pull/1726))

### 🛠 Breaking Changes

Expand Down
46 changes: 1 addition & 45 deletions packages/sitecore-jss-nextjs/src/components/NextImage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import chai, { use } from 'chai';
import chaiString from 'chai-string';
import { mount } from 'enzyme';
import React from 'react';
import { NextImage, sitecoreLoader } from './NextImage';
import { NextImage } from './NextImage';
import { ImageField } from '@sitecore-jss/sitecore-jss-react';
import { ImageLoader } from 'next/image';
import { spy, match } from 'sinon';
Expand All @@ -12,50 +12,6 @@ import { SinonSpy } from 'sinon';

use(sinonChai);
const expect = chai.use(chaiString).expect;
describe('sitecoreLoader', () => {
[
{
description: 'relative URL',
root: '/assets/img/test0.png',
},
{
description: 'absolute URL',
root: 'https://cm.jss.localhost/assets/img/test0.png',
},
].forEach((value) => {
describe(value.description, () => {
it('should append mw query string param', () => {
const params: Partial<ImageLoaderProps> = {
src: value.root,
width: 100,
};
const result = sitecoreLoader(params as ImageLoaderProps);
expect(result).to.be.a('string');
expect(result).to.equal(`${value.root}?mw=100`);
});

it('should override existing mw query string param', () => {
const params: Partial<ImageLoaderProps> = {
src: `${value.root}?mw=400`,
width: 100,
};
const result = sitecoreLoader(params as ImageLoaderProps);
expect(result).to.be.a('string');
expect(result).to.equal(`${value.root}?mw=100`);
});

it('should preserve existing query string params', () => {
const params: Partial<ImageLoaderProps> = {
src: `${value.root}?mw=400&mh=100&q=50`,
width: 100,
};
const result = sitecoreLoader(params as ImageLoaderProps);
expect(result).to.be.a('string');
expect(result).to.equal(`${value.root}?mw=100&mh=100&q=50`);
});
});
});
});

describe('<NextImage />', () => {
const HOSTNAME = 'https://cm.jss.localhost';
Expand Down
10 changes: 1 addition & 9 deletions packages/sitecore-jss-nextjs/src/components/NextImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@ import {
} from '@sitecore-jss/sitecore-jss-react';
import Image, {
ImageLoader,
ImageLoaderProps,
ImageProps as NextImageProperties,
} from 'next/image';

type NextImageProps = Omit<ImageProps, 'media'> & Partial<NextImageProperties>;

export const sitecoreLoader: ImageLoader = ({ src, width }: ImageLoaderProps): string => {
const [root, paramString] = src.split('?');
const params = new URLSearchParams(paramString);
params.set('mw', width.toString());
return `${root}?${params}`;
};

export const NextImage: React.FC<NextImageProps> = ({
editable,
imageParams,
Expand Down Expand Up @@ -92,7 +84,7 @@ export const NextImage: React.FC<NextImageProps> = ({
delete imageProps.height;
}

const loader = (otherProps.loader ? otherProps.loader : sitecoreLoader) as ImageLoader;
const loader = (otherProps.loader ? otherProps.loader : undefined ) as ImageLoader;
addy-pathania marked this conversation as resolved.
Show resolved Hide resolved
ambrauer marked this conversation as resolved.
Show resolved Hide resolved

if (attrs) {
return <Image alt="" loader={loader} {...imageProps} />;
Expand Down
Loading