Merge pull request #174 from Niels-IO/packageUpdate2

Upgrade to latest Next version and move src files
Niels-IO · Oct 14, 2023 · f872be4 · f872be4
2 parents a6c9b9f + 0276160
commit f872be4
Show file tree

Hide file tree

Showing 24 changed files with 1,921 additions and 1,723 deletions.
diff --git a/example/app/appdir/page.tsx b/example/app/appdir/page.tsx
@@ -1,6 +1,6 @@
 import styles from "../../styles/Home.module.css";
-import ExportedImage from "../../../src/ExportedImage";
-import ExportedImageLegacy from "../../../src/legacy/ExportedImage";
+import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../../src/legacy/ExportedImage";
 import testPictureStatic from "../../public/chris-zhang-Jq8-3Bmh1pQ-unsplash_static.jpg";
 
 export default function Home() {

diff --git a/example/next.config.js b/example/next.config.js
@@ -4,6 +4,7 @@ module.exports = {
     imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
     deviceSizes: [640, 750, 777, 828, 1080, 1200, 1920, 2048, 3840],
   },
+  basePath: "/subsite",
   output: "export",
   transpilePackages: ["next-image-export-optimizer"],
   env: {
@@ -14,7 +15,4 @@ module.exports = {
     nextImageExportOptimizer_storePicturesInWEBP: true,
     nextImageExportOptimizer_generateAndUseBlurImages: true,
   },
-  experimental: {
-    appDir: true,
-  },
 };
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "next": "^13.3.1",
-    "next-image-export-optimizer": "^1.8.1-beta.0",
+    "next-image-export-optimizer": "^1.8.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

diff --git a/example/pages/fixedImage.js b/example/pages/fixedImage.js
@@ -1,6 +1,6 @@
 import Head from "next/head";
-import ExportedImageLegacy from "../../src/legacy/ExportedImage";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../src/legacy/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 // import ExportedImage from "next-image-export-optimizer";
 
 import styles from "../styles/Home.module.css";

diff --git a/example/pages/forwardRef.js b/example/pages/forwardRef.js
@@ -1,5 +1,5 @@
 import Head from "next/head";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import styles from "../styles/Home.module.css";
 import { useEffect, useRef, useState } from "react";

diff --git a/example/pages/gifs.js b/example/pages/gifs.js
@@ -1,5 +1,5 @@
 import Head from "next/head";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import styles from "../styles/Home.module.css";
 import animatedImage from "../public/animated.png";

diff --git a/example/pages/index.js b/example/pages/index.js
@@ -1,8 +1,8 @@
 import Head from "next/head";
-import ExportedImageLegacy from "../../src/legacy/ExportedImage";
+import ExportedImageLegacy from "../src/legacy/ExportedImage";
 // import ExportedImageLegacy from "next-image-export-optimizer/legacy/ExportedImage";
 // import ExportedImage from "next-image-export-optimizer";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import styles from "../styles/Home.module.css";
 import testPictureStatic from "../public/chris-zhang-Jq8-3Bmh1pQ-unsplash_static.jpg";

diff --git a/example/pages/nested/page.js b/example/pages/nested/page.js
@@ -1,6 +1,6 @@
 import React from "react";
-import ExportedImage from "../../../src/ExportedImage";
-import ExportedImageLegacy from "../../../src/legacy/ExportedImage";
+import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../../src/legacy/ExportedImage";
 import testPictureStatic from "../../public/chris-zhang-Jq8-3Bmh1pQ-unsplash_static.jpg";
 
 function Page() {

diff --git a/example/pages/nested/page_fixed.js b/example/pages/nested/page_fixed.js
@@ -1,6 +1,6 @@
 import React from "react";
-import ExportedImage from "../../../src/ExportedImage";
-import ExportedImageLegacy from "../../../src/legacy/ExportedImage";
+import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../../src/legacy/ExportedImage";
 import testPictureStatic from "../../public/chris-zhang-Jq8-3Bmh1pQ-unsplash_static.jpg";
 
 function Page() {

diff --git a/example/pages/nestedSlug/[slug].js b/example/pages/nestedSlug/[slug].js
@@ -1,6 +1,6 @@
 import React from "react";
-import ExportedImage from "../../../src/ExportedImage";
-import ExportedImageLegacy from "../../../src/legacy/ExportedImage";
+import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../../src/legacy/ExportedImage";
 import testPictureStatic from "../../public/chris-zhang-Jq8-3Bmh1pQ-unsplash_static.jpg";
 
 function Slug() {

diff --git a/example/pages/remote.js b/example/pages/remote.js
@@ -1,5 +1,5 @@
 import Head from "next/head";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import styles from "../styles/Home.module.css";
 

diff --git a/example/pages/smallImage.js b/example/pages/smallImage.js
@@ -1,6 +1,6 @@
 import Head from "next/head";
-import ExportedImageLegacy from "../../src/legacy/ExportedImage";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImageLegacy from "../src/legacy/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import smallImage from "../public/images/chris-zhang-Jq8-3Bmh1pQ-unsplash_small.jpg";
 

diff --git a/example/pages/subfolder.js b/example/pages/subfolder.js
@@ -1,4 +1,4 @@
-import ExportedImageLegacy from "../../src/legacy/ExportedImage";
+import ExportedImageLegacy from "../src/legacy/ExportedImage";
 import Head from "next/head";
 import React from "react";
 import styles from "../styles/Home.module.css";

diff --git a/example/pages/transparent.js b/example/pages/transparent.js
@@ -1,5 +1,5 @@
 import Head from "next/head";
-import ExportedImage from "../../src/ExportedImage";
+import ExportedImage from "../src/ExportedImage";
 
 import styles from "../styles/Home.module.css";
 

diff --git a/example/pages/typescript.tsx b/example/pages/typescript.tsx
@@ -1,6 +1,6 @@
 import Head from "next/head";
-import ExportedImage_Local from "../../src/ExportedImage";
-import ExportedImageLegacy_Local from "../../src/legacy/ExportedImage";
+import ExportedImage_Local from "../src/ExportedImage";
+import ExportedImageLegacy_Local from "../src/legacy/ExportedImage";
 import ExportedImage from "next-image-export-optimizer";
 import ExportedImageLegacy from "next-image-export-optimizer/legacy/ExportedImage";
 

diff --git a/src/ExportedImage.tsx → example/src/ExportedImage.tsx b/src/ExportedImage.tsx → example/src/ExportedImage.tsx
@@ -103,6 +103,7 @@ function urlToFilename(url: string) {
   filename = filename.replace(/[/\\:*?"<>|#%]/g, "_");
 
   // Remove control characters
+  // eslint-disable-next-line no-control-regex
   filename = filename.replace(/[\x00-\x1F\x7F]/g, "");
 
   // Trim any leading or trailing spaces
@@ -204,6 +205,7 @@ const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
       unoptimized,
       placeholder = "blur",
       basePath = "",
+      alt = "",
       blurDataURL,
       style,
       onError,
@@ -232,7 +234,7 @@ const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
 
       // otherwise use the generated image of 10px width as a blurDataURL
       return generateImageURL(_src, 10, basePath);
-    }, [blurDataURL, src, unoptimized]);
+    }, [blurDataURL, src, unoptimized, basePath]);
 
     // check if the src is a SVG image -> then we should not use the blurDataURL and use unoptimized
     const isSVG =
@@ -268,6 +270,7 @@ const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
     const ImageElement = (
       <Image
         ref={ref}
+        alt={alt}
         {...rest}
         {...(width && { width })}
         {...(height && { height })}
@@ -358,5 +361,5 @@ const ExportedImage = forwardRef<HTMLImageElement | null, ExportedImageProps>(
     );
   }
 );
-
+ExportedImage.displayName = "ExportedImage";
 export default ExportedImage;
diff --git a/src/legacy/ExportedImage.tsx → example/src/legacy/ExportedImage.tsx b/src/legacy/ExportedImage.tsx → example/src/legacy/ExportedImage.tsx
@@ -89,6 +89,7 @@ function urlToFilename(url: string) {
   filename = filename.replace(/[/\\:*?"<>|#%]/g, "_");
 
   // Remove control characters
+  // eslint-disable-next-line no-control-regex
   filename = filename.replace(/[\x00-\x1F\x7F]/g, "");
 
   // Trim any leading or trailing spaces
@@ -199,6 +200,7 @@ function ExportedImage({
   objectPosition,
   onLoadingComplete,
   unoptimized,
+  alt = "",
   placeholder = "blur",
   basePath = "",
   blurDataURL,
@@ -235,7 +237,7 @@ function ExportedImage({
 
     // otherwise use the generated image of 10px width as a blurDataURL
     return generateImageURL(_src, 10, basePath);
-  }, [blurDataURL, src, unoptimized]);
+  }, [blurDataURL, src, unoptimized, basePath]);
   const isStaticImage = typeof src === "object";
   let _src = isStaticImage ? src.src : src;
   if (!isStaticImage) {
@@ -250,6 +252,7 @@ function ExportedImage({
   return (
     <Image
       {...rest}
+      alt={alt}
       {...(typeof src === "object" && src.width && { width: src.width })}
       {...(typeof src === "object" && src.height && { height: src.height })}
       {...(width && { width })}