@merkur/integration-react 0.38.0 → 0.39.0
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/README.md +1 -1
- package/lib/index.cjs +17 -8
- package/lib/index.es9.cjs +7 -7
- package/lib/index.es9.mjs +7 -7
- package/lib/index.js +17 -8
- package/lib/index.mjs +17 -8
- package/package.json +7 -8
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<p align="center">
|
|
2
2
|
<a href="https://merkur.js.org/docs/getting-started" title="Getting started">
|
|
3
|
-
<img src="https://raw.githubusercontent.com/mjancarik/merkur/master/images/merkur-
|
|
3
|
+
<img src="https://raw.githubusercontent.com/mjancarik/merkur/master/images/merkur-logo.png" width="100px" height="100px" alt="Merkur illustration"/>
|
|
4
4
|
</a>
|
|
5
5
|
</p>
|
|
6
6
|
|
package/lib/index.cjs
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var React = require('react');
|
|
4
3
|
var core = require('@merkur/core');
|
|
5
4
|
var integration = require('@merkur/integration');
|
|
5
|
+
var React = require('react');
|
|
6
|
+
|
|
7
|
+
function _extends() {
|
|
8
|
+
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
|
9
|
+
for (var e = 1; e < arguments.length; e++) {
|
|
10
|
+
var t = arguments[e];
|
|
11
|
+
for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
|
|
12
|
+
}
|
|
13
|
+
return n;
|
|
14
|
+
}, _extends.apply(null, arguments);
|
|
15
|
+
}
|
|
6
16
|
|
|
7
|
-
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
8
17
|
const SelectorIdentifierMap = Object.freeze({
|
|
9
18
|
'#': 'id',
|
|
10
19
|
'.': 'className'
|
|
@@ -48,11 +57,11 @@ function WidgetWrapper({
|
|
|
48
57
|
children
|
|
49
58
|
}) {
|
|
50
59
|
const selector = selectorToAttribute(containerSelector);
|
|
51
|
-
return html ?
|
|
60
|
+
return html ? h("div", _extends({}, selector, {
|
|
52
61
|
dangerouslySetInnerHTML: {
|
|
53
62
|
__html: html
|
|
54
63
|
}
|
|
55
|
-
})) :
|
|
64
|
+
})) : h("div", selector, children);
|
|
56
65
|
}
|
|
57
66
|
var WidgetWrapper$1 = /*#__PURE__*/React.memo(WidgetWrapper);
|
|
58
67
|
|
|
@@ -389,7 +398,7 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
389
398
|
throw new Error(`The widgetProperties.containerSelector is not defined`);
|
|
390
399
|
}
|
|
391
400
|
const html = this._getWidgetHTML();
|
|
392
|
-
return
|
|
401
|
+
return h(Fragment, null, (!this._isClient() || this._isSSRHydrate()) && this._renderStyleAssets(), h(WidgetWrapper$1, {
|
|
393
402
|
containerSelector: widgetProperties.containerSelector,
|
|
394
403
|
html: html
|
|
395
404
|
}));
|
|
@@ -409,13 +418,13 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
409
418
|
return assets.filter(asset => ['stylesheet', 'inlineStyle'].includes(asset.type) && asset.source).map((asset, key) => {
|
|
410
419
|
switch (asset.type) {
|
|
411
420
|
case 'stylesheet':
|
|
412
|
-
return
|
|
421
|
+
return h("link", {
|
|
413
422
|
rel: "stylesheet",
|
|
414
423
|
href: asset.source,
|
|
415
424
|
key: key
|
|
416
425
|
});
|
|
417
426
|
case 'inlineStyle':
|
|
418
|
-
return
|
|
427
|
+
return h("style", {
|
|
419
428
|
key: key,
|
|
420
429
|
dangerouslySetInnerHTML: {
|
|
421
430
|
__html: asset.source
|
|
@@ -600,7 +609,7 @@ class MerkurSlot extends AbstractMerkurWidget {
|
|
|
600
609
|
*/
|
|
601
610
|
const isInitialSPARender = this._isClient() && !this._isSSRHydrate();
|
|
602
611
|
const html = isInitialSPARender ? '' : this._getWidgetHTML();
|
|
603
|
-
return
|
|
612
|
+
return h(WidgetWrapper$1, {
|
|
604
613
|
containerSelector: this.slot.containerSelector,
|
|
605
614
|
html: html
|
|
606
615
|
}, isInitialSPARender && this._renderFallback());
|
package/lib/index.es9.cjs
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var React = require('react');
|
|
4
3
|
var core = require('@merkur/core');
|
|
5
4
|
var integration = require('@merkur/integration');
|
|
5
|
+
var React = require('react');
|
|
6
6
|
function _extends() {
|
|
7
7
|
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
|
8
8
|
for (var e = 1; e < arguments.length; e++) {
|
|
@@ -55,11 +55,11 @@ function WidgetWrapper({
|
|
|
55
55
|
children
|
|
56
56
|
}) {
|
|
57
57
|
const selector = selectorToAttribute(containerSelector);
|
|
58
|
-
return html ?
|
|
58
|
+
return html ? h("div", _extends({}, selector, {
|
|
59
59
|
dangerouslySetInnerHTML: {
|
|
60
60
|
__html: html
|
|
61
61
|
}
|
|
62
|
-
})) :
|
|
62
|
+
})) : h("div", selector, children);
|
|
63
63
|
}
|
|
64
64
|
var WidgetWrapper$1 = /*#__PURE__*/React.memo(WidgetWrapper);
|
|
65
65
|
class AbstractMerkurWidget extends React.Component {
|
|
@@ -398,7 +398,7 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
398
398
|
throw new Error(`The widgetProperties.containerSelector is not defined`);
|
|
399
399
|
}
|
|
400
400
|
const html = this._getWidgetHTML();
|
|
401
|
-
return
|
|
401
|
+
return h(Fragment, null, (!this._isClient() || this._isSSRHydrate()) && this._renderStyleAssets(), h(WidgetWrapper$1, {
|
|
402
402
|
containerSelector: widgetProperties.containerSelector,
|
|
403
403
|
html: html
|
|
404
404
|
}));
|
|
@@ -418,13 +418,13 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
418
418
|
return assets.filter(asset => ['stylesheet', 'inlineStyle'].includes(asset.type) && asset.source).map((asset, key) => {
|
|
419
419
|
switch (asset.type) {
|
|
420
420
|
case 'stylesheet':
|
|
421
|
-
return
|
|
421
|
+
return h("link", {
|
|
422
422
|
rel: "stylesheet",
|
|
423
423
|
href: asset.source,
|
|
424
424
|
key: key
|
|
425
425
|
});
|
|
426
426
|
case 'inlineStyle':
|
|
427
|
-
return
|
|
427
|
+
return h("style", {
|
|
428
428
|
key: key,
|
|
429
429
|
dangerouslySetInnerHTML: {
|
|
430
430
|
__html: asset.source
|
|
@@ -611,7 +611,7 @@ class MerkurSlot extends AbstractMerkurWidget {
|
|
|
611
611
|
*/
|
|
612
612
|
const isInitialSPARender = this._isClient() && !this._isSSRHydrate();
|
|
613
613
|
const html = isInitialSPARender ? '' : this._getWidgetHTML();
|
|
614
|
-
return
|
|
614
|
+
return h(WidgetWrapper$1, {
|
|
615
615
|
containerSelector: this.slot.containerSelector,
|
|
616
616
|
html: html
|
|
617
617
|
}, isInitialSPARender && this._renderFallback());
|
package/lib/index.es9.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
1
|
import { getMerkur } from '@merkur/core';
|
|
3
2
|
import { loadStyleAssets, loadScriptAssets } from '@merkur/integration';
|
|
3
|
+
import React from 'react';
|
|
4
4
|
function _extends() {
|
|
5
5
|
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
|
6
6
|
for (var e = 1; e < arguments.length; e++) {
|
|
@@ -53,11 +53,11 @@ function WidgetWrapper({
|
|
|
53
53
|
children
|
|
54
54
|
}) {
|
|
55
55
|
const selector = selectorToAttribute(containerSelector);
|
|
56
|
-
return html ?
|
|
56
|
+
return html ? h("div", _extends({}, selector, {
|
|
57
57
|
dangerouslySetInnerHTML: {
|
|
58
58
|
__html: html
|
|
59
59
|
}
|
|
60
|
-
})) :
|
|
60
|
+
})) : h("div", selector, children);
|
|
61
61
|
}
|
|
62
62
|
var WidgetWrapper$1 = /*#__PURE__*/React.memo(WidgetWrapper);
|
|
63
63
|
class AbstractMerkurWidget extends React.Component {
|
|
@@ -396,7 +396,7 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
396
396
|
throw new Error(`The widgetProperties.containerSelector is not defined`);
|
|
397
397
|
}
|
|
398
398
|
const html = this._getWidgetHTML();
|
|
399
|
-
return
|
|
399
|
+
return h(Fragment, null, (!this._isClient() || this._isSSRHydrate()) && this._renderStyleAssets(), h(WidgetWrapper$1, {
|
|
400
400
|
containerSelector: widgetProperties.containerSelector,
|
|
401
401
|
html: html
|
|
402
402
|
}));
|
|
@@ -416,13 +416,13 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
416
416
|
return assets.filter(asset => ['stylesheet', 'inlineStyle'].includes(asset.type) && asset.source).map((asset, key) => {
|
|
417
417
|
switch (asset.type) {
|
|
418
418
|
case 'stylesheet':
|
|
419
|
-
return
|
|
419
|
+
return h("link", {
|
|
420
420
|
rel: "stylesheet",
|
|
421
421
|
href: asset.source,
|
|
422
422
|
key: key
|
|
423
423
|
});
|
|
424
424
|
case 'inlineStyle':
|
|
425
|
-
return
|
|
425
|
+
return h("style", {
|
|
426
426
|
key: key,
|
|
427
427
|
dangerouslySetInnerHTML: {
|
|
428
428
|
__html: asset.source
|
|
@@ -609,7 +609,7 @@ class MerkurSlot extends AbstractMerkurWidget {
|
|
|
609
609
|
*/
|
|
610
610
|
const isInitialSPARender = this._isClient() && !this._isSSRHydrate();
|
|
611
611
|
const html = isInitialSPARender ? '' : this._getWidgetHTML();
|
|
612
|
-
return
|
|
612
|
+
return h(WidgetWrapper$1, {
|
|
613
613
|
containerSelector: this.slot.containerSelector,
|
|
614
614
|
html: html
|
|
615
615
|
}, isInitialSPARender && this._renderFallback());
|
package/lib/index.js
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var React = require('react');
|
|
4
3
|
var core = require('@merkur/core');
|
|
5
4
|
var integration = require('@merkur/integration');
|
|
5
|
+
var React = require('react');
|
|
6
|
+
|
|
7
|
+
function _extends() {
|
|
8
|
+
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
|
9
|
+
for (var e = 1; e < arguments.length; e++) {
|
|
10
|
+
var t = arguments[e];
|
|
11
|
+
for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
|
|
12
|
+
}
|
|
13
|
+
return n;
|
|
14
|
+
}, _extends.apply(null, arguments);
|
|
15
|
+
}
|
|
6
16
|
|
|
7
|
-
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
8
17
|
const SelectorIdentifierMap = Object.freeze({
|
|
9
18
|
'#': 'id',
|
|
10
19
|
'.': 'className'
|
|
@@ -48,11 +57,11 @@ function WidgetWrapper({
|
|
|
48
57
|
children
|
|
49
58
|
}) {
|
|
50
59
|
const selector = selectorToAttribute(containerSelector);
|
|
51
|
-
return html ?
|
|
60
|
+
return html ? h("div", _extends({}, selector, {
|
|
52
61
|
dangerouslySetInnerHTML: {
|
|
53
62
|
__html: html
|
|
54
63
|
}
|
|
55
|
-
})) :
|
|
64
|
+
})) : h("div", selector, children);
|
|
56
65
|
}
|
|
57
66
|
var WidgetWrapper$1 = /*#__PURE__*/React.memo(WidgetWrapper);
|
|
58
67
|
|
|
@@ -389,7 +398,7 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
389
398
|
throw new Error(`The widgetProperties.containerSelector is not defined`);
|
|
390
399
|
}
|
|
391
400
|
const html = this._getWidgetHTML();
|
|
392
|
-
return
|
|
401
|
+
return h(Fragment, null, (!this._isClient() || this._isSSRHydrate()) && this._renderStyleAssets(), h(WidgetWrapper$1, {
|
|
393
402
|
containerSelector: widgetProperties.containerSelector,
|
|
394
403
|
html: html
|
|
395
404
|
}));
|
|
@@ -409,13 +418,13 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
409
418
|
return assets.filter(asset => ['stylesheet', 'inlineStyle'].includes(asset.type) && asset.source).map((asset, key) => {
|
|
410
419
|
switch (asset.type) {
|
|
411
420
|
case 'stylesheet':
|
|
412
|
-
return
|
|
421
|
+
return h("link", {
|
|
413
422
|
rel: "stylesheet",
|
|
414
423
|
href: asset.source,
|
|
415
424
|
key: key
|
|
416
425
|
});
|
|
417
426
|
case 'inlineStyle':
|
|
418
|
-
return
|
|
427
|
+
return h("style", {
|
|
419
428
|
key: key,
|
|
420
429
|
dangerouslySetInnerHTML: {
|
|
421
430
|
__html: asset.source
|
|
@@ -600,7 +609,7 @@ class MerkurSlot extends AbstractMerkurWidget {
|
|
|
600
609
|
*/
|
|
601
610
|
const isInitialSPARender = this._isClient() && !this._isSSRHydrate();
|
|
602
611
|
const html = isInitialSPARender ? '' : this._getWidgetHTML();
|
|
603
|
-
return
|
|
612
|
+
return h(WidgetWrapper$1, {
|
|
604
613
|
containerSelector: this.slot.containerSelector,
|
|
605
614
|
html: html
|
|
606
615
|
}, isInitialSPARender && this._renderFallback());
|
package/lib/index.mjs
CHANGED
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
1
|
import { getMerkur } from '@merkur/core';
|
|
3
2
|
import { loadStyleAssets, loadScriptAssets } from '@merkur/integration';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
|
|
5
|
+
function _extends() {
|
|
6
|
+
return _extends = Object.assign ? Object.assign.bind() : function (n) {
|
|
7
|
+
for (var e = 1; e < arguments.length; e++) {
|
|
8
|
+
var t = arguments[e];
|
|
9
|
+
for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
|
|
10
|
+
}
|
|
11
|
+
return n;
|
|
12
|
+
}, _extends.apply(null, arguments);
|
|
13
|
+
}
|
|
4
14
|
|
|
5
|
-
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
6
15
|
const SelectorIdentifierMap = Object.freeze({
|
|
7
16
|
'#': 'id',
|
|
8
17
|
'.': 'className'
|
|
@@ -46,11 +55,11 @@ function WidgetWrapper({
|
|
|
46
55
|
children
|
|
47
56
|
}) {
|
|
48
57
|
const selector = selectorToAttribute(containerSelector);
|
|
49
|
-
return html ?
|
|
58
|
+
return html ? h("div", _extends({}, selector, {
|
|
50
59
|
dangerouslySetInnerHTML: {
|
|
51
60
|
__html: html
|
|
52
61
|
}
|
|
53
|
-
})) :
|
|
62
|
+
})) : h("div", selector, children);
|
|
54
63
|
}
|
|
55
64
|
var WidgetWrapper$1 = /*#__PURE__*/React.memo(WidgetWrapper);
|
|
56
65
|
|
|
@@ -387,7 +396,7 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
387
396
|
throw new Error(`The widgetProperties.containerSelector is not defined`);
|
|
388
397
|
}
|
|
389
398
|
const html = this._getWidgetHTML();
|
|
390
|
-
return
|
|
399
|
+
return h(Fragment, null, (!this._isClient() || this._isSSRHydrate()) && this._renderStyleAssets(), h(WidgetWrapper$1, {
|
|
391
400
|
containerSelector: widgetProperties.containerSelector,
|
|
392
401
|
html: html
|
|
393
402
|
}));
|
|
@@ -407,13 +416,13 @@ class MerkurWidget extends AbstractMerkurWidget {
|
|
|
407
416
|
return assets.filter(asset => ['stylesheet', 'inlineStyle'].includes(asset.type) && asset.source).map((asset, key) => {
|
|
408
417
|
switch (asset.type) {
|
|
409
418
|
case 'stylesheet':
|
|
410
|
-
return
|
|
419
|
+
return h("link", {
|
|
411
420
|
rel: "stylesheet",
|
|
412
421
|
href: asset.source,
|
|
413
422
|
key: key
|
|
414
423
|
});
|
|
415
424
|
case 'inlineStyle':
|
|
416
|
-
return
|
|
425
|
+
return h("style", {
|
|
417
426
|
key: key,
|
|
418
427
|
dangerouslySetInnerHTML: {
|
|
419
428
|
__html: asset.source
|
|
@@ -598,7 +607,7 @@ class MerkurSlot extends AbstractMerkurWidget {
|
|
|
598
607
|
*/
|
|
599
608
|
const isInitialSPARender = this._isClient() && !this._isSSRHydrate();
|
|
600
609
|
const html = isInitialSPARender ? '' : this._getWidgetHTML();
|
|
601
|
-
return
|
|
610
|
+
return h(WidgetWrapper$1, {
|
|
602
611
|
containerSelector: this.slot.containerSelector,
|
|
603
612
|
html: html
|
|
604
613
|
}, isInitialSPARender && this._renderFallback());
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@merkur/integration-react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.39.0",
|
|
4
4
|
"description": "Merkur module for easy integration with react.",
|
|
5
5
|
"main": "lib/index",
|
|
6
6
|
"module": "lib/index",
|
|
@@ -23,8 +23,7 @@
|
|
|
23
23
|
"preversion": "npm test",
|
|
24
24
|
"test": "jest --no-watchman -c ./jest.config.js",
|
|
25
25
|
"test:es:version": "es-check es11 ./lib/index.mjs --module && es-check es9 ./lib/index.es9.mjs --module && es-check es9 ./lib/index.es9.cjs --module",
|
|
26
|
-
"build": "rollup -c rollup.config.mjs"
|
|
27
|
-
"prepare": "npm run build"
|
|
26
|
+
"build": "rollup -c rollup.config.mjs"
|
|
28
27
|
},
|
|
29
28
|
"repository": {
|
|
30
29
|
"type": "git",
|
|
@@ -47,9 +46,9 @@
|
|
|
47
46
|
"homepage": "https://merkur.js.org/",
|
|
48
47
|
"devDependencies": {
|
|
49
48
|
"@babel/preset-react": "^7.18.6",
|
|
50
|
-
"@merkur/core": "^0.
|
|
51
|
-
"@merkur/plugin-component": "^0.
|
|
52
|
-
"@merkur/plugin-event-emitter": "^0.
|
|
49
|
+
"@merkur/core": "^0.39.0",
|
|
50
|
+
"@merkur/plugin-component": "^0.39.0",
|
|
51
|
+
"@merkur/plugin-event-emitter": "^0.39.0",
|
|
53
52
|
"@rollup/plugin-commonjs": "^25.0.0",
|
|
54
53
|
"@rollup/plugin-replace": "^5.0.2",
|
|
55
54
|
"cheerio": "1.0.0-rc.12",
|
|
@@ -65,7 +64,7 @@
|
|
|
65
64
|
"react-dom": ">=16"
|
|
66
65
|
},
|
|
67
66
|
"dependencies": {
|
|
68
|
-
"@merkur/integration": "^0.
|
|
67
|
+
"@merkur/integration": "^0.39.0"
|
|
69
68
|
},
|
|
70
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "8ad2c8b26246850ce6289502a8b05e882f80ce31"
|
|
71
70
|
}
|