@valbuild/server 0.13.3 → 0.13.11

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

@@ -748,6 +748,7 @@ class ValModuleLoader {
     }
     return ts__default["default"].transpile(code, {
       ...this.compilerOptions,
+      jsx: ts__default["default"].JsxEmit.React,
       // allowJs: true,
       // rootDir: this.compilerOptions.rootDir,
       module: ts__default["default"].ModuleKind.ESNext,
@@ -759,10 +760,13 @@ class ValModuleLoader {
 
   resolveModulePath(containingFilePath, requestedModuleName) {
     var _this$host$realpath, _this$host;
-    const sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    let sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    if (requestedModuleName === "@vercel/stega") {
+      sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, "@vercel/stega").replace("stega/dist", "stega/dist/esm");
+    }
     const matches = this.findMatchingJsFile(sourceFileName);
     if (matches.match === false) {
-      throw Error(`Could not find matching js file for module "${requestedModuleName}". Tried:\n${matches.tried.join("\n")}`);
+      throw Error(`Could not find matching js file for module "${requestedModuleName}" requested by: "${containingFilePath}". Tried:\n${matches.tried.join("\n")}`);
     }
     const filePath = matches.match;
     // resolve all symlinks (preconstruct for example symlinks the dist folder)
@@ -820,6 +824,24 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
   runtime.setMemoryLimit(memoryLimit);
   runtime.setModuleLoader(modulePath => {
     try {
+      // Special cases for next package:
+      // TODO: this is not stable, find a better way to do this
+      if (modulePath === "./autoTagJSX") {
+        return {
+          value: ""
+        }; // ignore this module, it's only used in the browser
+      }
+
+      if (modulePath === "@valbuild/react") {
+        return {
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export function ValProvider() { throw Error(`Cannot use 'ValProvider' in this type of file`) }; export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
+      if (modulePath === "./ValRichText") {
+        return {
+          value: "export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -830,6 +852,21 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
     }
   }, (baseModuleName, requestedName) => {
     try {
+      if (requestedName === "./autoTagJSX") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "@valbuild/react") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "./ValRichText") {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath

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

@@ -748,6 +748,7 @@ class ValModuleLoader {
     }
     return ts__default["default"].transpile(code, {
       ...this.compilerOptions,
+      jsx: ts__default["default"].JsxEmit.React,
       // allowJs: true,
       // rootDir: this.compilerOptions.rootDir,
       module: ts__default["default"].ModuleKind.ESNext,
@@ -759,10 +760,13 @@ class ValModuleLoader {
 
   resolveModulePath(containingFilePath, requestedModuleName) {
     var _this$host$realpath, _this$host;
-    const sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    let sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    if (requestedModuleName === "@vercel/stega") {
+      sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, "@vercel/stega").replace("stega/dist", "stega/dist/esm");
+    }
     const matches = this.findMatchingJsFile(sourceFileName);
     if (matches.match === false) {
-      throw Error(`Could not find matching js file for module "${requestedModuleName}". Tried:\n${matches.tried.join("\n")}`);
+      throw Error(`Could not find matching js file for module "${requestedModuleName}" requested by: "${containingFilePath}". Tried:\n${matches.tried.join("\n")}`);
     }
     const filePath = matches.match;
     // resolve all symlinks (preconstruct for example symlinks the dist folder)
@@ -820,6 +824,24 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
   runtime.setMemoryLimit(memoryLimit);
   runtime.setModuleLoader(modulePath => {
     try {
+      // Special cases for next package:
+      // TODO: this is not stable, find a better way to do this
+      if (modulePath === "./autoTagJSX") {
+        return {
+          value: ""
+        }; // ignore this module, it's only used in the browser
+      }
+
+      if (modulePath === "@valbuild/react") {
+        return {
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export function ValProvider() { throw Error(`Cannot use 'ValProvider' in this type of file`) }; export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
+      if (modulePath === "./ValRichText") {
+        return {
+          value: "export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -830,6 +852,21 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
     }
   }, (baseModuleName, requestedName) => {
     try {
+      if (requestedName === "./autoTagJSX") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "@valbuild/react") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "./ValRichText") {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath

package/dist/valbuild-server.esm.js

@@ -735,6 +735,7 @@ class ValModuleLoader {
     }
     return ts.transpile(code, {
       ...this.compilerOptions,
+      jsx: ts.JsxEmit.React,
       // allowJs: true,
       // rootDir: this.compilerOptions.rootDir,
       module: ts.ModuleKind.ESNext,
@@ -746,10 +747,13 @@ class ValModuleLoader {
 
   resolveModulePath(containingFilePath, requestedModuleName) {
     var _this$host$realpath, _this$host;
-    const sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    let sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, requestedModuleName);
+    if (requestedModuleName === "@vercel/stega") {
+      sourceFileName = this.sourceFileHandler.resolveSourceModulePath(containingFilePath, "@vercel/stega").replace("stega/dist", "stega/dist/esm");
+    }
     const matches = this.findMatchingJsFile(sourceFileName);
     if (matches.match === false) {
-      throw Error(`Could not find matching js file for module "${requestedModuleName}". Tried:\n${matches.tried.join("\n")}`);
+      throw Error(`Could not find matching js file for module "${requestedModuleName}" requested by: "${containingFilePath}". Tried:\n${matches.tried.join("\n")}`);
     }
     const filePath = matches.match;
     // resolve all symlinks (preconstruct for example symlinks the dist folder)
@@ -807,6 +811,24 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
   runtime.setMemoryLimit(memoryLimit);
   runtime.setModuleLoader(modulePath => {
     try {
+      // Special cases for next package:
+      // TODO: this is not stable, find a better way to do this
+      if (modulePath === "./autoTagJSX") {
+        return {
+          value: ""
+        }; // ignore this module, it's only used in the browser
+      }
+
+      if (modulePath === "@valbuild/react") {
+        return {
+          value: "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export function ValProvider() { throw Error(`Cannot use 'ValProvider' in this type of file`) }; export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
+      if (modulePath === "./ValRichText") {
+        return {
+          value: "export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};"
+        };
+      }
       return {
         value: moduleLoader.getModule(modulePath)
       };
@@ -817,6 +839,21 @@ async function newValQuickJSRuntime(quickJSModule, moduleLoader, {
     }
   }, (baseModuleName, requestedName) => {
     try {
+      if (requestedName === "./autoTagJSX") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "@valbuild/react") {
+        return {
+          value: requestedName
+        };
+      }
+      if (requestedName === "./ValRichText") {
+        return {
+          value: requestedName
+        };
+      }
       const modulePath = moduleLoader.resolveModulePath(baseModuleName, requestedName);
       return {
         value: modulePath

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.13.3",
+  "version": "0.13.11",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -25,8 +25,8 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.13.3",
-    "@valbuild/ui": "~0.13.3",
+    "@valbuild/core": "~0.13.4",
+    "@valbuild/ui": "~0.13.4",
     "express": "^4.18.2",
     "quickjs-emscripten": "^0.21.1",
     "ts-morph": "^17.0.1",

package/src/ValModuleLoader.ts

@@ -56,6 +56,7 @@ export class ValModuleLoader {
     }
     return ts.transpile(code, {
       ...this.compilerOptions,
+      jsx: ts.JsxEmit.React,
       // allowJs: true,
       // rootDir: this.compilerOptions.rootDir,
       module: ts.ModuleKind.ESNext,
@@ -69,14 +70,20 @@ export class ValModuleLoader {
     containingFilePath: string,
     requestedModuleName: string
   ): string {
-    const sourceFileName = this.sourceFileHandler.resolveSourceModulePath(
+    let sourceFileName = this.sourceFileHandler.resolveSourceModulePath(
       containingFilePath,
       requestedModuleName
     );
+
+    if (requestedModuleName === "@vercel/stega") {
+      sourceFileName = this.sourceFileHandler
+        .resolveSourceModulePath(containingFilePath, "@vercel/stega")
+        .replace("stega/dist", "stega/dist/esm");
+    }
     const matches = this.findMatchingJsFile(sourceFileName);
     if (matches.match === false) {
       throw Error(
-        `Could not find matching js file for module "${requestedModuleName}". Tried:\n${matches.tried.join(
+        `Could not find matching js file for module "${requestedModuleName}" requested by: "${containingFilePath}". Tried:\n${matches.tried.join(
           "\n"
         )}`
       );

package/src/ValQuickJSRuntime.ts

@@ -20,6 +20,24 @@ export async function newValQuickJSRuntime(
   runtime.setModuleLoader(
     (modulePath) => {
       try {
+        // Special cases for next package:
+        // TODO: this is not stable, find a better way to do this
+        if (modulePath === "./autoTagJSX") {
+          return { value: "" }; // ignore this module, it's only used in the browser
+        }
+        if (modulePath === "@valbuild/react") {
+          return {
+            value:
+              "export const useVal = () => { throw Error(`Cannot use 'useVal' in this type of file`) }; export function ValProvider() { throw Error(`Cannot use 'ValProvider' in this type of file`) }; export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};",
+          };
+        }
+
+        if (modulePath === "./ValRichText") {
+          return {
+            value:
+              "export function ValRichText() { throw Error(`Cannot use 'ValRichText' in this type of file`)};",
+          };
+        }
         return { value: moduleLoader.getModule(modulePath) };
       } catch (e) {
         return {
@@ -29,6 +47,15 @@ export async function newValQuickJSRuntime(
     },
     (baseModuleName, requestedName): JSModuleNormalizeResult => {
       try {
+        if (requestedName === "./autoTagJSX") {
+          return { value: requestedName };
+        }
+        if (requestedName === "@valbuild/react") {
+          return { value: requestedName };
+        }
+        if (requestedName === "./ValRichText") {
+          return { value: requestedName };
+        }
         const modulePath = moduleLoader.resolveModulePath(
           baseModuleName,
           requestedName