@reidelsaltres/pureper 0.1.143 → 0.1.145
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/out/foundation/Fetcher.js +1 -1
- package/out/foundation/Fetcher.js.map +1 -1
- package/out/foundation/Triplet.d.ts +4 -10
- package/out/foundation/Triplet.d.ts.map +1 -1
- package/out/foundation/Triplet.js +31 -59
- package/out/foundation/Triplet.js.map +1 -1
- package/package.json +1 -1
- package/src/foundation/Fetcher.ts +1 -1
- package/src/foundation/Triplet.ts +44 -68
|
@@ -64,7 +64,7 @@ export default class Fetcher {
|
|
|
64
64
|
static async internalFetch(resolvedUrl) {
|
|
65
65
|
const response = await fetch(resolvedUrl, { cache: 'default' });
|
|
66
66
|
if (!response.ok) {
|
|
67
|
-
throw new Error(`HTTP error! status: ${response.status}`);
|
|
67
|
+
throw new Error(`HTTP error! ${resolvedUrl} status: ${response.status}`);
|
|
68
68
|
}
|
|
69
69
|
return response;
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../../src/foundation/Fetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../../src/foundation/Fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,25 +18,19 @@ export type TripletStruct = {
|
|
|
18
18
|
class?: AnyConstructor<UniHtml>;
|
|
19
19
|
};
|
|
20
20
|
export default class Triplet {
|
|
21
|
-
readonly markup?: string
|
|
22
|
-
readonly css?: string
|
|
23
|
-
readonly lightCss?: string
|
|
24
|
-
readonly js?: string
|
|
21
|
+
readonly markup?: Promise<string>;
|
|
22
|
+
readonly css?: Promise<string>;
|
|
23
|
+
readonly lightCss?: Promise<string>;
|
|
24
|
+
readonly js?: Promise<string>;
|
|
25
25
|
private readonly markupURL?;
|
|
26
26
|
private readonly cssURL?;
|
|
27
27
|
private readonly ltCssURL?;
|
|
28
28
|
private readonly jsURL?;
|
|
29
29
|
private readonly access;
|
|
30
30
|
private uni?;
|
|
31
|
-
private lightCssApplied;
|
|
32
|
-
private componentCssSheetPromise?;
|
|
33
31
|
constructor(struct: TripletStruct);
|
|
34
|
-
private getMarkupText;
|
|
35
|
-
private getLightCssText;
|
|
36
|
-
private getComponentCssSheet;
|
|
37
32
|
init(): Promise<boolean>;
|
|
38
33
|
cache(): Promise<void>;
|
|
39
|
-
private createLink;
|
|
40
34
|
register(type: "router" | "markup", name: string): Promise<boolean>;
|
|
41
35
|
private createInjectedClass;
|
|
42
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Triplet.d.ts","sourceRoot":"","sources":["../../src/foundation/Triplet.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAKjD,OAAO,EAAE,cAAc,EAAe,MAAM,gCAAgC,CAAC;AAM7E,oBAAY,UAAU;IAClB,IAAI,IAAI;IACR,OAAO,IAAS;IAChB,MAAM,IAAS;IACf,IAAI,IAAmB;CAC1B;AACD,MAAM,MAAM,aAAa,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Triplet.d.ts","sourceRoot":"","sources":["../../src/foundation/Triplet.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAKjD,OAAO,EAAE,cAAc,EAAe,MAAM,gCAAgC,CAAC;AAM7E,oBAAY,UAAU;IAClB,IAAI,IAAI;IACR,OAAO,IAAS;IAChB,MAAM,IAAS;IACf,IAAI,IAAmB;CAC1B;AACD,MAAM,MAAM,aAAa,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACnC,CAAA;AACD,MAAM,CAAC,OAAO,OAAO,OAAO;IACxB,SAAgB,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,SAAgB,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,SAAgB,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,SAAgB,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAS;IAEhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IAEpC,OAAO,CAAC,GAAG,CAAC,CAA0B;gBAEnB,MAAM,EAAE,aAAa;IA6B3B,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAcxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuDhF,OAAO,CAAC,mBAAmB;CAiC9B"}
|
|
@@ -22,47 +22,30 @@ export default class Triplet {
|
|
|
22
22
|
jsURL;
|
|
23
23
|
access;
|
|
24
24
|
uni;
|
|
25
|
-
lightCssApplied = false;
|
|
26
|
-
componentCssSheetPromise;
|
|
27
25
|
constructor(struct) {
|
|
28
|
-
this.markup = struct.markup;
|
|
29
|
-
this.css = struct.css;
|
|
30
|
-
this.lightCss = struct.ltCss;
|
|
31
|
-
this.js = undefined;
|
|
32
26
|
this.markupURL = struct.markupURL;
|
|
33
27
|
this.cssURL = struct.cssURL;
|
|
34
28
|
this.ltCssURL = struct.ltCssURL;
|
|
35
29
|
this.jsURL = struct.jsURL;
|
|
30
|
+
let markup = Promise.resolve(struct.markup);
|
|
31
|
+
if (struct.markupURL)
|
|
32
|
+
markup = Fetcher.fetchText(struct.markupURL);
|
|
33
|
+
let css = Promise.resolve(struct.css);
|
|
34
|
+
if (struct.cssURL)
|
|
35
|
+
css = Fetcher.fetchText(struct.cssURL);
|
|
36
|
+
let ltCss = Promise.resolve(struct.ltCss);
|
|
37
|
+
if (struct.ltCssURL)
|
|
38
|
+
ltCss = Fetcher.fetchText(struct.ltCssURL);
|
|
39
|
+
let js = Promise.resolve(undefined);
|
|
40
|
+
if (struct.jsURL)
|
|
41
|
+
js = Fetcher.fetchText(struct.jsURL);
|
|
42
|
+
this.markup = markup;
|
|
43
|
+
this.css = css;
|
|
44
|
+
this.lightCss = ltCss;
|
|
45
|
+
this.js = js;
|
|
36
46
|
this.access = struct.access ?? AccessType.BOTH;
|
|
37
47
|
this.uni = struct.class;
|
|
38
48
|
}
|
|
39
|
-
async getMarkupText() {
|
|
40
|
-
if (this.markup)
|
|
41
|
-
return this.markup;
|
|
42
|
-
if (this.markupURL)
|
|
43
|
-
return Fetcher.fetchText(this.markupURL);
|
|
44
|
-
return undefined;
|
|
45
|
-
}
|
|
46
|
-
async getLightCssText() {
|
|
47
|
-
if (this.lightCss)
|
|
48
|
-
return this.lightCss;
|
|
49
|
-
if (this.ltCssURL)
|
|
50
|
-
return Fetcher.fetchText(this.ltCssURL);
|
|
51
|
-
return undefined;
|
|
52
|
-
}
|
|
53
|
-
async getComponentCssSheet() {
|
|
54
|
-
if (this.componentCssSheetPromise)
|
|
55
|
-
return this.componentCssSheetPromise;
|
|
56
|
-
this.componentCssSheetPromise = (async () => {
|
|
57
|
-
const cssText = this.css ?? (this.cssURL ? await Fetcher.fetchText(this.cssURL) : undefined);
|
|
58
|
-
if (!cssText)
|
|
59
|
-
return null;
|
|
60
|
-
const sheet = new CSSStyleSheet();
|
|
61
|
-
await sheet.replace(cssText);
|
|
62
|
-
return sheet;
|
|
63
|
-
})();
|
|
64
|
-
return this.componentCssSheetPromise;
|
|
65
|
-
}
|
|
66
49
|
async init() {
|
|
67
50
|
const isOnline = await ServiceWorker.isOnline();
|
|
68
51
|
if (this.access === AccessType.NONE)
|
|
@@ -81,14 +64,6 @@ export default class Triplet {
|
|
|
81
64
|
async cache() {
|
|
82
65
|
//
|
|
83
66
|
}
|
|
84
|
-
createLink(cssPath) {
|
|
85
|
-
const link = document.createElement('link');
|
|
86
|
-
link.rel = 'stylesheet';
|
|
87
|
-
///
|
|
88
|
-
link.href = cssPath;
|
|
89
|
-
///
|
|
90
|
-
return link;
|
|
91
|
-
}
|
|
92
67
|
async register(type, name) {
|
|
93
68
|
if (!this.uni) {
|
|
94
69
|
switch (type) {
|
|
@@ -100,21 +75,16 @@ export default class Triplet {
|
|
|
100
75
|
break;
|
|
101
76
|
}
|
|
102
77
|
}
|
|
103
|
-
if (
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
...document.adoptedStyleSheets,
|
|
110
|
-
style
|
|
111
|
-
];
|
|
112
|
-
}
|
|
113
|
-
this.lightCssApplied = true;
|
|
78
|
+
if (this.lightCss) {
|
|
79
|
+
var style = await new CSSStyleSheet().replace(await this.lightCss);
|
|
80
|
+
document.adoptedStyleSheets = [
|
|
81
|
+
...document.adoptedStyleSheets,
|
|
82
|
+
style
|
|
83
|
+
];
|
|
114
84
|
}
|
|
115
85
|
let ori = this.createInjectedClass(this.uni, type);
|
|
116
86
|
if (type === "router") {
|
|
117
|
-
const routePath = this.markupURL ??
|
|
87
|
+
const routePath = this.markupURL ?? "";
|
|
118
88
|
var reg = Router.registerRoute(routePath, name, (search) => {
|
|
119
89
|
const paramNames = (() => {
|
|
120
90
|
const ctor = this.uni.prototype.constructor;
|
|
@@ -153,17 +123,19 @@ export default class Triplet {
|
|
|
153
123
|
let proto = ori.prototype;
|
|
154
124
|
const parser = new HMLEParserReborn();
|
|
155
125
|
proto._init = async function () {
|
|
156
|
-
const markupText = await that.
|
|
126
|
+
const markupText = await that.markup;
|
|
157
127
|
if (!markupText)
|
|
158
128
|
return new DocumentFragment();
|
|
159
129
|
return parser.parseToDOM(markupText, this);
|
|
160
130
|
};
|
|
161
131
|
proto._postInit = async function (preHtml) {
|
|
162
|
-
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
132
|
+
const dmc = this.shadowRoot ?? document;
|
|
133
|
+
const css = await that.css;
|
|
134
|
+
var style = await new CSSStyleSheet().replace(css);
|
|
135
|
+
dmc.adoptedStyleSheets = [
|
|
136
|
+
...dmc.adoptedStyleSheets,
|
|
137
|
+
style
|
|
138
|
+
];
|
|
167
139
|
parser.hydrate(preHtml, this);
|
|
168
140
|
return preHtml;
|
|
169
141
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Triplet.js","sourceRoot":"","sources":["../../src/foundation/Triplet.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,SAAS,MAAM,8BAA8B,CAAC;AAIrD,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AAGrD,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,2CAAQ,CAAA;IACR,iDAAgB,CAAA;IAChB,+CAAe,CAAA;IACf,2CAAuB,CAAA;AAC3B,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB;AAgBD,MAAM,CAAC,OAAO,OAAO,OAAO;IACR,MAAM,
|
|
1
|
+
{"version":3,"file":"Triplet.js","sourceRoot":"","sources":["../../src/foundation/Triplet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -67,7 +67,7 @@ export default class Fetcher {
|
|
|
67
67
|
private static async internalFetch(resolvedUrl: string): Promise<Response> {
|
|
68
68
|
const response = await fetch(resolvedUrl, { cache: 'default' });
|
|
69
69
|
if (!response.ok) {
|
|
70
|
-
throw new Error(`HTTP error! status: ${response.status}`);
|
|
70
|
+
throw new Error(`HTTP error! ${resolvedUrl} status: ${response.status}`);
|
|
71
71
|
}
|
|
72
72
|
return response;
|
|
73
73
|
}
|
|
@@ -29,13 +29,13 @@ export type TripletStruct = {
|
|
|
29
29
|
jsURL?: string;
|
|
30
30
|
|
|
31
31
|
access?: AccessType;
|
|
32
|
-
class
|
|
32
|
+
class?: AnyConstructor<UniHtml>;
|
|
33
33
|
}
|
|
34
34
|
export default class Triplet {
|
|
35
|
-
public readonly markup?: string
|
|
36
|
-
public readonly css?: string
|
|
37
|
-
public readonly lightCss?: string
|
|
38
|
-
public readonly js?: string
|
|
35
|
+
public readonly markup?: Promise<string>;
|
|
36
|
+
public readonly css?: Promise<string>;
|
|
37
|
+
public readonly lightCss?: Promise<string>;
|
|
38
|
+
public readonly js?: Promise<string>;
|
|
39
39
|
|
|
40
40
|
private readonly markupURL?: string;
|
|
41
41
|
private readonly cssURL?: string;
|
|
@@ -46,52 +46,35 @@ export default class Triplet {
|
|
|
46
46
|
|
|
47
47
|
private uni?: AnyConstructor<UniHtml>;
|
|
48
48
|
|
|
49
|
-
private lightCssApplied: boolean = false;
|
|
50
|
-
private componentCssSheetPromise?: Promise<CSSStyleSheet | null>;
|
|
51
|
-
|
|
52
49
|
public constructor(struct: TripletStruct) {
|
|
53
|
-
this.markup = struct.markup;
|
|
54
|
-
this.css = struct.css;
|
|
55
|
-
this.lightCss = struct.ltCss;
|
|
56
|
-
this.js = undefined;
|
|
57
|
-
|
|
58
50
|
this.markupURL = struct.markupURL;
|
|
59
51
|
this.cssURL = struct.cssURL;
|
|
60
52
|
this.ltCssURL = struct.ltCssURL;
|
|
61
53
|
this.jsURL = struct.jsURL;
|
|
62
54
|
|
|
55
|
+
let markup = Promise.resolve(struct.markup);
|
|
56
|
+
if (struct.markupURL)
|
|
57
|
+
markup = Fetcher.fetchText(struct.markupURL);
|
|
58
|
+
let css = Promise.resolve(struct.css);
|
|
59
|
+
if (struct.cssURL)
|
|
60
|
+
css = Fetcher.fetchText(struct.cssURL);
|
|
61
|
+
let ltCss = Promise.resolve(struct.ltCss);
|
|
62
|
+
if (struct.ltCssURL)
|
|
63
|
+
ltCss = Fetcher.fetchText(struct.ltCssURL);
|
|
64
|
+
let js = Promise.resolve(undefined);
|
|
65
|
+
if (struct.jsURL)
|
|
66
|
+
js = Fetcher.fetchText(struct.jsURL);
|
|
67
|
+
|
|
68
|
+
this.markup = markup;
|
|
69
|
+
this.css = css;
|
|
70
|
+
this.lightCss = ltCss;
|
|
71
|
+
this.js = js;
|
|
72
|
+
|
|
63
73
|
this.access = struct.access ?? AccessType.BOTH;
|
|
64
74
|
|
|
65
75
|
this.uni = struct.class;
|
|
66
76
|
}
|
|
67
77
|
|
|
68
|
-
private async getMarkupText(): Promise<string | undefined> {
|
|
69
|
-
if (this.markup) return this.markup;
|
|
70
|
-
if (this.markupURL) return Fetcher.fetchText(this.markupURL);
|
|
71
|
-
return undefined;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
private async getLightCssText(): Promise<string | undefined> {
|
|
75
|
-
if (this.lightCss) return this.lightCss;
|
|
76
|
-
if (this.ltCssURL) return Fetcher.fetchText(this.ltCssURL);
|
|
77
|
-
return undefined;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
private async getComponentCssSheet(): Promise<CSSStyleSheet | null> {
|
|
81
|
-
if (this.componentCssSheetPromise) return this.componentCssSheetPromise;
|
|
82
|
-
|
|
83
|
-
this.componentCssSheetPromise = (async () => {
|
|
84
|
-
const cssText = this.css ?? (this.cssURL ? await Fetcher.fetchText(this.cssURL) : undefined);
|
|
85
|
-
if (!cssText) return null;
|
|
86
|
-
|
|
87
|
-
const sheet = new CSSStyleSheet();
|
|
88
|
-
await sheet.replace(cssText);
|
|
89
|
-
return sheet;
|
|
90
|
-
})();
|
|
91
|
-
|
|
92
|
-
return this.componentCssSheetPromise;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
78
|
public async init(): Promise<boolean> {
|
|
96
79
|
const isOnline: boolean = await ServiceWorker.isOnline();
|
|
97
80
|
|
|
@@ -110,16 +93,6 @@ export default class Triplet {
|
|
|
110
93
|
//
|
|
111
94
|
}
|
|
112
95
|
|
|
113
|
-
private createLink(cssPath: string): HTMLLinkElement {
|
|
114
|
-
const link = document.createElement('link');
|
|
115
|
-
link.rel = 'stylesheet';
|
|
116
|
-
///
|
|
117
|
-
link.href = cssPath;
|
|
118
|
-
///
|
|
119
|
-
return link;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
|
|
123
96
|
public async register(type: "router" | "markup", name: string): Promise<boolean> {
|
|
124
97
|
if (!this.uni) {
|
|
125
98
|
switch (type) {
|
|
@@ -131,23 +104,18 @@ export default class Triplet {
|
|
|
131
104
|
break;
|
|
132
105
|
}
|
|
133
106
|
}
|
|
134
|
-
if (
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
...document.adoptedStyleSheets,
|
|
141
|
-
style
|
|
142
|
-
];
|
|
143
|
-
}
|
|
144
|
-
this.lightCssApplied = true;
|
|
107
|
+
if (this.lightCss) {
|
|
108
|
+
var style = await new CSSStyleSheet().replace(await this.lightCss);
|
|
109
|
+
document.adoptedStyleSheets = [
|
|
110
|
+
...document.adoptedStyleSheets,
|
|
111
|
+
style
|
|
112
|
+
];
|
|
145
113
|
}
|
|
146
114
|
|
|
147
115
|
let ori = this.createInjectedClass(this.uni, type);
|
|
148
116
|
|
|
149
117
|
if (type === "router") {
|
|
150
|
-
const routePath = this.markupURL ??
|
|
118
|
+
const routePath = this.markupURL ?? "";
|
|
151
119
|
var reg = Router.registerRoute(routePath, name, (search) => {
|
|
152
120
|
const paramNames = (() => {
|
|
153
121
|
const ctor = this.uni.prototype.constructor;
|
|
@@ -179,6 +147,7 @@ export default class Triplet {
|
|
|
179
147
|
}
|
|
180
148
|
return Promise.resolve(false);
|
|
181
149
|
}
|
|
150
|
+
|
|
182
151
|
private createInjectedClass(c: AnyConstructor<UniHtml>, type: "router" | "markup"): any {
|
|
183
152
|
let that = this;
|
|
184
153
|
let ori = class extends c {
|
|
@@ -188,20 +157,27 @@ export default class Triplet {
|
|
|
188
157
|
};
|
|
189
158
|
let proto = ori.prototype as any;
|
|
190
159
|
const parser = new HMLEParserReborn();
|
|
160
|
+
|
|
191
161
|
proto._init = async function (): Promise<DocumentFragment> {
|
|
192
|
-
const markupText = await that.
|
|
162
|
+
const markupText = await that.markup;
|
|
193
163
|
if (!markupText) return new DocumentFragment();
|
|
194
164
|
return parser.parseToDOM(markupText, this);
|
|
195
165
|
}
|
|
166
|
+
|
|
196
167
|
proto._postInit = async function (preHtml: DocumentFragment): Promise<DocumentFragment> {
|
|
197
|
-
|
|
198
|
-
const
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
168
|
+
const dmc: Document | ShadowRoot = this.shadowRoot ?? document;
|
|
169
|
+
const css = await that.css;
|
|
170
|
+
|
|
171
|
+
var style = await new CSSStyleSheet().replace(css);
|
|
172
|
+
dmc.adoptedStyleSheets = [
|
|
173
|
+
...dmc.adoptedStyleSheets,
|
|
174
|
+
style
|
|
175
|
+
];
|
|
176
|
+
|
|
202
177
|
parser.hydrate(preHtml, this);
|
|
203
178
|
return preHtml;
|
|
204
179
|
}
|
|
180
|
+
|
|
205
181
|
return ori;
|
|
206
182
|
}
|
|
207
183
|
|