marko 5.31.0 → 5.31.1
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/compiler/index.js +10 -10
- package/dist/core-tags/components/preserve-tag.js +4 -4
- package/dist/core-tags/core/await/AsyncValue.js +7 -7
- package/dist/core-tags/core/await/reorderer-renderer.js +28 -28
- package/dist/node-require/hot-reload.js +5 -5
- package/dist/node-require/index.js +8 -8
- package/dist/node_modules/@internal/components-beginComponent/index-browser.js +4 -4
- package/dist/node_modules/@internal/components-beginComponent/index.js +14 -14
- package/dist/node_modules/@internal/components-define-widget-legacy/index-browser.js +9 -7
- package/dist/node_modules/@internal/components-entry/index-browser.js +2 -1
- package/dist/node_modules/@internal/components-entry/index.js +5 -5
- package/dist/node_modules/@internal/components-entry-legacy/index-browser.js +4 -3
- package/dist/node_modules/@internal/components-entry-legacy/index.js +2 -1
- package/dist/node_modules/@internal/components-registry/index-browser.js +43 -51
- package/dist/node_modules/@internal/components-util/index-browser.js +3 -3
- package/dist/node_modules/@internal/create-readable/index-browser.js +5 -5
- package/dist/node_modules/@internal/create-readable/index.js +5 -5
- package/dist/node_modules/@internal/loader/fallback-node.js +89 -0
- package/dist/node_modules/@internal/loader/index-browser.js +1 -3
- package/dist/node_modules/@internal/loader/index.js +20 -85
- package/dist/node_modules/@internal/loader/package.json +2 -3
- package/dist/node_modules/@internal/require/index-browser.js +13 -0
- package/dist/node_modules/@internal/require/index-legacy-browser.js +20 -0
- package/dist/node_modules/@internal/require/index-webpack.js +11 -0
- package/dist/node_modules/@internal/require/index.js +15 -0
- package/dist/node_modules/@internal/require/package.json +11 -0
- package/dist/runtime/RenderResult.js +8 -7
- package/dist/runtime/components/Component.js +18 -18
- package/dist/runtime/components/ComponentDef.js +1 -1
- package/dist/runtime/components/State.js +10 -10
- package/dist/runtime/components/event-delegation.js +49 -49
- package/dist/runtime/components/legacy/defineComponent-legacy.js +0 -5
- package/dist/runtime/components/legacy/defineRenderer-legacy.js +6 -11
- package/dist/runtime/components/legacy/dependencies/index.js +7 -7
- package/dist/runtime/components/legacy/renderer-legacy.js +51 -51
- package/dist/runtime/components/renderer.js +26 -26
- package/dist/runtime/helpers/_change-case.js +3 -3
- package/dist/runtime/helpers/class-value.js +2 -2
- package/dist/runtime/helpers/dynamic-tag.js +27 -27
- package/dist/runtime/helpers/render-tag.js +3 -3
- package/dist/runtime/html/AsyncStream.js +10 -10
- package/dist/runtime/html/BufferedWriter.js +14 -14
- package/dist/runtime/html/helpers/_dynamic-attr.js +2 -2
- package/dist/runtime/html/helpers/attr.js +5 -5
- package/dist/runtime/html/helpers/attrs.js +2 -2
- package/dist/runtime/html/helpers/data-marko.js +2 -2
- package/dist/runtime/html/helpers/escape-xml.js +2 -2
- package/dist/runtime/html/index.js +9 -9
- package/dist/runtime/renderable.js +4 -4
- package/dist/runtime/vdom/AsyncVDOMBuilder.js +36 -36
- package/dist/runtime/vdom/VElement.js +23 -23
- package/dist/runtime/vdom/hot-reload.js +1 -1
- package/dist/runtime/vdom/index.js +8 -8
- package/dist/runtime/vdom/morphdom/fragment.js +8 -8
- package/dist/runtime/vdom/morphdom/helpers.js +7 -7
- package/dist/runtime/vdom/morphdom/index.js +93 -93
- package/dist/runtime/vdom/morphdom/specialElHandlers.js +8 -8
- package/dist/runtime/vdom/vdom.js +2 -2
- package/dist/taglib/index.js +3 -3
- package/package.json +1 -1
- package/src/node_modules/@internal/components-define-widget-legacy/index-browser.js +17 -15
- package/src/node_modules/@internal/components-define-widget-legacy/index.js +1 -1
- package/src/node_modules/@internal/components-entry/index-browser.js +2 -1
- package/src/node_modules/@internal/components-entry/index.js +2 -2
- package/src/node_modules/@internal/components-entry-legacy/index-browser.js +4 -3
- package/src/node_modules/@internal/components-entry-legacy/index.js +2 -1
- package/src/node_modules/@internal/components-registry/index-browser.js +9 -17
- package/src/node_modules/@internal/create-readable/index-browser.js +2 -2
- package/src/node_modules/@internal/loader/fallback-node.js +89 -0
- package/src/node_modules/@internal/loader/index-browser.js +1 -3
- package/src/node_modules/@internal/loader/index.js +21 -86
- package/src/node_modules/@internal/loader/package.json +2 -3
- package/src/node_modules/@internal/require/index-browser.js +13 -0
- package/src/node_modules/@internal/require/index-legacy-browser.js +20 -0
- package/src/node_modules/@internal/require/index-webpack.js +11 -0
- package/src/node_modules/@internal/require/index.js +15 -0
- package/src/node_modules/@internal/require/package.json +11 -0
- package/src/runtime/components/legacy/defineComponent-legacy.js +0 -5
- package/src/runtime/components/legacy/defineRenderer-legacy.js +2 -7
@@ -106,20 +106,20 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
106
106
|
parentComponent)
|
107
107
|
{
|
108
108
|
var rootNode = component._G_ = insertBefore(
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
109
|
+
createFragmentNode(),
|
110
|
+
referenceNode,
|
111
|
+
referenceNodeParentEl
|
112
|
+
);
|
113
113
|
componentByDOMNode.set(rootNode, component);
|
114
114
|
|
115
115
|
if (key && ownerComponent) {
|
116
116
|
key = normalizeComponentKey(key, parentComponent.id);
|
117
117
|
addComponentRootToKeyedElements(
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
118
|
+
ownerComponent.l_,
|
119
|
+
key,
|
120
|
+
rootNode,
|
121
|
+
component.id
|
122
|
+
);
|
123
123
|
keysByDOMNode.set(rootNode, key);
|
124
124
|
}
|
125
125
|
|
@@ -187,15 +187,15 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
187
187
|
|
188
188
|
if (ownerComponent && curToNodeKey) {
|
189
189
|
curToNodeKey = normalizeComponentKey(
|
190
|
-
|
191
|
-
|
192
|
-
|
190
|
+
curToNodeKey,
|
191
|
+
parentComponent.id
|
192
|
+
);
|
193
193
|
addComponentRootToKeyedElements(
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
194
|
+
ownerComponent.l_,
|
195
|
+
curToNodeKey,
|
196
|
+
rootNode,
|
197
|
+
component.id
|
198
|
+
);
|
199
199
|
|
200
200
|
keysByDOMNode.set(rootNode, curToNodeKey);
|
201
201
|
}
|
@@ -205,14 +205,14 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
205
205
|
curFromNodeChild = nextSibling(rootNode);
|
206
206
|
} else {
|
207
207
|
insertVirtualComponentBefore(
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
208
|
+
curToNodeChild,
|
209
|
+
curFromNodeChild,
|
210
|
+
fromNode,
|
211
|
+
component,
|
212
|
+
curToNodeKey,
|
213
|
+
ownerComponent,
|
214
|
+
parentComponent
|
215
|
+
);
|
216
216
|
}
|
217
217
|
} else {
|
218
218
|
if (matchingFromComponent._G_ !== curFromNodeChild) {
|
@@ -233,10 +233,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
233
233
|
// We need to move the existing component into
|
234
234
|
// the correct location
|
235
235
|
insertBefore(
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
236
|
+
matchingFromComponent._G_,
|
237
|
+
curFromNodeChild,
|
238
|
+
fromNode
|
239
|
+
);
|
240
240
|
} else {
|
241
241
|
curFromNodeChild =
|
242
242
|
curFromNodeChild && nextSibling(curFromNodeChild);
|
@@ -268,7 +268,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
268
268
|
curToNodeKey = (
|
269
269
|
keySequences[referenceComponent.id] || (
|
270
270
|
keySequences[referenceComponent.id] = new KeySequence())).aK_(
|
271
|
-
|
271
|
+
curToNodeKey);
|
272
272
|
|
273
273
|
if (curFromNodeChild) {
|
274
274
|
curFromNodeKey = keysByDOMNode.get(curFromNodeChild);
|
@@ -283,24 +283,24 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
283
283
|
|
284
284
|
if (compareNodeNames(curToNodeChild, curVFromNodeChild)) {
|
285
285
|
morphEl(
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
286
|
+
curFromNodeChild,
|
287
|
+
curVFromNodeChild,
|
288
|
+
curToNodeChild,
|
289
|
+
parentComponent
|
290
|
+
);
|
291
291
|
} else {
|
292
292
|
// Remove the old node
|
293
293
|
detachNode(curFromNodeChild, fromNode, ownerComponent);
|
294
294
|
|
295
295
|
// Incompatible nodes. Just move the target VNode into the DOM at this position
|
296
296
|
insertVirtualNodeBefore(
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
297
|
+
curToNodeChild,
|
298
|
+
curToNodeKey,
|
299
|
+
curFromNodeChild,
|
300
|
+
fromNode,
|
301
|
+
ownerComponent,
|
302
|
+
parentComponent
|
303
|
+
);
|
304
304
|
}
|
305
305
|
}
|
306
306
|
} else {
|
@@ -314,9 +314,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
314
314
|
curFromNodeChild.nodeType === ELEMENT_NODE && (
|
315
315
|
curToNodeChild.o_ ||
|
316
316
|
caseInsensitiveCompare(
|
317
|
-
|
318
|
-
|
319
|
-
|
317
|
+
curFromNodeChild.nodeName,
|
318
|
+
curToNodeChild.bZ_ || ""
|
319
|
+
)))
|
320
320
|
{
|
321
321
|
curVFromNodeChild = virtualizeElement(curFromNodeChild);
|
322
322
|
curVFromNodeChild.bZ_ = curToNodeChild.bZ_;
|
@@ -328,11 +328,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
328
328
|
vElementByDOMNode.set(curFromNodeChild, curVFromNodeChild);
|
329
329
|
} else {
|
330
330
|
morphEl(
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
331
|
+
curFromNodeChild,
|
332
|
+
curVFromNodeChild,
|
333
|
+
curToNodeChild,
|
334
|
+
parentComponent
|
335
|
+
);
|
336
336
|
}
|
337
337
|
|
338
338
|
curToNodeChild = toNextSibling;
|
@@ -366,10 +366,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
366
366
|
}
|
367
367
|
|
368
368
|
var fragment = createFragmentNode(
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
369
|
+
curFromNodeChild,
|
370
|
+
endNode.nextSibling,
|
371
|
+
fromNode
|
372
|
+
);
|
373
373
|
keysByDOMNode.set(fragment, curToNodeKey);
|
374
374
|
vElementByDOMNode.set(fragment, curToNodeChild);
|
375
375
|
referenceComponent.l_[curToNodeKey] = fragment;
|
@@ -388,13 +388,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
388
388
|
}
|
389
389
|
|
390
390
|
insertVirtualNodeBefore(
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
391
|
+
curToNodeChild,
|
392
|
+
curToNodeKey,
|
393
|
+
curFromNodeChild,
|
394
|
+
fromNode,
|
395
|
+
ownerComponent,
|
396
|
+
parentComponent
|
397
|
+
);
|
398
398
|
fromNextSibling = curFromNodeChild;
|
399
399
|
} else {
|
400
400
|
if (detachedByDOMNode.get(matchingFromEl) !== undefined) {
|
@@ -456,20 +456,20 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
456
456
|
}
|
457
457
|
|
458
458
|
morphEl(
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
459
|
+
matchingFromEl,
|
460
|
+
curVFromNodeChild,
|
461
|
+
curToNodeChild,
|
462
|
+
parentComponent
|
463
|
+
);
|
464
464
|
} else {
|
465
465
|
insertVirtualNodeBefore(
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
466
|
+
curToNodeChild,
|
467
|
+
curToNodeKey,
|
468
|
+
curFromNodeChild,
|
469
|
+
fromNode,
|
470
|
+
ownerComponent,
|
471
|
+
parentComponent
|
472
|
+
);
|
473
473
|
detachNode(matchingFromEl, fromNode, ownerComponent);
|
474
474
|
}
|
475
475
|
} else {
|
@@ -524,9 +524,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
524
524
|
|
525
525
|
if (
|
526
526
|
caseInsensitiveCompare(
|
527
|
-
|
528
|
-
|
529
|
-
|
527
|
+
curVFromNodeChild.bZ_,
|
528
|
+
curToNodeChild.bZ_
|
529
|
+
))
|
530
530
|
{
|
531
531
|
curVFromNodeChild.bZ_ = curToNodeChild.bZ_;
|
532
532
|
}
|
@@ -550,11 +550,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
550
550
|
// the current "from" node to match the current
|
551
551
|
// target DOM node.
|
552
552
|
morphEl(
|
553
|
-
|
554
|
-
|
555
|
-
|
556
|
-
|
557
|
-
|
553
|
+
curFromNodeChild,
|
554
|
+
curVFromNodeChild,
|
555
|
+
curToNodeChild,
|
556
|
+
parentComponent
|
557
|
+
);
|
558
558
|
}
|
559
559
|
} else if (
|
560
560
|
curFromNodeType === TEXT_NODE ||
|
@@ -572,8 +572,8 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
572
572
|
toNextSibling.bT_ === TEXT_NODE)
|
573
573
|
{
|
574
574
|
fromNextSibling = curFromNodeChild.splitText(
|
575
|
-
|
576
|
-
|
575
|
+
curToNodeChild.cl_.length
|
576
|
+
);
|
577
577
|
}
|
578
578
|
if (curFromNodeChild.nodeValue !== curToNodeChild.cl_) {
|
579
579
|
curFromNodeChild.nodeValue = curToNodeChild.cl_;
|
@@ -597,13 +597,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
597
597
|
// nodes. Therefore, we will just append the current "to" node
|
598
598
|
// to the end
|
599
599
|
insertVirtualNodeBefore(
|
600
|
-
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
600
|
+
curToNodeChild,
|
601
|
+
curToNodeKey,
|
602
|
+
curFromNodeChild,
|
603
|
+
fromNode,
|
604
|
+
ownerComponent,
|
605
|
+
parentComponent
|
606
|
+
);
|
607
607
|
|
608
608
|
curToNodeChild = toNextSibling;
|
609
609
|
curFromNodeChild = fromNextSibling;
|
@@ -694,9 +694,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
|
|
694
694
|
componentToDestroy.destroy();
|
695
695
|
} else if (node.parentNode) {
|
696
696
|
destroyNodeRecursive(
|
697
|
-
|
698
|
-
|
699
|
-
|
697
|
+
node,
|
698
|
+
detachedFromComponent !== true && detachedFromComponent
|
699
|
+
);
|
700
700
|
|
701
701
|
if (eventDelegation.al_(node) != false) {
|
702
702
|
removeChild(node);
|
@@ -87,14 +87,14 @@ SpecialElHandlers.prototype = {
|
|
87
87
|
if (!toEl.cc_("multiple")) {
|
88
88
|
var selected = 0;
|
89
89
|
forEachOption(
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
90
|
+
toEl,
|
91
|
+
function (option, i) {
|
92
|
+
if (option.cc_("selected")) {
|
93
|
+
selected = i;
|
94
|
+
}
|
95
|
+
},
|
96
|
+
-1
|
97
|
+
);
|
98
98
|
|
99
99
|
if (fromEl.selectedIndex !== selected) {
|
100
100
|
fromEl.selectedIndex = selected;
|
@@ -25,8 +25,8 @@ function virtualize(node, ownerComponent) {
|
|
25
25
|
case 11:
|
26
26
|
var vdomDocFragment = new VDocumentFragment();
|
27
27
|
virtualizeChildNodes(node, vdomDocFragment, ownerComponent);
|
28
|
-
return vdomDocFragment;
|
29
|
-
|
28
|
+
return vdomDocFragment;
|
29
|
+
}
|
30
30
|
}
|
31
31
|
|
32
32
|
function virtualizeHTML(html, ownerComponent) {
|
package/dist/taglib/index.js
CHANGED
@@ -13,9 +13,9 @@ function register(taglibProps, taglibPath) {
|
|
13
13
|
|
14
14
|
function registerFromFile(taglibPath) {
|
15
15
|
return register(
|
16
|
-
|
17
|
-
|
18
|
-
|
16
|
+
compiler.taglib._loader.loadTaglibFromFile(taglibPath),
|
17
|
+
taglibPath
|
18
|
+
);
|
19
19
|
}
|
20
20
|
|
21
21
|
exports.clearCache = clearCache;
|
package/package.json
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
var BaseState;
|
5
5
|
var BaseComponent;
|
6
6
|
var inherit;
|
7
|
-
var
|
7
|
+
var req = require("@internal/require");
|
8
8
|
var registry = require("@internal/components-registry");
|
9
9
|
var jQuery = require("../../../runtime/components/legacy/jquery");
|
10
10
|
var ready = require("../../../runtime/components/legacy/ready");
|
@@ -14,9 +14,9 @@ var stateToJSONDef = {
|
|
14
14
|
enumerable: false,
|
15
15
|
value: function returnSelf() {
|
16
16
|
return this;
|
17
|
-
}
|
17
|
+
},
|
18
18
|
};
|
19
|
-
function noop() {
|
19
|
+
function noop() {}
|
20
20
|
|
21
21
|
module.exports = function defineWidget(def, renderer) {
|
22
22
|
def = def.Widget || def;
|
@@ -25,7 +25,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
25
25
|
return def;
|
26
26
|
}
|
27
27
|
|
28
|
-
var ComponentClass = function () {
|
28
|
+
var ComponentClass = function () {};
|
29
29
|
var proto;
|
30
30
|
var legacyInit;
|
31
31
|
|
@@ -94,7 +94,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
94
94
|
}
|
95
95
|
|
96
96
|
this.setState(newState);
|
97
|
-
}
|
97
|
+
},
|
98
98
|
});
|
99
99
|
|
100
100
|
Object.defineProperty(proto, "__document", {
|
@@ -104,7 +104,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
104
104
|
complain("__document is deprecated");
|
105
105
|
}
|
106
106
|
return this.___host;
|
107
|
-
}
|
107
|
+
},
|
108
108
|
});
|
109
109
|
|
110
110
|
Object.defineProperty(proto, "el", {
|
@@ -122,7 +122,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
122
122
|
}
|
123
123
|
|
124
124
|
return this.___currentLegacyBindEl;
|
125
|
-
}
|
125
|
+
},
|
126
126
|
});
|
127
127
|
|
128
128
|
// get legacy methods
|
@@ -132,7 +132,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
132
132
|
get: noop,
|
133
133
|
set: function (v) {
|
134
134
|
proto.___legacyOnRender = v;
|
135
|
-
}
|
135
|
+
},
|
136
136
|
});
|
137
137
|
|
138
138
|
proto.___legacyOnUpdate = proto.onUpdate;
|
@@ -142,7 +142,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
142
142
|
},
|
143
143
|
set: function (v) {
|
144
144
|
proto.___legacyOnUpdate = v;
|
145
|
-
}
|
145
|
+
},
|
146
146
|
});
|
147
147
|
|
148
148
|
proto.___legacyOnDestroy = proto.onDestroy;
|
@@ -152,7 +152,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
152
152
|
},
|
153
153
|
set: function (v) {
|
154
154
|
proto.___legacyOnDestroy = v;
|
155
|
-
}
|
155
|
+
},
|
156
156
|
});
|
157
157
|
|
158
158
|
proto.getWidget = proto.getComponent;
|
@@ -172,7 +172,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
172
172
|
complain(
|
173
173
|
"widget was updated after it was destroyed, if this widget is migrated to a modern component this will become a noop.",
|
174
174
|
{
|
175
|
-
location: this.___type
|
175
|
+
location: this.___type,
|
176
176
|
}
|
177
177
|
);
|
178
178
|
}
|
@@ -216,7 +216,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
216
216
|
get: function () {
|
217
217
|
complain("__widget is deprecated");
|
218
218
|
return self;
|
219
|
-
}
|
219
|
+
},
|
220
220
|
});
|
221
221
|
} else {
|
222
222
|
el.__widget = this;
|
@@ -308,7 +308,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
308
308
|
get: function () {
|
309
309
|
complain("_isWidget is deprecated");
|
310
310
|
return true;
|
311
|
-
}
|
311
|
+
},
|
312
312
|
});
|
313
313
|
} else {
|
314
314
|
Component._isWidget = true;
|
@@ -317,10 +317,12 @@ module.exports = function defineWidget(def, renderer) {
|
|
317
317
|
var template = def.template;
|
318
318
|
if (template) {
|
319
319
|
if (typeof template === "string") {
|
320
|
-
template =
|
320
|
+
template = req(template);
|
321
321
|
}
|
322
322
|
|
323
|
-
registry.r(template.___typeName, function () {
|
323
|
+
registry.r(template.___typeName, function () {
|
324
|
+
return Component;
|
325
|
+
});
|
324
326
|
}
|
325
327
|
|
326
328
|
return Component;
|
@@ -10,7 +10,7 @@ module.exports = function defineWidget(def, renderer) {
|
|
10
10
|
renderer: renderer,
|
11
11
|
render: renderer.render,
|
12
12
|
renderSync: renderer.renderSync,
|
13
|
-
template: renderer.template
|
13
|
+
template: renderer.template,
|
14
14
|
};
|
15
15
|
} else {
|
16
16
|
return { ___isComponent: true, _isWidget: true };
|
@@ -1,6 +1,7 @@
|
|
1
1
|
var registry = require("@internal/components-registry");
|
2
2
|
|
3
|
-
exports.getComponentForEl =
|
3
|
+
exports.getComponentForEl =
|
4
|
+
require("@internal/components-util").___getComponentForEl;
|
4
5
|
exports.init = registry.___initServerRendered;
|
5
6
|
exports.register = function (id, component) {
|
6
7
|
registry.r(id, function () {
|
@@ -152,7 +152,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
|
|
152
152
|
s: needsState && state,
|
153
153
|
u: undefinedPropNames,
|
154
154
|
w: serializedProps,
|
155
|
-
r: renderBody
|
155
|
+
r: renderBody,
|
156
156
|
};
|
157
157
|
|
158
158
|
var parts = [id, typeName];
|
@@ -233,7 +233,7 @@ function getInitComponentsData(out, componentDefs) {
|
|
233
233
|
l: isLast && 1,
|
234
234
|
g: serializedGlobals,
|
235
235
|
w: componentDefs,
|
236
|
-
t: newTypes
|
236
|
+
t: newTypes,
|
237
237
|
};
|
238
238
|
}
|
239
239
|
|
@@ -1,5 +1,5 @@
|
|
1
1
|
var Component = require("../../../runtime/components/Component");
|
2
|
-
var
|
2
|
+
var req = require("@internal/require");
|
3
3
|
var getComponentForEl =
|
4
4
|
require("@internal/components-util").___getComponentForEl;
|
5
5
|
|
@@ -8,14 +8,15 @@ var complain = "MARKO_DEBUG" && require("complain");
|
|
8
8
|
// expose legacy
|
9
9
|
require("@internal/components-registry").___legacy = exports;
|
10
10
|
exports.load = function (typeName) {
|
11
|
-
return exports.defineWidget(
|
11
|
+
return exports.defineWidget(req(typeName));
|
12
12
|
};
|
13
13
|
|
14
14
|
// legacy api
|
15
15
|
exports.defineComponent = require("../../../runtime/components/legacy/defineComponent-legacy");
|
16
16
|
exports.defineWidget = require("@internal/components-define-widget-legacy");
|
17
17
|
exports.defineRenderer = require("../../../runtime/components/legacy/defineRenderer-legacy");
|
18
|
-
exports.makeRenderable =
|
18
|
+
exports.makeRenderable =
|
19
|
+
exports.renderable = require("../../../runtime/renderable");
|
19
20
|
|
20
21
|
// browser only
|
21
22
|
var Widget = (exports.Widget = Component);
|
@@ -4,7 +4,8 @@ var modernMarko = require("@internal/components-entry");
|
|
4
4
|
exports.defineComponent = require("../../../runtime/components/legacy/defineComponent-legacy");
|
5
5
|
exports.defineWidget = require("@internal/components-define-widget-legacy");
|
6
6
|
exports.defineRenderer = require("../../../runtime/components/legacy/defineRenderer-legacy");
|
7
|
-
exports.makeRenderable =
|
7
|
+
exports.makeRenderable =
|
8
|
+
exports.renderable = require("../../../runtime/renderable");
|
8
9
|
|
9
10
|
// server only
|
10
11
|
exports.writeInitWidgetsCode = modernMarko.writeInitComponentsCode;
|
@@ -8,7 +8,7 @@ var createFragmentNode =
|
|
8
8
|
var ComponentDef = require("../../../runtime/components/ComponentDef");
|
9
9
|
var domData = require("../../../runtime/components/dom-data");
|
10
10
|
var componentsUtil = require("@internal/components-util");
|
11
|
-
var
|
11
|
+
var req = require("@internal/require");
|
12
12
|
var componentLookup = componentsUtil.___componentLookup;
|
13
13
|
var addComponentRootToKeyedElements =
|
14
14
|
componentsUtil.___addComponentRootToKeyedElements;
|
@@ -69,7 +69,7 @@ function addPendingDef(def, type, meta, host, runtimeId) {
|
|
69
69
|
def,
|
70
70
|
meta,
|
71
71
|
host,
|
72
|
-
runtimeId
|
72
|
+
runtimeId,
|
73
73
|
]);
|
74
74
|
}
|
75
75
|
|
@@ -83,7 +83,7 @@ function load(typeName, isLegacy) {
|
|
83
83
|
} else if (isLegacy) {
|
84
84
|
target = exports.___legacy.load(typeName);
|
85
85
|
} else {
|
86
|
-
target =
|
86
|
+
target = req(typeName);
|
87
87
|
// eslint-disable-next-line no-constant-condition
|
88
88
|
if ("MARKO_DEBUG") {
|
89
89
|
complain(
|
@@ -140,7 +140,7 @@ function getComponentClass(typeName, isLegacy) {
|
|
140
140
|
ComponentClass = {
|
141
141
|
[className]: function (id, doc) {
|
142
142
|
OldComponentClass.call(this, id, doc);
|
143
|
-
}
|
143
|
+
},
|
144
144
|
}[className];
|
145
145
|
ComponentClass.prototype = OldComponentClass.prototype;
|
146
146
|
}
|
@@ -414,7 +414,7 @@ function initServerRendered(renderedComponents, host) {
|
|
414
414
|
|
415
415
|
var fakeArray = (win[globalKey] = {
|
416
416
|
r: runtimeId,
|
417
|
-
concat: initServerRendered
|
417
|
+
concat: initServerRendered,
|
418
418
|
});
|
419
419
|
|
420
420
|
// eslint-disable-next-line no-constant-condition
|
@@ -495,18 +495,9 @@ function initServerRendered(renderedComponents, host) {
|
|
495
495
|
.map(function (componentDef) {
|
496
496
|
var typeName = meta.___types[componentDef[1]];
|
497
497
|
|
498
|
-
return
|
499
|
-
registered[typeName] ||
|
498
|
+
return registered[typeName] ||
|
500
499
|
document.readyState === "complete" ||
|
501
|
-
(
|
502
|
-
// loader.runtime is only going to exist for lasso apps
|
503
|
-
// this code is used to detect if a module was registered
|
504
|
-
// via a browser.json but not executed.
|
505
|
-
loader.runtime &&
|
506
|
-
loader.runtime.resolve &&
|
507
|
-
loader.runtime.resolve(typeName)
|
508
|
-
)
|
509
|
-
)
|
500
|
+
req.e(typeName)
|
510
501
|
? tryHydrateComponent(componentDef, meta, host, runtimeId)
|
511
502
|
: addPendingDef(componentDef, typeName, meta, host, runtimeId);
|
512
503
|
})
|
@@ -594,4 +585,5 @@ exports.___createComponent = createComponent;
|
|
594
585
|
exports.___getComponentClass = getComponentClass;
|
595
586
|
exports.___initServerRendered = win.$initComponents = initServerRendered;
|
596
587
|
|
597
|
-
require("../../../runtime/components/ComponentsContext").___initClientRendered =
|
588
|
+
require("../../../runtime/components/ComponentsContext").___initClientRendered =
|
589
|
+
initClientRendered;
|
@@ -11,7 +11,7 @@ module.exports = function (data) {
|
|
11
11
|
},
|
12
12
|
end: function () {
|
13
13
|
writer.close();
|
14
|
-
}
|
14
|
+
},
|
15
15
|
};
|
16
16
|
var out = this.createOut(
|
17
17
|
data && data.$global,
|
@@ -19,7 +19,7 @@ module.exports = function (data) {
|
|
19
19
|
undefined,
|
20
20
|
this.___shouldBuffer
|
21
21
|
);
|
22
|
-
out.once("error", err => {
|
22
|
+
out.once("error", (err) => {
|
23
23
|
facade.write = facade.end = noop;
|
24
24
|
writer.abort(err);
|
25
25
|
});
|