@squiz/render-runtime-lib 1.2.1-alpha.90 → 1.2.1-alpha.92

package/lib/index.js

@@ -26180,6 +26180,12 @@ var require_v1 = __commonJS({
           maxLength: 14,
           pattern: "^(?:0|[1-9]\\d*)\\.(?:0|[1-9]\\d*)\\.(?:0|[1-9]\\d*)$"
         },
+        environment: {
+          type: "array",
+          items: {
+            type: "string"
+          }
+        },
         "static-files": {
           type: "object",
           properties: {
@@ -26203,12 +26209,6 @@ var require_v1 = __commonJS({
                 description: "Function name, this will be used as part of the url to access this function. It must be a valid url"
               },
               entry: { type: "string" },
-              environment: {
-                type: "array",
-                items: {
-                  type: "string"
-                }
-              },
               input: {
                 type: "object"
               },
@@ -26239,6 +26239,7 @@ var require_v1 = __commonJS({
                                     filepath: { type: "string" },
                                     defer: { type: "boolean" },
                                     async: { type: "boolean" },
+                                    integrity: { type: "string" },
                                     crossorigin: { oneOf: [{ const: "anonymous" }, { const: "use-credentials" }] },
                                     referrerpolicy: {
                                       oneOf: [
@@ -59310,7 +59311,7 @@ var require_lib7 = __commonJS({
           __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.test = exports2.ComponentSetService = exports2.ComponentService = exports2.transformResponseForLogging = exports2.transformRequestForLogging = exports2.errorMiddleware = exports2.schemaVersions = void 0;
+    exports2.ComponentSetService = exports2.ComponentService = exports2.transformResponseForLogging = exports2.transformRequestForLogging = exports2.errorMiddleware = exports2.schemaVersions = void 0;
     __exportStar(require_validateManifest(), exports2);
     var schemas_1 = require_schemas();
     Object.defineProperty(exports2, "schemaVersions", { enumerable: true, get: function() {
@@ -59350,10 +59351,6 @@ var require_lib7 = __commonJS({
     Object.defineProperty(exports2, "ComponentSetService", { enumerable: true, get: function() {
       return services_1.ComponentSetService;
     } });
-    function test() {
-      console.log("a");
-    }
-    exports2.test = test;
   }
 });
 
@@ -94587,8 +94584,7 @@ function validateComponentVariables(functionVariables, environment) {
 }
 async function loadEnvironment(info, environmentLoader) {
   const variables = await environmentLoader.getEnvironmentVariables(info.set.name);
-  const functionDef = info.manifest.functions.find((f) => f.name === info.functionName);
-  const variableValidation = validateComponentVariables(functionDef.environment || [], variables);
+  const variableValidation = validateComponentVariables(info.manifest.environment || [], variables);
   return variableValidation;
 }
 function getProcessEnvironmentLoader() {
@@ -95188,10 +95184,10 @@ function isInProductionMode() {
 
 // src/utils/getPreviewFilePath.ts
 var import_path3 = __toESM(require("path"));
-function getPreviewFilePath(componentName, version) {
+function getPreviewFilePath(manifestPath) {
   const config = ComponentRunner.getConfig();
   const previewFile = config.previewFile ?? "preview.html";
-  return import_path3.default.join(config.dataMountPoint, componentName, version, previewFile);
+  return import_path3.default.join(manifestPath, "../", previewFile);
 }
 
 // src/utils/resolvePreviewOutput.ts
@@ -95225,6 +95221,9 @@ function jsIncludeTagHtml(file) {
   if (file.defer) {
     tagParts.push(`defer`);
   }
+  if (file.integrity !== void 0) {
+    tagParts.push(`integrity="${file.integrity}"`);
+  }
   if (file.referrerpolicy !== void 0) {
     tagParts.push(`referrerpolicy="${file.referrerpolicy}"`);
   }
@@ -95280,11 +95279,13 @@ router.get("/:componentSet/:componentName/:version/preview", async (req, res) =>
   if (!config.localDevMode) {
     throw new import_component_lib5.ResourceNotFoundError("Not available in non-development mode");
   }
-  const previewFile = getPreviewFilePath(req.params.componentName, req.params.version);
+  const prodMode = isInProductionMode();
+  const manifestPath = await getManifestPath(req.params.componentName, req.params.version, prodMode);
+  const previewFile = getPreviewFilePath(manifestPath);
   if (!await import_fs_extra.default.pathExists(previewFile)) {
     throw new import_component_lib5.ResourceNotFoundError(`Preview file ${previewFile} not found`);
   }
-  const hr = await handleRendering(req.params.componentSet, req.params.componentName, req.params.version, void 0, req.query, req.id, true);
+  const hr = await handleRendering(manifestPath, req.params.componentSet, req.params.componentName, req.params.version, void 0, req.query, req.id, prodMode, true);
   if (typeof hr.output === "string") {
     const html = await import_promises.default.readFile(previewFile);
     res.send(resolvePreviewOutput(html.toString(), hr.output, hr.files));
@@ -95293,18 +95294,20 @@ router.get("/:componentSet/:componentName/:version/preview", async (req, res) =>
   res.send(hr.output);
 });
 router.get("/:componentSet/:componentName/:version", async (req, res) => {
-  const result = await handleRendering(req.params.componentSet, req.params.componentName, req.params.version, void 0, req.query, req.id);
+  const prodMode = isInProductionMode();
+  const manifestPath = await getManifestPath(req.params.componentName, req.params.version, prodMode);
+  const result = await handleRendering(manifestPath, req.params.componentSet, req.params.componentName, req.params.version, void 0, req.query, req.id, prodMode);
   res.send(result.output);
 });
 router.get("/:componentSet/:componentName/:version/:functionName", async (req, res) => {
-  const result = await handleRendering(req.params.componentSet, req.params.componentName, req.params.version, req.params.functionName, req.query, req.id);
+  const prodMode = isInProductionMode();
+  const manifestPath = await getManifestPath(req.params.componentName, req.params.version, prodMode);
+  const result = await handleRendering(manifestPath, req.params.componentSet, req.params.componentName, req.params.version, req.params.functionName, req.query, req.id, prodMode);
   res.send(result.output);
 });
-async function handleRendering(setName, componentName, version, functionName, input, requestId, returnStaticFiles = false) {
+async function handleRendering(manifestPath, setName, componentName, version, functionName, input, requestId, prodMode, returnStaticFiles = false) {
   var _a;
-  const prodMode = isInProductionMode();
   const set = await (0, import_component_lib5.loadComponentSet)(setName);
-  const manifestPath = await getManifestPath(componentName, version, prodMode);
   const component = await (0, import_component_lib5.loadComponent)(manifestPath, componentName, version, Webserver.getConfig().rootUrl, ComponentRunner.get(), prodMode);
   if (functionName === void 0) {
     functionName = component.mainFunction;
@@ -95500,8 +95503,10 @@ function setupApp(db) {
     crossOriginEmbedderPolicy: false,
     contentSecurityPolicy: {
       directives: {
-        defaultSrc: ["*"],
-        scriptSrc: ["*"],
+        defaultSrc: ["*", "'unsafe-inline'"],
+        scriptSrc: ["*", "'unsafe-inline'"],
+        scriptSrcElem: ["*", "'unsafe-inline'"],
+        styleSrc: ["*", "'unsafe-inline'"],
         imgSrc: ["*"],
         upgradeInsecureRequests: null
       }
@@ -95656,11 +95661,11 @@ var _ComponentFixture = class {
           version: "1.0.0",
           $schema: "",
           "main-function": "main.js",
+          environment,
           functions: [
             {
               entry: "main.js",
               name: "main",
-              environment,
               input: {},
               output: {
                 "response-type": "html"