@hyperframes/core 0.8.65 → 0.8.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compiler/compositionAssembly.d.ts +2 -1
- package/dist/compiler/compositionAssembly.d.ts.map +1 -1
- package/dist/compiler/compositionAssembly.js +6 -2
- package/dist/compiler/compositionAssembly.js.map +1 -1
- package/dist/compiler/inlineSubCompositions.d.ts +1 -1
- package/dist/compiler/inlineSubCompositions.d.ts.map +1 -1
- package/dist/compiler/inlineSubCompositions.js +8 -10
- package/dist/compiler/inlineSubCompositions.js.map +1 -1
- package/dist/generated/runtime-inline.js +1 -1
- package/dist/generated/runtime-inline.js.map +1 -1
- package/dist/hyperframe.runtime.iife.js +37 -37
- package/package.json +4 -4
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
* takes strings — so both a linkedom document and a live browser document
|
|
21
21
|
* satisfy it without an `as T` cast at either call site.
|
|
22
22
|
*/
|
|
23
|
+
export declare const EXTRACTED_COMPOSITION_ASSET_SELECTOR = "style, script, link[rel=\"stylesheet\"], link[rel=\"preconnect\"]";
|
|
23
24
|
/**
|
|
24
25
|
* The compiler's nesting cap, enforced against the ancestry chain rather than a
|
|
25
26
|
* counter so a wide tree is not penalised for a deep sibling.
|
|
@@ -99,7 +100,7 @@ export interface CompositionAssemblyPlan<TElement extends AssemblyAttributed> {
|
|
|
99
100
|
* before the content scripts that call into it.
|
|
100
101
|
*/
|
|
101
102
|
scriptSources: TElement[];
|
|
102
|
-
/**
|
|
103
|
+
/** Head and content links to hoist into the host document. */
|
|
103
104
|
linkSources: TElement[];
|
|
104
105
|
/**
|
|
105
106
|
* Nodes that may declare the composition's variable defaults, in precedence
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compositionAssembly.d.ts","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAeH;;;GAGG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAM5C,8DAA8D;AAC9D,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,iEAAiE;AACjE,MAAM,WAAW,iBAAiB,CAAC,QAAQ;IACzC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,wBAAwB,CAAC,QAAQ,SAAS,kBAAkB;IAC3E;;;;;;;;OAQG;IACH,WAAW,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEzC;;;;OAIG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAElC;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB,CAAC,QAAQ,SAAS,kBAAkB;IAC1E;;;;;;OAMG;IACH,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAC;IAE3B;;;OAGG;IACH,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IAErC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,mEAAmE;IACnE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9B,8EAA8E;IAC9E,YAAY,EAAE,QAAQ,EAAE,CAAC;IAEzB;;;;OAIG;IACH,aAAa,EAAE,QAAQ,EAAE,CAAC;IAE1B,
|
|
1
|
+
{"version":3,"file":"compositionAssembly.d.ts","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAeH,eAAO,MAAM,oCAAoC,sEAAoE,CAAC;AAEtH;;;GAGG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAM5C,8DAA8D;AAC9D,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,iEAAiE;AACjE,MAAM,WAAW,iBAAiB,CAAC,QAAQ;IACzC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,wBAAwB,CAAC,QAAQ,SAAS,kBAAkB;IAC3E;;;;;;;;OAQG;IACH,WAAW,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAEzC;;;;OAIG;IACH,IAAI,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAElC;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB,CAAC,QAAQ,SAAS,kBAAkB;IAC1E;;;;;;OAMG;IACH,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAC;IAE3B;;;OAGG;IACH,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IAErC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,mEAAmE;IACnE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9B,8EAA8E;IAC9E,YAAY,EAAE,QAAQ,EAAE,CAAC;IAEzB;;;;OAIG;IACH,aAAa,EAAE,QAAQ,EAAE,CAAC;IAE1B,8DAA8D;IAC9D,WAAW,EAAE,QAAQ,EAAE,CAAC;IAExB;;;;;;OAMG;IACH,uBAAuB,EAAE,QAAQ,EAAE,CAAC;CACrC;AAUD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,kBAAkB,EACzE,KAAK,EAAE,wBAAwB,CAAC,QAAQ,CAAC,GACxC,uBAAuB,CAAC,QAAQ,CAAC,CAsCnC;AAMD,MAAM,MAAM,oBAAoB,GAAG,gCAAgC,GAAG,wBAAwB,CAAC;AAE/F,MAAM,WAAW,qBAAqB,CAAC,QAAQ;IAC7C,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,sBAAsB,CAAC,QAAQ;IAC9C,KAAK,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,oBAAoB,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,QAAQ,SAAS,kBAAkB,EACjF,aAAa,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAC1C,QAAQ,EAAE,SAAS,MAAM,EAAE,GAC1B,sBAAsB,CAAC,QAAQ,CAAC,CAmBlC"}
|
|
@@ -27,10 +27,11 @@ const COMPOSITION_HOST_SELECTOR = `[${COMPOSITION_SRC_ATTR}]`;
|
|
|
27
27
|
const STYLE_SELECTOR = "style";
|
|
28
28
|
const SCRIPT_SELECTOR = "script";
|
|
29
29
|
/**
|
|
30
|
-
*
|
|
30
|
+
* Links both paths hoist into the host document. Stylesheets carry
|
|
31
31
|
* webfonts a composition's CSS depends on; preconnects are their latency hint.
|
|
32
32
|
*/
|
|
33
33
|
const HOISTED_LINK_SELECTOR = 'link[rel="stylesheet"], link[rel="preconnect"]';
|
|
34
|
+
export const EXTRACTED_COMPOSITION_ASSET_SELECTOR = `${STYLE_SELECTOR}, ${SCRIPT_SELECTOR}, ${HOISTED_LINK_SELECTOR}`;
|
|
34
35
|
/**
|
|
35
36
|
* The compiler's nesting cap, enforced against the ancestry chain rather than a
|
|
36
37
|
* counter so a wide tree is not penalised for a deep sibling.
|
|
@@ -72,7 +73,10 @@ export function planCompositionAssembly(input) {
|
|
|
72
73
|
...toArray(assetHead?.querySelectorAll(SCRIPT_SELECTOR)),
|
|
73
74
|
...toArray(contentNode.querySelectorAll(SCRIPT_SELECTOR)),
|
|
74
75
|
],
|
|
75
|
-
linkSources:
|
|
76
|
+
linkSources: [
|
|
77
|
+
...toArray(head?.querySelectorAll(HOISTED_LINK_SELECTOR)),
|
|
78
|
+
...toArray(contentNode.querySelectorAll(HOISTED_LINK_SELECTOR)),
|
|
79
|
+
],
|
|
76
80
|
variableDefaultCarriers: [documentElement, innerRoot].filter((carrier) => carrier != null),
|
|
77
81
|
};
|
|
78
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compositionAssembly.js","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAClD,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AACpD,MAAM,yBAAyB,GAAG,IAAI,mBAAmB,GAAG,CAAC;AAC7D,MAAM,yBAAyB,GAAG,IAAI,oBAAoB,GAAG,CAAC;AAC9D,MAAM,cAAc,GAAG,OAAO,CAAC;AAC/B,MAAM,eAAe,GAAG,QAAQ,CAAC;AAEjC;;;GAGG;AACH,MAAM,qBAAqB,GAAG,gDAAgD,CAAC;AAE/E;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AA0G5C,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,SAAS,OAAO,CAAW,KAA4C;IACrE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAyC;IAEzC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,aAAa;QAC7B,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,aAAa,CAAC;YAC1F,IAAI,CAAC;QACP,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IAElC,qEAAqE;IACrE,yEAAyE;IACzE,MAAM,qBAAqB,GACzB,CAAC,SAAS,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEtF,wEAAwE;IACxE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAEtD,OAAO;QACL,SAAS;QACT,qBAAqB,EAAE,aAAa,IAAI,qBAAqB,IAAI,IAAI;QACrE,mBAAmB,EAAE,qBAAqB,IAAI,aAAa,IAAI,IAAI;QACnE,cAAc,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI;QAC7D,YAAY,EAAE;YACZ,GAAG,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACvD,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACzD;QACD,aAAa,EAAE;YACb,GAAG,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACxD,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;SAC1D;QACD,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compositionAssembly.js","sourceRoot":"","sources":["../../src/compiler/compositionAssembly.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,7 +115,7 @@ export interface InlineSubCompositionsResult {
|
|
|
115
115
|
* Inline sub-compositions into a document. For each host element in `hosts`:
|
|
116
116
|
*
|
|
117
117
|
* 1. Resolve the sub-composition HTML via `options.resolveHtml`
|
|
118
|
-
* 2. Parse it,
|
|
118
|
+
* 2. Parse it, resolve template, body, or bare-fragment content
|
|
119
119
|
* 3. Find the inner `[data-composition-id]` root
|
|
120
120
|
* 4. Extract `<style>` elements, scope CSS, collect them
|
|
121
121
|
* 5. Extract `<script>` elements, wrap inline scripts, collect them
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inlineSubCompositions.d.ts","sourceRoot":"","sources":["../../src/compiler/inlineSubCompositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAChG;;;;;;;;GAQG;AAEH,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"inlineSubCompositions.d.ts","sourceRoot":"","sources":["../../src/compiler/inlineSubCompositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAChG;;;;;;;;GAQG;AAEH,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,uBAAuB,CAAC;AAqB/B,MAAM,WAAW,4BAA4B;IAC3C;;;OAGG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAEhD;;;;;OAKG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC;IAEtC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,GAAG,CACnB,OAAO,EACP;QAAE,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAC9E,CAAC;IAEF;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,OAAO,CAAC;IAEnD;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExE;;;OAGG;IACH,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;IAEhD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACnE;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,WAAW,EAAE,KAAK,CACd;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACnC,CAAC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,wBAAwB,CAAC,CACjE,CAAC;IACF,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrE,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC1D;AAeD;;;;;;;;;;;;;;GAcG;AAEH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,OAAO,EAAE,EAChB,OAAO,EAAE,4BAA4B,GACpC,2BAA2B,CA4R7B"}
|
|
@@ -11,8 +11,8 @@ import { readExternalScriptAttributes } from "./externalScripts.js";
|
|
|
11
11
|
import { rewriteAssetPath, rewriteAssetPaths, rewriteCssAssetUrls, rewriteInlineStyleAssetUrls, } from "./rewriteSubCompPaths.js";
|
|
12
12
|
import { warnUnknownEnumValues } from "../runtime/getVariables.js";
|
|
13
13
|
import { scopeCssToComposition, wrapInlineScriptWithErrorBoundary, wrapScopedCompositionScript, } from "./compositionScoping.js";
|
|
14
|
-
import { checkSubCompositionUsability } from "@hyperframes/parsers/sub-composition-validity";
|
|
15
|
-
import { enumerateNestedCompositionHosts, planCompositionAssembly } from "./compositionAssembly.js";
|
|
14
|
+
import { checkSubCompositionUsability, resolveSubCompositionContent, } from "@hyperframes/parsers/sub-composition-validity";
|
|
15
|
+
import { enumerateNestedCompositionHosts, planCompositionAssembly, EXTRACTED_COMPOSITION_ASSET_SELECTOR, } from "./compositionAssembly.js";
|
|
16
16
|
// ---------------------------------------------------------------------------
|
|
17
17
|
// Default helpers
|
|
18
18
|
// ---------------------------------------------------------------------------
|
|
@@ -27,7 +27,7 @@ function defaultBuildScopeSelector(compId) {
|
|
|
27
27
|
* Inline sub-compositions into a document. For each host element in `hosts`:
|
|
28
28
|
*
|
|
29
29
|
* 1. Resolve the sub-composition HTML via `options.resolveHtml`
|
|
30
|
-
* 2. Parse it,
|
|
30
|
+
* 2. Parse it, resolve template, body, or bare-fragment content
|
|
31
31
|
* 3. Find the inner `[data-composition-id]` root
|
|
32
32
|
* 4. Extract `<style>` elements, scope CSS, collect them
|
|
33
33
|
* 5. Extract `<script>` elements, wrap inline scripts, collect them
|
|
@@ -86,9 +86,7 @@ export function inlineSubCompositions(document, hosts, options) {
|
|
|
86
86
|
compId = hostEl.getAttribute("data-composition-id") || null;
|
|
87
87
|
runtimeCompId = compId || "";
|
|
88
88
|
}
|
|
89
|
-
|
|
90
|
-
const contentRoot = compDoc.querySelector("template");
|
|
91
|
-
const contentHtml = contentRoot ? contentRoot.innerHTML || "" : compDoc.body?.innerHTML || "";
|
|
89
|
+
const { contentHtml, hasTemplate } = resolveSubCompositionContent(compHtml, compDoc);
|
|
92
90
|
if (!contentHtml.trim()) {
|
|
93
91
|
onMissingComposition?.(src);
|
|
94
92
|
continue;
|
|
@@ -106,7 +104,7 @@ export function inlineSubCompositions(document, hosts, options) {
|
|
|
106
104
|
contentNode: contentDoc,
|
|
107
105
|
head: compDoc.head,
|
|
108
106
|
documentElement: compDoc.documentElement,
|
|
109
|
-
hasTemplate
|
|
107
|
+
hasTemplate,
|
|
110
108
|
compositionId: compId,
|
|
111
109
|
});
|
|
112
110
|
const innerRoot = plan.innerRoot;
|
|
@@ -154,7 +152,7 @@ export function inlineSubCompositions(document, hosts, options) {
|
|
|
154
152
|
};
|
|
155
153
|
// <link> hoisting is unconditional. A templated sub-composition's webfont
|
|
156
154
|
// link is as load-bearing as a non-templated one's, and the mount path has
|
|
157
|
-
// always hoisted both; gating this on `!
|
|
155
|
+
// always hoisted both; gating this on `!hasTemplate` dropped a templated
|
|
158
156
|
// composition's font from the render while preview kept it.
|
|
159
157
|
for (const link of plan.linkSources) {
|
|
160
158
|
const href = resolveSubAssetPath(link.getAttribute("href"));
|
|
@@ -230,7 +228,7 @@ export function inlineSubCompositions(document, hosts, options) {
|
|
|
230
228
|
// Inject content into the host element
|
|
231
229
|
if (innerRoot) {
|
|
232
230
|
innerRoot.setAttribute("data-composition-file", src);
|
|
233
|
-
for (const child of [...innerRoot.querySelectorAll(
|
|
231
|
+
for (const child of [...innerRoot.querySelectorAll(EXTRACTED_COMPOSITION_ASSET_SELECTOR)])
|
|
234
232
|
child.remove();
|
|
235
233
|
if (flattenInnerRoot) {
|
|
236
234
|
const prepared = flattenInnerRoot(innerRoot);
|
|
@@ -257,7 +255,7 @@ export function inlineSubCompositions(document, hosts, options) {
|
|
|
257
255
|
}
|
|
258
256
|
}
|
|
259
257
|
else {
|
|
260
|
-
for (const child of [...contentDoc.querySelectorAll(
|
|
258
|
+
for (const child of [...contentDoc.querySelectorAll(EXTRACTED_COMPOSITION_ASSET_SELECTOR)])
|
|
261
259
|
child.remove();
|
|
262
260
|
// linkedom fragment parsing: when content is `<div data-composition-id="X">...</div>`,
|
|
263
261
|
// the div becomes documentElement and body is empty. Fall back to documentElement.outerHTML
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inlineSubCompositions.js","sourceRoot":"","sources":["../../src/compiler/inlineSubCompositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAiC,MAAM,mBAAmB,CAAC;AAChG;;;;;;;;GAQG;AAEH,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,2BAA2B,GAE5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,qBAAqB,EACrB,iCAAiC,EACjC,2BAA2B,GAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"inlineSubCompositions.js","sourceRoot":"","sources":["../../src/compiler/inlineSubCompositions.ts"],"names":[],"mappings":"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"}
|