From 2c1cd46167402d7dca4e4ffb4689ec93ee01e5e8 Mon Sep 17 00:00:00 2001 From: David Larlet Date: Wed, 1 May 2024 13:27:45 -0400 Subject: [PATCH] fix: no .mjs extension for JS modules It requires a special nginx configuration that we want to avoid for all instances deployments: ``` include mime.types; types { application/javascript mjs; } ``` --- scripts/vendorsjs.sh | 2 +- umap/static/umap/js/modules/dompurify.js | 2 +- umap/static/umap/js/modules/utils.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/vendorsjs.sh b/scripts/vendorsjs.sh index a506a276..b2617f27 100755 --- a/scripts/vendorsjs.sh +++ b/scripts/vendorsjs.sh @@ -25,7 +25,7 @@ mkdir -p umap/static/umap/vendors/georsstogeojson/ && cp -r node_modules/georsst mkdir -p umap/static/umap/vendors/togpx/ && cp -r node_modules/togpx/togpx.js umap/static/umap/vendors/togpx/ mkdir -p umap/static/umap/vendors/tokml && cp -r node_modules/tokml/tokml.js umap/static/umap/vendors/tokml mkdir -p umap/static/umap/vendors/locatecontrol/ && cp -r node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.* umap/static/umap/vendors/locatecontrol/ -mkdir -p umap/static/umap/vendors/dompurify/ && cp -r node_modules/dompurify/dist/*.mjs umap/static/umap/vendors/dompurify/ +mkdir -p umap/static/umap/vendors/dompurify/ && cp -r node_modules/dompurify/dist/purify.es.mjs umap/static/umap/vendors/dompurify/purify.es.js mkdir -p umap/static/umap/vendors/colorbrewer/ && cp node_modules/colorbrewer/index.js umap/static/umap/vendors/colorbrewer/colorbrewer.js mkdir -p umap/static/umap/vendors/simple-statistics/ && cp node_modules/simple-statistics/dist/simple-statistics.min.* umap/static/umap/vendors/simple-statistics/ mkdir -p umap/static/umap/vendors/iconlayers/ && cp node_modules/leaflet-iconlayers/dist/* umap/static/umap/vendors/iconlayers/ diff --git a/umap/static/umap/js/modules/dompurify.js b/umap/static/umap/js/modules/dompurify.js index 27216bcf..e8219741 100644 --- a/umap/static/umap/js/modules/dompurify.js +++ b/umap/static/umap/js/modules/dompurify.js @@ -1,4 +1,4 @@ -import {default as DOMPurifyInitializer} from '../../vendors/dompurify/purify.es.mjs' +import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.es.js' import { JSDOM } from 'jsdom' console.log(DOMPurifyInitializer) diff --git a/umap/static/umap/js/modules/utils.js b/umap/static/umap/js/modules/utils.js index 4c6bfee3..340d1122 100644 --- a/umap/static/umap/js/modules/utils.js +++ b/umap/static/umap/js/modules/utils.js @@ -1,4 +1,4 @@ -import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.es.mjs' +import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.es.js' /** * Generate a pseudo-unique identifier (5 chars long, mixed-case alphanumeric) @@ -358,7 +358,7 @@ export function template(str, data) { } export function parseNaiveDate(value) { - const naive = new Date(value) - // Let's pretend naive date are UTC, and remove time… - return new Date(Date.UTC(naive.getFullYear(), naive.getMonth(), naive.getDate())) + const naive = new Date(value) + // Let's pretend naive date are UTC, and remove time… + return new Date(Date.UTC(naive.getFullYear(), naive.getMonth(), naive.getDate())) }