صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
root
/
nicegui
mirrorاز https://github.com/zauberzeug/nicegui.git
1
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

Merge pull request #1291 from DaelonSuzuka/vue_developer_mode

Implement prod/dev mode for Vue and Quasar
Falko Schindler 1 سال پیش
والد
649d6f82da 245860f437
کامیت
56a8e9febf
6فایلهای تغییر یافته به همراه40 افزوده شده و 1 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 1 0
      nicegui/client.py
  2. 1 0
      nicegui/globals.py
  3. 3 0
      nicegui/run.py
  4. 4 1
      nicegui/run_with.py
  5. 12 0
      nicegui/templates/index.html
  6. 19 0
      tests/test_prod_js.py

+ 1 - 0
nicegui/client.py
مشاهده فایل 

@@ -93,6 +93,7 @@ class Client:
 
             'language': self.page.resolve_language(),
 
             'prefix': prefix,
 
             'tailwind': globals.tailwind,
 
+            'prod_js': globals.prod_js,
 
             'socket_io_js_extra_headers': globals.socket_io_js_extra_headers,
 
             'socket_io_js_transports': globals.socket_io_js_transports,
 
         }, status_code, {'Cache-Control': 'no-store', 'X-NiceGUI-Content': 'page'})

+ 1 - 0
nicegui/globals.py
مشاهده فایل 

@@ -43,6 +43,7 @@ dark: Optional[bool]
 
 language: Language
 
 binding_refresh_interval: float
 
 tailwind: bool
 
+prod_js: bool
 
 air: Optional['Air'] = None
 
 socket_io_js_extra_headers: Dict = {}
 
 endpoint_documentation: Literal['none', 'internal', 'page', 'all'] = 'none'

+ 3 - 0
nicegui/run.py
مشاهده فایل 

@@ -53,6 +53,7 @@ def run(*,
 
         uvicorn_reload_includes: str = '*.py',
 
         uvicorn_reload_excludes: str = '.*, .py[cod], .sw.*, ~*',
 
         tailwind: bool = True,
 
+        prod_js: bool = True,
 
         endpoint_documentation: Literal['none', 'internal', 'page', 'all'] = 'none',
 
         storage_secret: Optional[str] = None,
 
         **kwargs: Any,
 
@@ -80,6 +81,7 @@ def run(*,
 
     :param uvicorn_reload_includes: string with comma-separated list of glob-patterns which trigger reload on modification (default: `'.py'`)
 
     :param uvicorn_reload_excludes: string with comma-separated list of glob-patterns which should be ignored for reload (default: `'.*, .py[cod], .sw.*, ~*'`)
 
     :param tailwind: whether to use Tailwind (experimental, default: `True`)
 
+    :param prod_js: whether to use the production version of Vue and Quasar dependencies (default: `True`)
 
     :param endpoint_documentation: control what endpoints appear in the autogenerated OpenAPI docs (default: 'none', options: 'none', 'internal', 'page', 'all')
 
     :param storage_secret: secret key for browser based storage (default: `None`, a value is required to enable ui.storage.individual and ui.storage.browser)
 
     :param kwargs: additional keyword arguments are passed to `uvicorn.run`    
@@ -93,6 +95,7 @@ def run(*,
 
     globals.language = language
 
     globals.binding_refresh_interval = binding_refresh_interval
 
     globals.tailwind = tailwind
 
+    globals.prod_js = prod_js
 
     globals.endpoint_documentation = endpoint_documentation
 
 
     for route in globals.app.routes:

+ 4 - 1
nicegui/run_with.py
مشاهده فایل 

@@ -18,6 +18,8 @@ def run_with(
 
     language: Language = 'en-US',
 
     binding_refresh_interval: float = 0.1,
 
     mount_path: str = '/',
 
+    tailwind: bool = True,
 
+    prod_js: bool = True,
 
     storage_secret: Optional[str] = None,
 
 ) -> None:
 
     globals.ui_run_has_been_called = True
 
@@ -27,7 +29,8 @@ def run_with(
 
     globals.dark = dark
 
     globals.language = language
 
     globals.binding_refresh_interval = binding_refresh_interval
 
-    globals.tailwind = True
 
+    globals.tailwind = tailwind
 
+    globals.prod_js = prod_js
 
 
     set_storage_secret(storage_secret)
 
     app.on_event('startup')(lambda: handle_startup(with_welcome_message=False))

+ 12 - 0
nicegui/templates/index.html
مشاهده فایل 

@@ -6,7 +6,12 @@
 
     <link href="{{ favicon_url }}" rel="shortcut icon" />
 
     <link href="{{ prefix | safe }}/_nicegui/{{version}}/static/nicegui.css" rel="stylesheet" type="text/css" />
 
     <link href="{{ prefix | safe }}/_nicegui/{{version}}/static/fonts.css" rel="stylesheet" type="text/css" />
 
+    {% if prod_js %}
 
     <link href="{{ prefix | safe }}/_nicegui/{{version}}/static/quasar.prod.css" rel="stylesheet" type="text/css" />
 
+    {% else %}
 
+    <link href="{{ prefix | safe }}/_nicegui/{{version}}/static/quasar.css" rel="stylesheet" type="text/css" />
 
+    {% endif %}
 
+    <!-- prevent Prettier from removing this line -->
 
     {{ head_html | safe }}
 
   </head>
 
   <body>
 
@@ -15,8 +20,15 @@
 
     {% if tailwind %}
 
     <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/tailwindcss.min.js"></script>
 
     {% endif %}
 
+    <!-- prevent Prettier from removing this line -->
 
+    {% if prod_js %}
 
     <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/vue.global.prod.js"></script>
 
     <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/quasar.umd.prod.js"></script>
 
+    {% else %}
 
+    <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/vue.global.js"></script>
 
+    <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/quasar.umd.js"></script>
 
+    {% endif %}
 
+
 
     <script src="{{ prefix | safe }}/_nicegui/{{version}}/static/lang/{{ language }}.umd.prod.js"></script>
 
     <script type="importmap">
 
       {"imports": {{ imports | safe }}}

+ 19 - 0
tests/test_prod_js.py
مشاهده فایل 

@@ -0,0 +1,19 @@
 
+from selenium.webdriver.common.by import By
 
+
 
+from nicegui import __version__
 
+
 
+from .screen import Screen
 
+
 
+
 
+def test_dev_mode(screen: Screen) -> None:
 
+    screen.ui_run_kwargs['prod_js'] = False
 
+    screen.open('/')
 
+    screen.selenium.find_element(By.XPATH, f'//script[@src="/_nicegui/{__version__}/static/vue.global.js"]')
 
+    screen.selenium.find_element(By.XPATH, f'//script[@src="/_nicegui/{__version__}/static/quasar.umd.js"]')
 
+
 
+
 
+def test_prod_mode(screen: Screen):
 
+    screen.ui_run_kwargs['prod_js'] = True
 
+    screen.open('/')
 
+    screen.selenium.find_element(By.XPATH, f'//script[@src="/_nicegui/{__version__}/static/vue.global.prod.js"]')
 
+    screen.selenium.find_element(By.XPATH, f'//script[@src="/_nicegui/{__version__}/static/quasar.umd.prod.js"]')