@valbuild/server 0.44.0 → 0.46.0

package/dist/declarations/src/createValApiRouter.d.ts

@@ -77,13 +77,11 @@ type ValServerOverrides = Partial<{
      */
     valContentUrl: string;
     /**
-     * The full name of this Val project.
-     *
-     * Typically this is set using the VAL_NAME env var.
+     * The cloud name of this Val project.
      *
      * @example "myorg/my-project"
      */
-    valName: string;
+    valCloud: string;
     /**
      * After Val is enabled, redirect to this url.
      *

package/dist/valbuild-server.cjs.dev.js

@@ -976,7 +976,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1004,6 +1004,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1054,6 +1059,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1262,7 +1272,7 @@ class LocalValServer {
     return {
       cookies: {
         [internal.VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -2007,9 +2017,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2266,12 +2276,25 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
+    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
     const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
     // TODO: we should probably store the mimetype in the metadata and reuse it here
-    `data:${imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename)};base64,${buffer.toString("base64")}`));
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2306,7 +2329,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

package/dist/valbuild-server.cjs.prod.js

@@ -976,7 +976,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -1004,6 +1004,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1054,6 +1059,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1262,7 +1272,7 @@ class LocalValServer {
     return {
       cookies: {
         [internal.VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -2007,9 +2017,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2266,12 +2276,25 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
+    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
     const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
     // TODO: we should probably store the mimetype in the metadata and reuse it here
-    `data:${imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename)};base64,${buffer.toString("base64")}`));
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2306,7 +2329,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

package/dist/valbuild-server.esm.js

@@ -946,7 +946,7 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
       }
       if (modulePath === "@valbuild/react/stega") {
         return {
-          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ };  export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; "
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export const fetchVal = () => { throw Error(`Cannot use 'fetchVal' in this type of file`) }; export const autoTagJSX = () => { /* ignore */ }; export const stegaClean = () => { throw Error(`Cannot use 'stegaClean' in this type of file`) }; export const stegaDecodeString = () => { throw Error(`Cannot use 'stegaDecodeString' in this type of file`) }; "
         };
       }
       if (modulePath.startsWith("next/navigation")) {
@@ -974,6 +974,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: "export const ValNextProvider = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValNextProvider' in this file`) } } } )"
         };
       }
+      if (modulePath.includes("/ValImage")) {
+        return {
+          value: "export const ValImage = new Proxy({}, { get() { return () => { throw new Error(`Cannot import 'ValImage' in this file`) } } } )"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -1024,6 +1029,11 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
           value: requestedName
         };
       }
+      if (requestedName.includes("/ValImage")) {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath
@@ -1232,7 +1242,7 @@ class LocalValServer {
     return {
       cookies: {
         [VAL_ENABLE_COOKIE_NAME]: {
-          value: null
+          value: "false"
         }
       },
       status: 302,
@@ -1977,9 +1987,9 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
-    const maybeValName = opts.valName || process.env.VAL_NAME;
+    const maybeValName = opts.valCloud || process.env.VAL_CLOUD_NAME || process.env.VAL_NAME; // VAL_NAME is deprecated
     if (!maybeValName) {
-      throw new Error("VAL_NAME env var must be set in proxy mode");
+      throw new Error("VAL_CLOUD_NAME env var must be set in proxy mode");
     }
     return {
       mode: "proxy",
@@ -2236,12 +2246,25 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__default.join(config.projectRoot, maybeRef);
     const buffer = fs.readFileSync(filename);
     const imageSize = sizeOf(buffer);
+    const mimeType = imageSize.type ? imageTypeToMimeType(imageSize.type) : filenameToMimeType(filename);
+    if (!mimeType) {
+      throw Error("Cannot determine mimetype of image");
+    }
+    const {
+      width,
+      height
+    } = imageSize;
+    if (!width || !height) {
+      throw Error("Cannot determine image size");
+    }
     const sha256 = Internal.getSHA256Hash(textEncoder.encode(
     // TODO: we should probably store the mimetype in the metadata and reuse it here
-    `data:${imageSize.type ? imageTypeToMimeType(imageSize.type) : filenameToMimeType(filename)};base64,${buffer.toString("base64")}`));
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
     return {
-      ...imageSize,
-      sha256
+      width,
+      height,
+      sha256,
+      mimeType
     };
   }
   const remainingErrors = [];
@@ -2276,7 +2299,8 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
               value: {
                 width: imageMetadata.width,
                 height: imageMetadata.height,
-                sha256: imageMetadata.sha256
+                sha256: imageMetadata.sha256,
+                mimeType: imageMetadata.mimeType
               }
             });
           } else {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.44.0",
+  "version": "0.46.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.44.0",
-    "@valbuild/shared": "~0.44.0",
-    "@valbuild/ui": "~0.44.0",
+    "@valbuild/core": "~0.46.0",
+    "@valbuild/shared": "~0.46.0",
+    "@valbuild/ui": "~0.46.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",