@merkur/uhtml 0.37.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.
Files changed (8) hide show
  1. package/README.md +1 -1
  2. package/lib/client/client.cjs +64 -48
  3. package/lib/client/client.js +64 -48
  4. package/lib/client/client.mjs +65 -49
  5. package/lib/server/server.cjs +45 -37
  6. package/lib/server/server.js +45 -37
  7. package/lib/server/server.mjs +45 -37
  8. package/package.json +3 -4
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-illustration.png" width="100px" height="100px" alt="Merkur illustration"/>
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/client/client.cjs CHANGED
@@ -7,54 +7,70 @@ var helpers = require('@merkur/plugin-component/helpers');
7
7
  /**
8
8
  * Client Factory for creating merkur widgets with uhtml renderer.
9
9
  */
10
- function createUHtmlWidget({ name, version, $dependencies, viewFactory, ...restProps }) {
11
- const widgetFactory = async (widgetParams) => core.createMerkurWidget({
12
- ...restProps,
13
- ...widgetParams,
14
- $dependencies: {
15
- ...$dependencies,
16
- render: uhtml.render,
17
- html: uhtml.html,
18
- },
19
- async mount(widget) {
20
- await helpers.mapViews(widget, viewFactory, ({ View, ErrorView, container, ...rest }) => {
21
- if (!container) {
22
- return;
23
- }
24
- const { render } = widget.$dependencies;
25
- // @ts-expect-error the @merkur/plugin-error is optional
26
- if (widget?.error?.status) {
27
- return ErrorView
28
- ? render(container, ErrorView(widget))
29
- : render(container, '');
30
- }
31
- return render(container, View(widget));
32
- });
33
- },
34
- async update(widget) {
35
- await helpers.mapViews(widget, viewFactory, ({ View, container }) => {
36
- if (!container) {
37
- return;
38
- }
39
- widget.$dependencies.render(container, View(widget));
40
- });
41
- },
42
- async unmount(widget) {
43
- await helpers.mapViews(widget, viewFactory, ({ container }) => {
44
- if (!container) {
45
- return;
46
- }
47
- widget.$dependencies.render(container, widget.$dependencies.html ``);
48
- });
49
- },
50
- });
51
- // Register widget factory on client
52
- core.createMerkur().register({
53
- name,
54
- version,
55
- createWidget: widgetFactory,
56
- });
57
- return widgetFactory;
10
+ function createUHtmlWidget({
11
+ name,
12
+ version,
13
+ $dependencies,
14
+ viewFactory,
15
+ ...restProps
16
+ }) {
17
+ const widgetFactory = async widgetParams => core.createMerkurWidget({
18
+ ...restProps,
19
+ ...widgetParams,
20
+ $dependencies: {
21
+ ...$dependencies,
22
+ render: uhtml.render,
23
+ html: uhtml.html
24
+ },
25
+ async mount(widget) {
26
+ await helpers.mapViews(widget, viewFactory, ({
27
+ View,
28
+ ErrorView,
29
+ container,
30
+ ...rest
31
+ }) => {
32
+ if (!container) {
33
+ return;
34
+ }
35
+ const {
36
+ render
37
+ } = widget.$dependencies;
38
+ // @ts-expect-error the @merkur/plugin-error is optional
39
+ if (widget?.error?.status) {
40
+ return ErrorView ? render(container, ErrorView(widget)) : render(container, '');
41
+ }
42
+ return render(container, View(widget));
43
+ });
44
+ },
45
+ async update(widget) {
46
+ await helpers.mapViews(widget, viewFactory, ({
47
+ View,
48
+ container
49
+ }) => {
50
+ if (!container) {
51
+ return;
52
+ }
53
+ widget.$dependencies.render(container, View(widget));
54
+ });
55
+ },
56
+ async unmount(widget) {
57
+ await helpers.mapViews(widget, viewFactory, ({
58
+ container
59
+ }) => {
60
+ if (!container) {
61
+ return;
62
+ }
63
+ widget.$dependencies.render(container, widget.$dependencies.html``);
64
+ });
65
+ }
66
+ });
67
+ // Register widget factory on client
68
+ core.createMerkur().register({
69
+ name,
70
+ version,
71
+ createWidget: widgetFactory
72
+ });
73
+ return widgetFactory;
58
74
  }
59
75
 
60
76
  exports.createUHtmlWidget = createUHtmlWidget;
package/lib/client/client.js CHANGED
@@ -7,54 +7,70 @@ var helpers = require('@merkur/plugin-component/helpers');
7
7
  /**
8
8
  * Client Factory for creating merkur widgets with uhtml renderer.
9
9
  */
10
- function createUHtmlWidget({ name, version, $dependencies, viewFactory, ...restProps }) {
11
- const widgetFactory = async (widgetParams) => core.createMerkurWidget({
12
- ...restProps,
13
- ...widgetParams,
14
- $dependencies: {
15
- ...$dependencies,
16
- render: uhtml.render,
17
- html: uhtml.html,
18
- },
19
- async mount(widget) {
20
- await helpers.mapViews(widget, viewFactory, ({ View, ErrorView, container, ...rest }) => {
21
- if (!container) {
22
- return;
23
- }
24
- const { render } = widget.$dependencies;
25
- // @ts-expect-error the @merkur/plugin-error is optional
26
- if (widget?.error?.status) {
27
- return ErrorView
28
- ? render(container, ErrorView(widget))
29
- : render(container, '');
30
- }
31
- return render(container, View(widget));
32
- });
33
- },
34
- async update(widget) {
35
- await helpers.mapViews(widget, viewFactory, ({ View, container }) => {
36
- if (!container) {
37
- return;
38
- }
39
- widget.$dependencies.render(container, View(widget));
40
- });
41
- },
42
- async unmount(widget) {
43
- await helpers.mapViews(widget, viewFactory, ({ container }) => {
44
- if (!container) {
45
- return;
46
- }
47
- widget.$dependencies.render(container, widget.$dependencies.html ``);
48
- });
49
- },
50
- });
51
- // Register widget factory on client
52
- core.createMerkur().register({
53
- name,
54
- version,
55
- createWidget: widgetFactory,
56
- });
57
- return widgetFactory;
10
+ function createUHtmlWidget({
11
+ name,
12
+ version,
13
+ $dependencies,
14
+ viewFactory,
15
+ ...restProps
16
+ }) {
17
+ const widgetFactory = async widgetParams => core.createMerkurWidget({
18
+ ...restProps,
19
+ ...widgetParams,
20
+ $dependencies: {
21
+ ...$dependencies,
22
+ render: uhtml.render,
23
+ html: uhtml.html
24
+ },
25
+ async mount(widget) {
26
+ await helpers.mapViews(widget, viewFactory, ({
27
+ View,
28
+ ErrorView,
29
+ container,
30
+ ...rest
31
+ }) => {
32
+ if (!container) {
33
+ return;
34
+ }
35
+ const {
36
+ render
37
+ } = widget.$dependencies;
38
+ // @ts-expect-error the @merkur/plugin-error is optional
39
+ if (widget?.error?.status) {
40
+ return ErrorView ? render(container, ErrorView(widget)) : render(container, '');
41
+ }
42
+ return render(container, View(widget));
43
+ });
44
+ },
45
+ async update(widget) {
46
+ await helpers.mapViews(widget, viewFactory, ({
47
+ View,
48
+ container
49
+ }) => {
50
+ if (!container) {
51
+ return;
52
+ }
53
+ widget.$dependencies.render(container, View(widget));
54
+ });
55
+ },
56
+ async unmount(widget) {
57
+ await helpers.mapViews(widget, viewFactory, ({
58
+ container
59
+ }) => {
60
+ if (!container) {
61
+ return;
62
+ }
63
+ widget.$dependencies.render(container, widget.$dependencies.html``);
64
+ });
65
+ }
66
+ });
67
+ // Register widget factory on client
68
+ core.createMerkur().register({
69
+ name,
70
+ version,
71
+ createWidget: widgetFactory
72
+ });
73
+ return widgetFactory;
58
74
  }
59
75
 
60
76
  exports.createUHtmlWidget = createUHtmlWidget;
package/lib/client/client.mjs CHANGED
@@ -1,58 +1,74 @@
1
- import { render, html } from 'uhtml';
1
+ import { html, render } from 'uhtml';
2
2
  import { createMerkur, createMerkurWidget } from '@merkur/core';
3
3
  import { mapViews } from '@merkur/plugin-component/helpers';
4
4
 
5
5
  /**
6
6
  * Client Factory for creating merkur widgets with uhtml renderer.
7
7
  */
8
- function createUHtmlWidget({ name, version, $dependencies, viewFactory, ...restProps }) {
9
- const widgetFactory = async (widgetParams) => createMerkurWidget({
10
- ...restProps,
11
- ...widgetParams,
12
- $dependencies: {
13
- ...$dependencies,
14
- render,
15
- html,
16
- },
17
- async mount(widget) {
18
- await mapViews(widget, viewFactory, ({ View, ErrorView, container, ...rest }) => {
19
- if (!container) {
20
- return;
21
- }
22
- const { render } = widget.$dependencies;
23
- // @ts-expect-error the @merkur/plugin-error is optional
24
- if (widget?.error?.status) {
25
- return ErrorView
26
- ? render(container, ErrorView(widget))
27
- : render(container, '');
28
- }
29
- return render(container, View(widget));
30
- });
31
- },
32
- async update(widget) {
33
- await mapViews(widget, viewFactory, ({ View, container }) => {
34
- if (!container) {
35
- return;
36
- }
37
- widget.$dependencies.render(container, View(widget));
38
- });
39
- },
40
- async unmount(widget) {
41
- await mapViews(widget, viewFactory, ({ container }) => {
42
- if (!container) {
43
- return;
44
- }
45
- widget.$dependencies.render(container, widget.$dependencies.html ``);
46
- });
47
- },
48
- });
49
- // Register widget factory on client
50
- createMerkur().register({
51
- name,
52
- version,
53
- createWidget: widgetFactory,
54
- });
55
- return widgetFactory;
8
+ function createUHtmlWidget({
9
+ name,
10
+ version,
11
+ $dependencies,
12
+ viewFactory,
13
+ ...restProps
14
+ }) {
15
+ const widgetFactory = async widgetParams => createMerkurWidget({
16
+ ...restProps,
17
+ ...widgetParams,
18
+ $dependencies: {
19
+ ...$dependencies,
20
+ render,
21
+ html
22
+ },
23
+ async mount(widget) {
24
+ await mapViews(widget, viewFactory, ({
25
+ View,
26
+ ErrorView,
27
+ container,
28
+ ...rest
29
+ }) => {
30
+ if (!container) {
31
+ return;
32
+ }
33
+ const {
34
+ render
35
+ } = widget.$dependencies;
36
+ // @ts-expect-error the @merkur/plugin-error is optional
37
+ if (widget?.error?.status) {
38
+ return ErrorView ? render(container, ErrorView(widget)) : render(container, '');
39
+ }
40
+ return render(container, View(widget));
41
+ });
42
+ },
43
+ async update(widget) {
44
+ await mapViews(widget, viewFactory, ({
45
+ View,
46
+ container
47
+ }) => {
48
+ if (!container) {
49
+ return;
50
+ }
51
+ widget.$dependencies.render(container, View(widget));
52
+ });
53
+ },
54
+ async unmount(widget) {
55
+ await mapViews(widget, viewFactory, ({
56
+ container
57
+ }) => {
58
+ if (!container) {
59
+ return;
60
+ }
61
+ widget.$dependencies.render(container, widget.$dependencies.html``);
62
+ });
63
+ }
64
+ });
65
+ // Register widget factory on client
66
+ createMerkur().register({
67
+ name,
68
+ version,
69
+ createWidget: widgetFactory
70
+ });
71
+ return widgetFactory;
56
72
  }
57
73
 
58
74
  export { createUHtmlWidget };
package/lib/server/server.cjs CHANGED
@@ -6,43 +6,51 @@ var core = require('@merkur/core');
6
6
  /**
7
7
  * Server Factory for creating merkur widgets with uhtml renderer.
8
8
  */
9
- function createUHtmlWidget({ viewFactory, $dependencies, ...restProps }) {
10
- return (widgetParams) => core.createMerkurWidget({
11
- ...restProps,
12
- ...widgetParams,
13
- $dependencies: {
14
- ...$dependencies,
15
- html: ucontent.html,
16
- },
17
- async mount(widget) {
18
- const { View: MainView, ErrorView, slot = {}, } = await viewFactory(widget);
19
- /**
20
- * Wrapper around $dependencies.render function which
21
- * handles connection to ErrorView and error plugin when defined.
22
- */
23
- const renderView = (View) => {
24
- // @ts-expect-error the @merkur/plugin-error is optional
25
- if (widget?.error?.status && ErrorView) {
26
- return ErrorView(widget);
27
- }
28
- // @ts-expect-error the @merkur/plugin-error is optional
29
- if (widget?.error?.status) {
30
- return null;
31
- }
32
- return View(widget);
33
- };
34
- return {
35
- html: renderView(MainView),
36
- slot: Object.keys(slot).reduce((acc, cur) => {
37
- acc[cur] = {
38
- name: slot[cur].name,
39
- html: renderView(slot[cur].View),
40
- };
41
- return acc;
42
- }, {}),
43
- };
44
- },
45
- });
9
+ function createUHtmlWidget({
10
+ viewFactory,
11
+ $dependencies,
12
+ ...restProps
13
+ }) {
14
+ return widgetParams => core.createMerkurWidget({
15
+ ...restProps,
16
+ ...widgetParams,
17
+ $dependencies: {
18
+ ...$dependencies,
19
+ html: ucontent.html
20
+ },
21
+ async mount(widget) {
22
+ const {
23
+ View: MainView,
24
+ ErrorView,
25
+ slot = {}
26
+ } = await viewFactory(widget);
27
+ /**
28
+ * Wrapper around $dependencies.render function which
29
+ * handles connection to ErrorView and error plugin when defined.
30
+ */
31
+ const renderView = View => {
32
+ // @ts-expect-error the @merkur/plugin-error is optional
33
+ if (widget?.error?.status && ErrorView) {
34
+ return ErrorView(widget);
35
+ }
36
+ // @ts-expect-error the @merkur/plugin-error is optional
37
+ if (widget?.error?.status) {
38
+ return null;
39
+ }
40
+ return View(widget);
41
+ };
42
+ return {
43
+ html: renderView(MainView),
44
+ slot: Object.keys(slot).reduce((acc, cur) => {
45
+ acc[cur] = {
46
+ name: slot[cur].name,
47
+ html: renderView(slot[cur].View)
48
+ };
49
+ return acc;
50
+ }, {})
51
+ };
52
+ }
53
+ });
46
54
  }
47
55
 
48
56
  exports.createUHtmlWidget = createUHtmlWidget;
package/lib/server/server.js CHANGED
@@ -6,43 +6,51 @@ var core = require('@merkur/core');
6
6
  /**
7
7
  * Server Factory for creating merkur widgets with uhtml renderer.
8
8
  */
9
- function createUHtmlWidget({ viewFactory, $dependencies, ...restProps }) {
10
- return (widgetParams) => core.createMerkurWidget({
11
- ...restProps,
12
- ...widgetParams,
13
- $dependencies: {
14
- ...$dependencies,
15
- html: ucontent.html,
16
- },
17
- async mount(widget) {
18
- const { View: MainView, ErrorView, slot = {}, } = await viewFactory(widget);
19
- /**
20
- * Wrapper around $dependencies.render function which
21
- * handles connection to ErrorView and error plugin when defined.
22
- */
23
- const renderView = (View) => {
24
- // @ts-expect-error the @merkur/plugin-error is optional
25
- if (widget?.error?.status && ErrorView) {
26
- return ErrorView(widget);
27
- }
28
- // @ts-expect-error the @merkur/plugin-error is optional
29
- if (widget?.error?.status) {
30
- return null;
31
- }
32
- return View(widget);
33
- };
34
- return {
35
- html: renderView(MainView),
36
- slot: Object.keys(slot).reduce((acc, cur) => {
37
- acc[cur] = {
38
- name: slot[cur].name,
39
- html: renderView(slot[cur].View),
40
- };
41
- return acc;
42
- }, {}),
43
- };
44
- },
45
- });
9
+ function createUHtmlWidget({
10
+ viewFactory,
11
+ $dependencies,
12
+ ...restProps
13
+ }) {
14
+ return widgetParams => core.createMerkurWidget({
15
+ ...restProps,
16
+ ...widgetParams,
17
+ $dependencies: {
18
+ ...$dependencies,
19
+ html: ucontent.html
20
+ },
21
+ async mount(widget) {
22
+ const {
23
+ View: MainView,
24
+ ErrorView,
25
+ slot = {}
26
+ } = await viewFactory(widget);
27
+ /**
28
+ * Wrapper around $dependencies.render function which
29
+ * handles connection to ErrorView and error plugin when defined.
30
+ */
31
+ const renderView = View => {
32
+ // @ts-expect-error the @merkur/plugin-error is optional
33
+ if (widget?.error?.status && ErrorView) {
34
+ return ErrorView(widget);
35
+ }
36
+ // @ts-expect-error the @merkur/plugin-error is optional
37
+ if (widget?.error?.status) {
38
+ return null;
39
+ }
40
+ return View(widget);
41
+ };
42
+ return {
43
+ html: renderView(MainView),
44
+ slot: Object.keys(slot).reduce((acc, cur) => {
45
+ acc[cur] = {
46
+ name: slot[cur].name,
47
+ html: renderView(slot[cur].View)
48
+ };
49
+ return acc;
50
+ }, {})
51
+ };
52
+ }
53
+ });
46
54
  }
47
55
 
48
56
  exports.createUHtmlWidget = createUHtmlWidget;
package/lib/server/server.mjs CHANGED
@@ -4,43 +4,51 @@ import { createMerkurWidget } from '@merkur/core';
4
4
  /**
5
5
  * Server Factory for creating merkur widgets with uhtml renderer.
6
6
  */
7
- function createUHtmlWidget({ viewFactory, $dependencies, ...restProps }) {
8
- return (widgetParams) => createMerkurWidget({
9
- ...restProps,
10
- ...widgetParams,
11
- $dependencies: {
12
- ...$dependencies,
13
- html,
14
- },
15
- async mount(widget) {
16
- const { View: MainView, ErrorView, slot = {}, } = await viewFactory(widget);
17
- /**
18
- * Wrapper around $dependencies.render function which
19
- * handles connection to ErrorView and error plugin when defined.
20
- */
21
- const renderView = (View) => {
22
- // @ts-expect-error the @merkur/plugin-error is optional
23
- if (widget?.error?.status && ErrorView) {
24
- return ErrorView(widget);
25
- }
26
- // @ts-expect-error the @merkur/plugin-error is optional
27
- if (widget?.error?.status) {
28
- return null;
29
- }
30
- return View(widget);
31
- };
32
- return {
33
- html: renderView(MainView),
34
- slot: Object.keys(slot).reduce((acc, cur) => {
35
- acc[cur] = {
36
- name: slot[cur].name,
37
- html: renderView(slot[cur].View),
38
- };
39
- return acc;
40
- }, {}),
41
- };
42
- },
43
- });
7
+ function createUHtmlWidget({
8
+ viewFactory,
9
+ $dependencies,
10
+ ...restProps
11
+ }) {
12
+ return widgetParams => createMerkurWidget({
13
+ ...restProps,
14
+ ...widgetParams,
15
+ $dependencies: {
16
+ ...$dependencies,
17
+ html
18
+ },
19
+ async mount(widget) {
20
+ const {
21
+ View: MainView,
22
+ ErrorView,
23
+ slot = {}
24
+ } = await viewFactory(widget);
25
+ /**
26
+ * Wrapper around $dependencies.render function which
27
+ * handles connection to ErrorView and error plugin when defined.
28
+ */
29
+ const renderView = View => {
30
+ // @ts-expect-error the @merkur/plugin-error is optional
31
+ if (widget?.error?.status && ErrorView) {
32
+ return ErrorView(widget);
33
+ }
34
+ // @ts-expect-error the @merkur/plugin-error is optional
35
+ if (widget?.error?.status) {
36
+ return null;
37
+ }
38
+ return View(widget);
39
+ };
40
+ return {
41
+ html: renderView(MainView),
42
+ slot: Object.keys(slot).reduce((acc, cur) => {
43
+ acc[cur] = {
44
+ name: slot[cur].name,
45
+ html: renderView(slot[cur].View)
46
+ };
47
+ return acc;
48
+ }, {})
49
+ };
50
+ }
51
+ });
44
52
  }
45
53
 
46
54
  export { createUHtmlWidget };
package/package.json CHANGED
@@ -1,12 +1,11 @@
1
1
  {
2
2
  "name": "@merkur/uhtml",
3
- "version": "0.37.0",
3
+ "version": "0.39.0",
4
4
  "description": "Collection of helpers to aid with Svelte integration to @merkur",
5
5
  "scripts": {
6
6
  "test": "echo 'Tests pass.'",
7
7
  "test:es:version": "echo 'Tests pass.'",
8
8
  "build": "rollup -c rollup.config.mjs",
9
- "prepare": "npm run build",
10
9
  "dev": "rollup -c rollup.config.mjs -w"
11
10
  },
12
11
  "exports": {
@@ -51,7 +50,7 @@
51
50
  },
52
51
  "dependencies": {
53
52
  "ucontent": "^2.0.0",
54
- "uhtml": "^3.2.2"
53
+ "uhtml": "^4.7.1"
55
54
  },
56
- "gitHead": "af826493e5ed4b37602dd43ce89a59baeeb1bada"
55
+ "gitHead": "8ad2c8b26246850ce6289502a8b05e882f80ce31"
57
56
  }