update imgproxy-url-builder to v0.6.0

example/next-env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

example/package.json

@@ -7,17 +7,5 @@
     "build": "next build",
     "start": "NODE_ENV=production node server.js",
     "lint": "next lint"
-  },
-  "dependencies": {
-    "@bitpatty/imgproxy-url-builder": "^0.2.2",
-    "next": "12.1.6",
-    "react": "^17.0.2",
-    "react-dom": "17.0.2"
-  },
-  "devDependencies": {
-    "@types/react": "17.0.27",
-    "eslint": "7.32.0",
-    "eslint-config-next": "11.1.2",
-    "typescript": "4.4.3"
   }
 }

example/pages/index.tsx

@@ -32,8 +32,8 @@ const demoContent: {
 
     proxyParams: pb()
       .crop({
-        width: 30,
-        height: 30,
+        width: 100,
+        height: 100,
       })
       .build(),
   },
@@ -43,8 +43,8 @@ const demoContent: {
 
     proxyParams: pb()
       .crop({
-        width: 30,
-        height: 30,
+        width: 200,
+        height: 200,
         gravity: {
           type: GravityType.NORTHEAST,
           offset: {

example/tsconfig.json

@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -12,8 +16,15 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpatty/next-image-s3-imgproxy-loader",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "imgproxy S3 extension for next/image",
   "author": "Matteias Collet <[email protected]>",
   "main": "dist/index.js",
@@ -21,6 +21,7 @@
   "types": "./dist/index.d.ts",
   "homepage": "https://github.com/BitPatty/next-image-s3-imgproxy-loader#readme",
   "devDependencies": {
+    "@types/node": "16.11.7",
     "@types/react": "18.0.9",
     "create-hmac": "1.1.7",
     "next": "12.1.6",
@@ -35,6 +36,6 @@
     "next": "^11.0.0 || ^12.0.0"
   },
   "dependencies": {
-    "@bitpatty/imgproxy-url-builder": "^0.4.1"
+    "@bitpatty/imgproxy-url-builder": "^0.6.0"
   }
 }

scripts/minio-restore.sh

@@ -2,7 +2,8 @@
 set -e
 SCRIPT_PATH=$(dirname "$0")
 echo "Restoring minio files"
-cd $SCRIPT_PATH/../.devcontainer/minio-dump
+cd $SCRIPT_PATH/../.devcontainer/minio-dump/test-bucket
+echo $PWD
 minio-cli mb --ignore-existing myminio/test-bucket
 minio-cli rm --recursive --force myminio/test-bucket || true
 minio-cli cp --recursive . myminio

src/index.tsx

@@ -23,9 +23,10 @@ const FORWARDED_HEADERS = [
 /**
  * Builds the final reuest path to retrieve
  * an image from the imgproxy instance
- * @param src The source file
- * @param options The imgproxy options
- * @returns The imgproxy request path
+ *
+ * @param src      The source file
+ * @param options  The imgproxy options
+ * @returns        The imgproxy request path
  */
 const buildRequestPath = (
   src: string,
@@ -40,7 +41,10 @@ const buildRequestPath = (
   const { imgproxyParams, signature } = options ?? {};
 
   const paramBuilder = pb();
-  if (imgproxyParams) paramBuilder.modifiers.push(imgproxyParams);
+  if (imgproxyParams && imgproxyParams.includes(':')) {
+    // @ts-ignore
+    paramBuilder.modifiers.set('params', imgproxyParams);
+  }
 
   return paramBuilder.build({
     path: `s3://${src}`,
@@ -60,11 +64,11 @@ type ImageOptimizerOptions = {
 
 /**
  * Handles an image request
- * @param imgproxyBaseUrl The URL to the imgproxy instance
- * @param query The URL query generated by the {@link ImgProxyParamBuilder}
- * @param res The response to which the resulting file should be piped to
- * @param options Optional configuration options for the imgproxy connection
- * @returns
+ *
+ * @param imgproxyBaseUrl  The URL to the imgproxy instance
+ * @param query            The URL query generated by the {@link ImgProxyParamBuilder}
+ * @param res              The response to which the resulting file should be piped to
+ * @param options          Optional configuration options for the imgproxy connection
  */
 const handle = (
   imgproxyBaseUrl: URL,