diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index f240a7d2af..4b999631a7 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -18,7 +18,6 @@ from frappe.website.router import resolve_route from frappe.website.utils import (extract_title, find_first_image, get_comment_list, get_html_content_based_on_type) from frappe.website.website_generator import WebsiteGenerator -from frappe.website.doctype.web_template.web_template import get_rendered_template class WebPage(WebsiteGenerator): diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index 86b41d48e6..52ebe96f2c 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -33,11 +33,8 @@ class TestWebTemplate(unittest.TestCase): self.assertTrue("/test" == button.attrs["href"]) def test_web_page_with_page_builder(self): - if frappe.db.exists("Web Page", "test-page"): - frappe.delete_doc("Web Page", "test-page") - if not frappe.db.exists("Web Page", "test-page"): - webpage = frappe.get_doc( + frappe.get_doc( { "doctype": "Web Page", "title": "test-page", @@ -90,6 +87,8 @@ class TestWebTemplate(unittest.TestCase): self.assertEqual(sections[0].find("p").text, "test lorem ipsum") self.assertEqual(len(sections[1].find_all("a")), 3) + frappe.db.delete_doc("Web Page", "test-page") + def test_tailwind_styles_in_developer_mode(self): self.create_tailwind_theme() diff --git a/frappe/website/doctype/web_template_field/web_template_field.py b/frappe/website/doctype/web_template_field/web_template_field.py index 80019c2222..8c25b619b6 100644 --- a/frappe/website/doctype/web_template_field/web_template_field.py +++ b/frappe/website/doctype/web_template_field/web_template_field.py @@ -3,7 +3,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +# import frappe from frappe.model.document import Document class WebTemplateField(Document): diff --git a/purgecss.js b/purgecss.js index 86d5794244..6cd1f013c2 100644 --- a/purgecss.js +++ b/purgecss.js @@ -15,9 +15,9 @@ new PurgeCSS() extension: 'html' } ], - css: css_file_paths, - defaultExtractor: content => content.match(/[\w-/:]+(? content.match(/[\w-/:]+(? { - console.log(result[0].css); + console.log(result[0].css); // eslint-disable-line }); diff --git a/rollup/config.js b/rollup/config.js index 24ba819bf0..50e8f33061 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -147,7 +147,7 @@ function get_rollup_options_for_css(output_file, input_files) { inputOptions: { input: input_files, plugins: plugins, - onwarn(warning, warn) { + onwarn(warning) { // skip warnings if (['EMPTY_BUNDLE'].includes(warning.code)) return;