From b23ea7474c6c3d806dc5cc620fdfd13843e5d415 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 1 Apr 2020 06:13:08 -0400 Subject: [PATCH] use ES6 modules for all JavaScript --- .jshintrc | 1 + deploy_static | 2 +- static/build.html | 2 +- static/faq.html | 2 +- static/index.html | 2 +- static/redirect.js | 2 -- static/releases.html | 4 ++-- static/releases.js | 2 -- static/usage.html | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.jshintrc b/.jshintrc index 1a275e76..5379688d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,5 +1,6 @@ { "browser": true, + "module": true, "devel": true, "esversion": 6, "strict": "global" diff --git a/deploy_static b/deploy_static index 7571afb4..7eb0fcb6 100755 --- a/deploy_static +++ b/deploy_static @@ -7,7 +7,7 @@ set -o errexit rm -rf static_tmp cp -a static static_tmp json_reformat -m < static_tmp/manifest.webmanifest | sponge static_tmp/manifest.webmanifest -find static_tmp -name '*.js' -exec terser -cmo {} {} \; +find static_tmp -name '*.js' -exec terser --module -cmo {} {} \; find static_tmp -regex '\(.+/LICENSE\|.+\.\(css\|html\|ico\|js\|svg\|txt\|webmanifest\|xml\)\)' -exec zopfli {} \; -exec touch -r {} {}.gz \; remote=www-data@grapheneos.org diff --git a/static/build.html b/static/build.html index feb4c4fc..7b0aef37 100644 --- a/static/build.html +++ b/static/build.html @@ -23,6 +23,7 @@ +