Skip to content

Commit 3077471

Browse files
committed
fix: esbuild -> rollup
1 parent c753710 commit 3077471

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

wiki/public/build.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
{
22
"wiki/css/wiki.css": ["public/scss/wiki.scss"],
3-
"wiki/js/wiki.min.js": ["www/editu.js"]
3+
"wiki/css/edit_wiki.css": ["public/scss/edit_wiki.scss"],
4+
"wiki/css/contributions.css": ["public/scss/contributions.scss"],
5+
"wiki/js/wiki.min.js": [
6+
"public/js/wiki.js",
7+
"public/js/edit_asset.js",
8+
"public/js/edit_wiki.js",
9+
"public/js/render_wiki.js"
10+
]
411
}

wiki/wiki/doctype/wiki_page/templates/edit.html

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,21 @@ <h4>Edited Sidebar</h3>
9595
<!-- js should be loaded in body! -->
9696
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
9797
<script src="https://unpkg.com/turndown@7.0.0/dist/turndown.js"></script>
98-
{{ include_script('libs.bundle.js') }}
98+
<script type="text/javascript" src="/assets/js/libs.min.js"></script>
9999

100-
{{ include_script('frappe-web.bundle.js') }}
101-
{{ include_script('controls.bundle.js') }}
102-
{{ include_script('dialog.bundle.js') }}
103-
{{ include_script('bootstrap-4-web.bundle.js') }}
100+
<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
101+
102+
<script type="text/javascript" src="/assets/js/control.min.js"></script>
103+
<script type="text/javascript" src="/assets/js/dialog.min.js"></script>
104+
<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
104105
<script type="text/javascript" src="/assets/frappe/node_modules/moment/min/moment-with-locales.min.js"></script>
105106
<script type="text/javascript"
106107
src="/assets/frappe/node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
107-
{{ include_script('desk.bundle.js') }}
108-
{{ include_script('wiki.bundle.js') }}
108+
<script type="text/javascript" src="/assets/js/moment-bundle.min.js"></script>
109+
110+
<script type="text/javascript" src="/assets/js/desk.min.js"></script>
111+
112+
<script type="text/javascript" src="/assets/wiki/js/wiki.min.js"></script>
109113

110114

111115
<script type="text/javascript" src="/assets/frappe/node_modules/vue/dist/vue.js"></script>

wiki/wiki/doctype/wiki_page/templates/show.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1 class="m-0">{{ title }}</h1>
2929
</div>
3030

3131
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
32-
{{ include_script('wiki.bundle.js') }}
32+
<script type="text/javascript" src="/assets/wiki/js/wiki.min.js"></script>
3333

3434
<script>
3535
new RenderWiki();

wiki/wiki/doctype/wiki_page/templates/wiki_page.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
{%- block head_include %}
77
{{ super() }}
8-
{{ include_style('wiki.bundle.css') }}
8+
<link rel="stylesheet" href="/assets/wiki/css/wiki.css">
9+
910
{%- if frappe.form_dict.edit or frappe.form_dict.new -%}
10-
{{ include_style('edit_wiki.bundle.css') }}
11+
<link rel="stylesheet" href="/assets/wiki/css/edit_wiki.css">
12+
1113
{%- endif -%}
1214

1315
{% endblock -%}

wiki/www/compare.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{%- block head_include %}
44
{{ super() }}
5-
{{ include_style('wiki.bundle.css') }}
5+
<link rel="stylesheet" href="/assets/wiki/css/wiki.css">
66
{% endblock -%}
77

88
{% block page_content %}

wiki/www/contributions.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
{%- block head_include %}
44
{{ super() }}
5-
{{ include_style('wiki.bundle.css') }}
5+
<link rel="stylesheet" href="/assets/wiki/css/wiki.css">
66

7-
{{ include_style('contributions.bundle.css') }}
7+
<link rel="stylesheet" href="/assets/wiki/css/contributions.css">
88

99
{% endblock -%}
1010

@@ -63,8 +63,8 @@
6363
{% block base_scripts %}
6464
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
6565

66-
{{ include_script("frappe-web.bundle.js") }}
67-
{{ include_script('bootstrap-4-web.bundle.js') }}
66+
<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
67+
<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
6868

6969
<script>
7070
frappe.ready(

wiki/www/revisions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{%- block head_include %}
55
{{ super() }}
6-
{{ include_style('wiki.bundle.css') }}
6+
<link rel="stylesheet" href="/assets/wiki/css/wiki.css">
77
{% endblock -%}
88

99
{% block page_content %}

0 commit comments

Comments
 (0)