refactor: export defaultResizeLoaderOptionsGenerator

Author: Calvin-LL

src/helpers/getRequireStringWithModifiedResizeLoaderOptions.ts

@@ -22,7 +22,9 @@ export default function getRequireStringWithModifiedResizeLoaderOptions(
  );
 
  if (resizeLoader === undefined)
- throw new Error(`Can't find ${resizeLoaderName} in the list of loaders`);
+ throw new Error(
+ `Can't find ${resizeLoaderName} in the list of loaders after webpack-image-srcset-loader`
+ );
 
  const resizeLoaderOptions =
  typeof resizeLoader.options === "string"
@@ -31,36 +33,18 @@ export default function getRequireStringWithModifiedResizeLoaderOptions(
  const resizeLoaderRequest = resizeLoader.request;
  const resizeLoaderPath = resizeLoader.path;
 
- if (resizeLoaderOptionsGenerator)
- return remainingRequest.replace(
- resizeLoaderRequest,
- resizeLoaderPath +
- "?" +
- escapeJsonStringForLoader(
- JSON.stringify(
- resizeLoaderOptionsGenerator(
- options.width,
- options.scale,
- resizeLoaderOptions
- )
- )
- )
- );
-
  return remainingRequest.replace(
  resizeLoaderRequest,
  resizeLoaderPath +
  "?" +
  escapeJsonStringForLoader(
- JSON.stringify({
- scaleUp: true,
- ...resizeLoaderOptions,
- ...options,
- fileLoaderOptions: {
- ...resizeLoaderOptions?.fileLoaderOptions,
- esModule: false, // because we're using require in pitch
- },
- })
+ JSON.stringify(
+ resizeLoaderOptionsGenerator(
+ options.width,
+ options.scale,
+ resizeLoaderOptions
+ )
+ )
  )
  );
 }

src/index.ts

@@ -24,7 +24,16 @@ export interface Options {
 }
 
 export type FullOptions = Options &
- Required<Pick<Options, "sizes" | "scaleUp" | "resizeLoader" | "esModule">>;
+ Required<
+ Pick<
+ Options,
+ | "sizes"
+ | "scaleUp"
+ | "resizeLoader"
+ | "resizeLoaderOptionsGenerator"
+ | "esModule"
+ >
+ >;
 
 export const raw = true;
 
@@ -38,6 +47,7 @@ export function pitch(
  sizes: undefined,
  scaleUp: false,
  resizeLoader: "webpack-image-resize-loader",
+ resizeLoaderOptionsGenerator: defaultResizeLoaderOptionsGenerator,
  esModule: true,
  };
  const options: FullOptions = {
@@ -68,15 +78,31 @@ export function pitch(
  } \`${srcSetString}\`;`
  );
  })
- .catch((e) => {
- throw e;
+ .catch((error) => {
+ callback(error, undefined);
  });
 }
 
 export default function (this: loader.LoaderContext, source: Buffer): Buffer {
  return source;
 }
 
+export function defaultResizeLoaderOptionsGenerator(
+ width: number | undefined,
+ scale: number | undefined,
+ existingOptions: Record<string, any> | undefined
+): Record<string, any> {
+ return {
+ ...existingOptions,
+ width,
+ scale,
+ fileLoaderOptions: {
+ ...existingOptions?.fileLoaderOptions,
+ esModule: false, // because we're using require in pitch
+ },
+ };
+}
+
 // return require('-!some-loader?{...}!resize-loader?{...}!file.png')
 async function generateSrcSetString(
  remainingRequest: string,