@lwrjs/view-registry 0.15.0-alpha.38 → 0.15.0-alpha.40

package/build/cjs/index.cjs

@@ -368,6 +368,17 @@ var LwrViewRegistry = class {
         unsafeEnableViewLinkCaching: this.globalConfig.unsafeEnableViewLinkCaching,
         viewLinkCacheKey: viewCacheKey
       });
+      if (viewRecord.resources?.length) {
+        linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
+          if (!asset.src)
+            return res;
+          res.push({
+            url: asset.src,
+            relative: (0, import_shared_utils.isRelative)(asset.src)
+          });
+          return res;
+        }, []));
+      }
       return {
         renderedView: linkedView,
         immutable,

package/build/cjs/utils.cjs

@@ -46,7 +46,6 @@ 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}">`;
 }
@@ -307,13 +306,14 @@ function addExternalScriptNonce(def, nonce) {
 function generateLinkHeaders(assets, patterns) {
   const assetConfig = {};
   for (const assetRef of assets) {
-    const path = (assetRef.override?.uri || assetRef.url).split("?")[0];
+    const path = assetRef.override?.uri || assetRef.url;
     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)) {
+        const regex = new RegExp(filePattern);
+        if (regex.test(path)) {
           matched = pattern.attributes;
           break;
         }

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLambdaEnv, isLocalDev, normalizeResourcePath, shortestTtl, } from '@lwrjs/shared-utils';
+import { InflightTasks, createStringBuilder, extractMetadataFromHtml, getCacheKeyFromJson, getFeatureFlags, getSpecifier, isLambdaEnv, isLocalDev, normalizeResourcePath, shortestTtl, isRelative, } from '@lwrjs/shared-utils';
 import { getTracer, ViewSpan } from '@lwrjs/instrumentation';
 import { generateViewNonce, getViewNonce, normalizeRenderOptions, normalizeRenderedResult, reduceSourceAssetReferences, getViewDefCacheKey, } from './utils.js';
 import { linkLwrResources } from './linkers/link-lwr-resources.js';
@@ -403,6 +403,17 @@ export class LwrViewRegistry {
                 // Use the same cache key for the link stage
                 viewLinkCacheKey: viewCacheKey,
             });
+            if (viewRecord.resources?.length) {
+                linkedMetadata.assetReferences.push(...viewRecord.resources.reduce((res, asset) => {
+                    if (!asset.src)
+                        return res;
+                    res.push({
+                        url: asset.src,
+                        relative: isRelative(asset.src),
+                    });
+                    return res;
+                }, []));
+            }
             return {
                 // ...viewDefinition,
                 renderedView: linkedView,

package/build/es/utils.js

@@ -2,7 +2,6 @@ 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}">`;
 }
@@ -293,13 +292,14 @@ export function generateLinkHeaders(assets, patterns) {
     // store each Path's config in this config
     const assetConfig = {};
     for (const assetRef of assets) {
-        const path = (assetRef.override?.uri || assetRef.url).split('?')[0];
+        const path = assetRef.override?.uri || assetRef.url;
         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)) {
+                const regex = new RegExp(filePattern);
+                if (regex.test(path)) {
                     matched = pattern.attributes;
                     break;
                 }

package/package.json

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