Merge pull request #2462 from MTES-MCT/hotfix/2461-qa-unpkg-plus-fiable

[QA] unpkg plus fiable
MTES-MCT · Apr 15, 2024 · bdee7a0 · bdee7a0
2 parents 823bde1 + 87b9acf
commit bdee7a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.env b/.env
@@ -47,7 +47,7 @@ MATOMO_SITE_ID=1
 ZAPIER_OILHI_TOKEN=
 ZAPIER_OILHI_USER_ID=
 ZAPIER_OILHI_CREATE_AIRTABLE_RECORD_ZAP_ID=
-SECURITY_CSP_HEADER_VALUE="default-src 'self' https://interfaces.zapier.com https://tibot-histologe.zapier.app; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.matomo.cloud https://unpkg.com https://interfaces.zapier.com; style-src 'self' 'unsafe-inline' https://unpkg.com; img-src 'self' data: blob: https://voxusagers.numerique.gouv.fr https://*.tile.openstreetmap.org https://unpkg.com https://jedonnemonavis.numerique.gouv.fr; connect-src 'self' https://api-adresse.data.gouv.fr https://cdn.matomo.cloud https://koumoul.com https://sentry.incubateur.net; font-src 'self'; frame-src 'none'; object-src 'none';"
+SECURITY_CSP_HEADER_VALUE="default-src 'self' https://interfaces.zapier.com https://tibot-histologe.zapier.app; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.matomo.cloud https://cdn.jsdelivr.net https://interfaces.zapier.com; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; img-src 'self' data: blob: https://voxusagers.numerique.gouv.fr https://*.tile.openstreetmap.org https://cdn.jsdelivr.net https://jedonnemonavis.numerique.gouv.fr; connect-src 'self' https://api-adresse.data.gouv.fr https://cdn.matomo.cloud https://koumoul.com https://sentry.incubateur.net; font-src 'self'; frame-src 'none'; object-src 'none';"
 CHATBOT_ENABLE=0
 MAINTENANCE_ENABLE=0
 MAINTENANCE_BANNER_ENABLE=0

diff --git a/.env.sample b/.env.sample
@@ -36,7 +36,7 @@ MATOMO_SITE_ID=1
 ZAPIER_OILHI_TOKEN=
 ZAPIER_OILHI_ID=
 ZAPIER_OILHI_CREATE_AIRTABLE_RECORD_ZAP_ID=
-SECURITY_CSP_HEADER_VALUE="default-src 'self' https://interfaces.zapier.com https://tibot-histologe.zapier.app; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.matomo.cloud https://unpkg.com https://interfaces.zapier.com; style-src 'self' 'unsafe-inline' https://unpkg.com; img-src 'self' data: blob: https://voxusagers.numerique.gouv.fr https://*.tile.openstreetmap.org https://unpkg.com https://jedonnemonavis.numerique.gouv.fr; connect-src 'self' https://api-adresse.data.gouv.fr https://cdn.matomo.cloud https://koumoul.com https://sentry.incubateur.net; font-src 'self'; frame-src 'none'; object-src 'none';"
+SECURITY_CSP_HEADER_VALUE="default-src 'self' https://interfaces.zapier.com https://tibot-histologe.zapier.app; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.matomo.cloud https://cdn.jsdelivr.net https://interfaces.zapier.com; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; img-src 'self' data: blob: https://voxusagers.numerique.gouv.fr https://*.tile.openstreetmap.org https://cdn.jsdelivr.net https://jedonnemonavis.numerique.gouv.fr; connect-src 'self' https://api-adresse.data.gouv.fr https://cdn.matomo.cloud https://koumoul.com https://sentry.incubateur.net; font-src 'self'; frame-src 'none'; object-src 'none';"
 CHATBOT_ENABLE=0
 MAINTENANCE_ENABLE=0
 MAINTENANCE_BANNER_ENABLE=0

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -41,14 +41,14 @@
     <link rel="stylesheet" href="{{ asset('build/dsfr/utility/icons/icons-user/icons-user.min.css') }}"/>
     <link rel="stylesheet" href="{{ asset('build/dsfr/utility/icons/icons-weather/icons-weather.min.css') }}"/>
     <link rel="stylesheet" href={{ asset('build/app.css') }}>
-    {% if 'back_cartographie' in app.request.get('_route') or 'back_signalement_view' in app.request.get('_route') %}
-        <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"/>
-        <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/MarkerCluster.Default.css"/>
-        <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/MarkerCluster.css"/>
+    {% if 'back_cartographie' in app.request.get('_route') %}
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.css"/>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/MarkerCluster.Default.css"/>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/MarkerCluster.css"/>
     {% endif %}
 
     {% if 'back_signalement_view' in app.request.get('_route') %}
-        <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/themes/light-border.css"/>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tippy.js@6/themes/light-border.css"/>
     {% endif %}
 
     {% block stylesheets %}{% endblock %}
@@ -131,13 +131,14 @@
 <script src="{{ asset('js/const.min.js?v='~''|date('YmdH')) }}"></script>
 <script src="{{ asset('js/app.js?v='~''|date('YmdH')) }}"></script>
 
-{% if 'back_cartographie' in app.request.get('_route') or 'back_signalement_view' in app.request.get('_route') %}
-    <script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
-    <script src="https://unpkg.com/[email protected]/dist/leaflet.markercluster.js"></script>
+{% if 'back_cartographie' in app.request.get('_route') %}
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.js"></script> 
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.markercluster.js"></script>
+
 {% endif %}
 {% if 'back_signalement_view' in app.request.get('_route') %}
-    <script src="https://unpkg.com/@popperjs/core@2"></script>
-    <script src="https://unpkg.com/tippy.js@6"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/tippy.js@6/dist/tippy-bundle.umd.js"></script>
 {% endif %}
 
 <script>