@lwrjs/shared-utils 0.11.0-alpha.12 → 0.11.0-alpha.14

package/build/cjs/html-meta.cjs

@@ -64,8 +64,12 @@ var isSelfUrlRegex = /^\s*(data:|#)/i;
 function hasHydrationDirective(attrs = {}) {
   return Object.keys(attrs).some((attr) => attr === HYDRATE_DIRECTIVE);
 }
-async function extractMetadataFromHtml(htmlSource, viewMetadata) {
-  const {customElements, assetReferences, serverData} = viewMetadata;
+async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfig) {
+  const {customElements, assetReferences} = viewMetadata;
+  const {
+    bundleConfig: {external = {}}
+  } = appConfig;
+  const externals = Object.keys(external);
   return new Promise((resolve, reject) => {
     const openElements = new Set();
     const parser = new import_parse5_sax_parser.default({sourceCodeLocationInfo: true});
@@ -76,7 +80,7 @@ async function extractMetadataFromHtml(htmlSource, viewMetadata) {
       attrs,
       sourceCodeLocation
     }) => {
-      if (tagName.includes("-") && !openElements.has(tagName)) {
+      if (tagName.includes("-") && !openElements.has(tagName) && !externals.includes((0, import_identity.kebabCaseToModuleSpecifier)(tagName))) {
         const {startOffset, endOffset} = sourceCodeLocation;
         const props = attrs.length ? attrs.reduce((obj, {name, value}) => {
           obj[(0, import_identity.getPropFromAttrName)(name)] = value === "" ? "true" : value;
@@ -122,9 +126,9 @@ async function extractMetadataFromHtml(htmlSource, viewMetadata) {
     });
     const inputStream = import_stream.Readable.from(htmlSource);
     inputStream.on("end", () => resolve({
+      ...viewMetadata,
       customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
-      assetReferences,
-      serverData
+      assetReferences
     }));
     inputStream.on("error", (error) => reject(error));
     inputStream.pipe(parser);

package/build/es/html-meta.d.ts

@@ -1,11 +1,11 @@
-import type { RenderedViewMetadata } from '@lwrjs/types';
+import type { NormalizedLwrGlobalConfig, RenderedViewMetadata } from '@lwrjs/types';
 export declare function isRelative(url: string): boolean;
 export declare function isSelfUrl(url: string): boolean;
 /**
  * Pull the custom elements and img tags out of an HTML string, to use as metadata
  * @param htmlSource - An HTML string to parse
  */
-export declare function extractMetadataFromHtml(htmlSource: string, viewMetadata: RenderedViewMetadata): Promise<RenderedViewMetadata>;
+export declare function extractMetadataFromHtml(htmlSource: string, viewMetadata: RenderedViewMetadata, appConfig: NormalizedLwrGlobalConfig): Promise<RenderedViewMetadata>;
 export declare const HYDRATE_DIRECTIVE = "lwr:hydrate";
 export declare const HYDRATE_LOAD_VALUE = "load";
 export declare const HYDRATE_CLIENT_VALUE = "client-only";

package/build/es/html-meta.js

@@ -1,4 +1,4 @@
-import { getPropFromAttrName } from './identity.js';
+import { getPropFromAttrName, kebabCaseToModuleSpecifier } from './identity.js';
 import SAXParser from 'parse5-sax-parser';
 import { Readable } from 'stream';
 function parseAssetLocation(htmlSource, tagName, attrLocation) {
@@ -36,8 +36,10 @@ function hasHydrationDirective(attrs = {}) {
  * Pull the custom elements and img tags out of an HTML string, to use as metadata
  * @param htmlSource - An HTML string to parse
  */
-export async function extractMetadataFromHtml(htmlSource, viewMetadata) {
-    const { customElements, assetReferences, serverData } = viewMetadata;
+export async function extractMetadataFromHtml(htmlSource, viewMetadata, appConfig) {
+    const { customElements, assetReferences } = viewMetadata;
+    const { bundleConfig: { external = {} }, } = appConfig;
+    const externals = Object.keys(external);
     return new Promise((resolve, reject) => {
         const openElements = new Set();
         const parser = new SAXParser({ sourceCodeLocationInfo: true }); // TODO: Would we need this in the future?
@@ -46,7 +48,9 @@ export async function extractMetadataFromHtml(htmlSource, viewMetadata) {
         parser.on('startTag', ({ tagName, attrs, // attributes are passed into SSR
         sourceCodeLocation, }) => {
             // custom elements
-            if (tagName.includes('-') && !openElements.has(tagName)) {
+            if (tagName.includes('-') &&
+                !openElements.has(tagName) &&
+                !externals.includes(kebabCaseToModuleSpecifier(tagName))) {
                 const { startOffset, endOffset } = sourceCodeLocation;
                 // transform attributes [{ name: 'some-attr', value: 'the value' }] into properties { someAttr: 'the value' }
                 // leave props as undefined if there are no attributes
@@ -107,9 +111,9 @@ export async function extractMetadataFromHtml(htmlSource, viewMetadata) {
         // If nested islands are found, ONLY collect custom elements with the hydration directive
         // Otherwise, just collect top-level custom elements (ie: root components) as usual
         inputStream.on('end', () => resolve({
+            ...viewMetadata,
             customElements: customElements.filter((ce) => !nestedIslands || hasHydrationDirective(ce.props)),
             assetReferences,
-            serverData,
         }));
         inputStream.on('error', (error) => reject(error));
         inputStream.pipe(parser);

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.12",
+    "version": "0.11.0-alpha.14",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -37,7 +37,7 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.11.0-alpha.12",
+        "@lwrjs/diagnostics": "0.11.0-alpha.14",
         "es-module-lexer": "^1.3.0",
         "fast-json-stable-stringify": "^2.1.0",
         "magic-string": "^0.30.0",
@@ -50,12 +50,12 @@
         "slugify": "^1.4.5"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.12",
+        "@lwrjs/types": "0.11.0-alpha.14",
         "@types/mime-types": "2.1.1",
         "@types/path-to-regexp": "^1.7.0"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "e19ffe5a48dc2b2b6d74d8acfa9658bedb5dd1ff"
+    "gitHead": "d082cc49d9e2b5024d17a3da2c5c2bf585f811fe"
 }