@lwrjs/view-registry 0.15.0-alpha.34 → 0.15.0-alpha.36

package/build/cjs/index.cjs

@@ -318,14 +318,14 @@ var LwrViewRegistry = class {
       metadata: renderedViewMetadata,
       compiledView: {immutable = true}
     } = renderedView;
-    const {linkedMetadata, stringBuilder} = await (0, import_instrumentation.getTracer)().trace({
+    const {linkedMetadata, stringBuilder} = (0, import_instrumentation.getTracer)().trace({
       name: import_instrumentation.ViewSpan.ParseView,
       attributes: {
         view: view.id,
         ssr: view.bootstrap?.ssr === true
       }
-    }, async () => {
-      const linkedMetadata2 = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
+    }, () => {
+      const linkedMetadata2 = skipMetadataCollection ? renderedViewMetadata : (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
       const stringBuilder2 = (0, import_shared_utils.createStringBuilder)(renderedViewContent);
       return {linkedMetadata: linkedMetadata2, stringBuilder: stringBuilder2};
     });

package/build/cjs/utils.cjs

@@ -46,6 +46,7 @@ var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
 var import_crypto = __toModule(require("crypto"));
+var import_minimatch = __toModule(require("minimatch"));
 function generateExternalStyle(src) {
   return `<link rel="stylesheet" href="${src}">`;
 }
@@ -305,14 +306,24 @@ function addExternalScriptNonce(def, nonce) {
 }
 function generateLinkHeaders(assets, patterns) {
   const assetConfig = {};
-  for (let i = 0; i < patterns.length; i++) {
-    const pattern = patterns[i].match;
-    assets.forEach((asset) => {
-      const path = (asset.override?.uri || asset.url).split("?")[0];
-      if (typeof pattern === "string" && path.endsWith(pattern) || typeof pattern === "object" && pattern.some((match) => path.endsWith(match))) {
-        assetConfig[path] = patterns[i].attributes;
+  for (const assetRef of assets) {
+    const path = (assetRef.override?.uri || assetRef.url).split("?")[0];
+    let matched = null;
+    for (const pattern of patterns) {
+      const {match} = pattern;
+      const matchPatterns = Array.isArray(match) ? match : [match];
+      for (const filePattern of matchPatterns) {
+        if ((0, import_minimatch.minimatch)(path, filePattern)) {
+          matched = pattern.attributes;
+          break;
+        }
       }
-    });
+      if (matched)
+        break;
+    }
+    if (matched) {
+      assetConfig[path] = matched;
+    }
   }
   return Object.keys(assetConfig).reduce((linkHeader, path) => {
     linkHeader = `${linkHeader ? linkHeader + ", " : ""}<${path}>`;

package/build/es/index.js

@@ -342,16 +342,16 @@ export class LwrViewRegistry {
         const runtimeEnvironment = { ...runtimeEnv, immutableAssets: freezeAssets };
         // normalize/extract metadata
         const { renderedView: renderedViewContent, metadata: renderedViewMetadata, compiledView: { immutable = true }, } = renderedView;
-        const { linkedMetadata, stringBuilder } = await getTracer().trace({
+        const { linkedMetadata, stringBuilder } = getTracer().trace({
             name: ViewSpan.ParseView,
             attributes: {
                 view: view.id,
                 ssr: view.bootstrap?.ssr === true,
             },
-        }, async () => {
+        }, () => {
             const linkedMetadata = skipMetadataCollection
                 ? renderedViewMetadata
-                : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
+                : extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
             const stringBuilder = createStringBuilder(renderedViewContent);
             return { linkedMetadata, stringBuilder };
         });

package/build/es/utils.js

@@ -2,6 +2,7 @@ import { basename, extname } from 'path';
 import { explodeSpecifier, getMappingUriPrefix, getSpecifier, getClientBootstrapConfigurationUri, mimeLookup, DEFAULT_TITLE, streamToString, getFeatureFlags, getCacheKeyFromJson, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier, ResourceIdentityTypes, } from '@lwrjs/app-service/identity';
 import crypto from 'crypto';
+import { minimatch } from 'minimatch';
 function generateExternalStyle(src) {
     return `<link rel="stylesheet" href="${src}">`;
 }
@@ -291,16 +292,24 @@ export function addExternalScriptNonce(def, nonce) {
 export function generateLinkHeaders(assets, patterns) {
     // store each Path's config in this config
     const assetConfig = {};
-    // Iterate through the patterns to filter the file paths and populate assetConfig
-    for (let i = 0; i < patterns.length; i++) {
-        const pattern = patterns[i].match;
-        assets.forEach((asset) => {
-            const path = (asset.override?.uri || asset.url).split('?')[0];
-            if ((typeof pattern === 'string' && path.endsWith(pattern)) ||
-                (typeof pattern === 'object' && pattern.some((match) => path.endsWith(match)))) {
-                assetConfig[path] = patterns[i].attributes;
+    for (const assetRef of assets) {
+        const path = (assetRef.override?.uri || assetRef.url).split('?')[0];
+        let matched = null;
+        for (const pattern of patterns) {
+            const { match } = pattern;
+            const matchPatterns = Array.isArray(match) ? match : [match];
+            for (const filePattern of matchPatterns) {
+                if (minimatch(path, filePattern)) {
+                    matched = pattern.attributes;
+                    break;
+                }
             }
-        });
+            if (matched)
+                break;
+        }
+        if (matched) {
+            assetConfig[path] = matched;
+        }
     }
     // Use the assetConfig to construct the Link Header
     return Object.keys(assetConfig).reduce((linkHeader, path) => {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.34",
+    "version": "0.15.0-alpha.36",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,14 +33,15 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.15.0-alpha.34",
-        "@lwrjs/diagnostics": "0.15.0-alpha.34",
-        "@lwrjs/instrumentation": "0.15.0-alpha.34",
-        "@lwrjs/shared-utils": "0.15.0-alpha.34",
-        "lru-cache": "^10.4.3"
+        "@lwrjs/app-service": "0.15.0-alpha.36",
+        "@lwrjs/diagnostics": "0.15.0-alpha.36",
+        "@lwrjs/instrumentation": "0.15.0-alpha.36",
+        "@lwrjs/shared-utils": "0.15.0-alpha.36",
+        "lru-cache": "^10.4.3",
+        "minimatch": "^10.0.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.34"
+        "@lwrjs/types": "0.15.0-alpha.36"
     },
     "engines": {
         "node": ">=18.0.0"
@@ -48,5 +49,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "6b9d8e0b50272e646d177e4bda3eec2b2a253fbb"
+    "gitHead": "325f5a8d06e1af07795f108e32c8300c06e62aa3"
 }