Finish CDN migration

holoviz · Sep 21, 2022 · 8cecad4 · 8cecad4
1 parent 18d2215
commit 8cecad4
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 15 deletions.
diff --git a/panel/_templates/convert_index.html b/panel/_templates/convert_index.html
@@ -33,10 +33,10 @@
   }
   </script>
   {% endif %}
-  <script type="module" src="https://unpkg.com/@microsoft/fast-colors@5.1.0"></script>
-  <script type="module" src="https://unpkg.com/@microsoft/fast-components@1.13.0"></script>
+  <script type="module" src="{{ npm_cdn|default('https://cdn.jsdelivr.net/npm', true) }}/@microsoft/fast-colors@5.1.0"></script>
+  <script type="module" src="{{ npm_cdn|default('https://cdn.jsdelivr.net/npm', true) }}/@microsoft/fast-components@1.13.0"></script>
   <script type="text/javascript">
-    function setParamsFromSearch(text){
+    function setParamsFromSearch(text) {
         const params = new URLSearchParams(location.search);
         if (text===""){
             params.delete("search")

diff --git a/panel/_templates/error.html b/panel/_templates/error.html
@@ -21,8 +21,8 @@
     <link rel="manifest" href="{{base_url|default("", true) }}static/extensions/panel/images/site.webmanifest">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
-    <script type="module" src="https://unpkg.com/@microsoft/fast-colors@5.1.0"></script>
-    <script type="module" src="https://unpkg.com/@microsoft/fast-components@1.13.0"></script>
+    <script type="module" src="{{ npm_cdn|default('https://cdn.jsdelivr.net/npm', true) }}/@microsoft/fast-colors@5.1.0"></script>
+    <script type="module" src="{{ npm_cdn|default('https://cdn.jsdelivr.net/npm', true) }}/@microsoft/fast-components@1.13.0"></script>
     <style>
       html {
 	  height:100%;

diff --git a/panel/_templates/index.html b/panel/_templates/index.html
@@ -25,8 +25,8 @@
   <link rel="manifest" href="{{base_url|default("", true) }}static/extensions/panel/images/site.webmanifest">
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="theme-color" content="#ffffff">
-  <script type="module" src="https://unpkg.com/@microsoft/fast-colors@5.1.0"></script>
-  <script type="module" src="https://unpkg.com/@microsoft/fast-components@1.13.0"></script>
+  <script type="module" src="https://cdn.jsdelivr.net/npm/@microsoft/fast-colors@5.1.0"></script>
+  <script type="module" src="https://cdn.jsdelivr.net/npm/@microsoft/fast-components@1.13.0"></script>
   <script type="text/javascript">
     function setParamsFromSearch(text){
         const params = new URLSearchParams(location.search);

diff --git a/panel/auth.py b/panel/auth.py
@@ -289,6 +289,7 @@ async def get(self):
             )
             self.set_header("Content-Type", 'text/html')
             self.write(self._error_template.render(
+                npm_cdn=config.npn_cdn,
                 title='Panel: Authentication Error',
                 error_type='Authentication Error',
                 error=error,

diff --git a/panel/io/convert.py b/panel/io/convert.py
@@ -283,7 +283,7 @@ def make_index(files, title=None, manifest=True):
     items = {label: './'+os.path.basename(f) for label, f in sorted(files.items())}
     return INDEX_TEMPLATE.render(
         items=items, manifest=manifest, apple_icon=apple_icon,
-        favicon=favicon, title=title
+        favicon=favicon, title=title, npm_cdn=config.npm_cdn
     )
 
 def build_pwa_manifest(files, title=None, **kwargs):

diff --git a/panel/io/jupyter_server_extension.py b/panel/io/jupyter_server_extension.py
@@ -65,6 +65,7 @@
 from tornado.ioloop import PeriodicCallback
 from tornado.web import StaticFileHandler
 
+from ..config import config
 from ..util import edit_readonly
 from .resources import (
     DIST_DIR, ERROR_TEMPLATE, Resources, _env,
@@ -403,6 +404,7 @@ async def get(self, path=None):
         except (TimeoutError, RuntimeError) as e:
             await self.kernel_manager.shutdown_kernel(kernel_id, now=True)
             html = ERROR_TEMPLATE.render(
+                npm_cdn=config.npn_cdn,
                 base_url=root_url,
                 error_type="Kernel error",
                 error="Failed to start kernel",

diff --git a/panel/io/server.py b/panel/io/server.py
@@ -323,6 +323,7 @@ async def get(self, *args, **kwargs):
                     else:
                         template = ERROR_TEMPLATE
                     page = template.render(
+                        npm_cdn=config.npn_cdn,
                         title='Panel: Authorization Error',
                         error_type='Authorization Error',
                         error='User is not authorized.',

diff --git a/panel/template/fast/base.py b/panel/template/fast/base.py
@@ -2,6 +2,7 @@
 
 import param
 
+from ...config import config
 from ...io.state import state
 from ..base import BasicTemplate
 from ..react import ReactTemplate
@@ -65,8 +66,8 @@ class FastBaseTemplate(BasicTemplate):
 
     _resources = {
         'js_modules': {
-            'fast-colors': 'https://unpkg.com/@microsoft/fast-colors@5.1.4',
-            'fast': 'https://unpkg.com/@microsoft/fast-components@1.21.8'
+            'fast-colors': f'{config.npm_cdn}/@microsoft/fast-colors@5.1.4',
+            'fast': f'{config.npm_cdn}/@microsoft/fast-components@1.21.8'
         },
         'bundle': False
     }

diff --git a/panel/template/material/__init__.py b/panel/template/material/__init__.py
@@ -7,6 +7,7 @@
 
 from bokeh.themes import Theme as _BkTheme
 
+from ...config import config
 from ...layout import Card
 from ..base import BasicTemplate, TemplateActions
 from ..theme import DarkTheme, DefaultTheme
@@ -49,10 +50,10 @@ class MaterialTemplate(BasicTemplate):
 
     _resources = {
         'css': {
-            'material': "https://unpkg.com/material-components-web@7.0.0/dist/material-components-web.min.css",
+            'material': f"{config.npm_cdn}/material-components-web@7.0.0/dist/material-components-web.min.css",
         },
         'js': {
-            'material': "https://unpkg.com/material-components-web@7.0.0/dist/material-components-web.min.js"
+            'material': f"{config.npm_cdn}/material-components-web@7.0.0/dist/material-components-web.min.js"
         }
     }
 

diff --git a/panel/template/react/__init__.py b/panel/template/react/__init__.py
@@ -5,6 +5,7 @@
 
 import param
 
+from ...config import config
 from ...depends import depends
 from ...io.resources import CSS_URLS
 from ...layout import Card, GridSpec
@@ -51,9 +52,9 @@ class ReactTemplate(BasicTemplate):
 
     _resources = {
         'js': {
-            'react': "https://unpkg.com/react@16/umd/react.development.js",
-            'react-dom': "https://unpkg.com/react-dom@16/umd/react-dom.development.js",
-            'babel': "https://unpkg.com/babel-standalone@latest/babel.min.js",
+            'react': f"{config.npm_cdn}/react@16/umd/react.development.js",
+            'react-dom': f"{config.npm_cdn}/react-dom@16/umd/react-dom.development.js",
+            'babel': f"{config.npm_cdn}/babel-standalone@latest/babel.min.js",
             'react-grid': "https://cdnjs.cloudflare.com/ajax/libs/react-grid-layout/1.1.1/react-grid-layout.min.js"
         },
         'css': {