diff options
| -rw-r--r-- | Makefile | 44 | ||||
| -rw-r--r-- | data/js/main.js | 7 | ||||
| -rw-r--r-- | elm/checkall.js | 2 | ||||
| -rw-r--r-- | elm/checkhidden.js | 2 | ||||
| -rw-r--r-- | elm/elm-init.js | 2 | ||||
| -rw-r--r-- | elm/pagevars.js | 2 | ||||
| -rw-r--r-- | elm/polyfills.js | 2 |
7 files changed, 40 insertions, 21 deletions
@@ -110,41 +110,41 @@ static/f/vndb.js: data/js/*.js lib/VNDB/Types.pm util/jsgen.pl data/conf.pl | st util/jsgen.pl static/f/vndb.min.js: static/f/vndb.js - uglifyjs $< --compress --mangle -o $@ + uglifyjs $< --compress --mangle --comments '/(@license|@source|SPDX-)/' -o $@ # v2-rw -# Order matters! -JS_FILES=\ - elm/polyfills.js \ - elm/pagevars.js \ - elm/UList/LabelEdit.js \ - elm/UList/ManageLabels.js \ - elm/UList/Opt.js \ - elm/UList/VoteEdit.js \ - elm/Lib/Ffi.js \ - elm/elm-init.js \ - elm/checkall.js \ - elm/checkhidden.js - +# Order of JS files matters, so we read an '//order:x' comment from the files and sort by that. +# Files without that comment are assumed to have '//order:4'. +# (This trick will not work if we ever add JS files generated by this Makefile) +JS_FILES=$(shell find elm \! -path 'elm/elm-stuff/*' -name '*.js' -exec sh -c "echo \`grep -Po '(?<=^//order:)[0-9]' \"{}\" || echo 4\` \"{}\"" \; | sort | sed 's/..//') ELM_FILES=elm/*.elm elm/*/*.elm ELM_MODULES=$(shell grep -l '^main =' ${ELM_FILES} | sed 's/^elm\///') -# Patch the Javascript generated by Elm and append the elm/**.js files to it. +# Patch the Javascript generated by Elm and append the $JS_FILES to it. # Patches include: +# - Add @license and @source comments # - Redirect calls from Lib.Ffi.* to window.elmFfi_* # - Patch the virtualdom diffing algorithm to always apply the 'selected' attribute define fix-js - sed -i 's/var \$$author\$$project\$$Lib\$$Ffi\$$/var __unused__/g' $@ - sed -Ei 's/\$$author\$$project\$$Lib\$$Ffi\$$([a-zA-Z0-9_]+)/window.elmFfi_\1(_Json_wrap,_Browser_call)/g' $@ - sed -Ei "s/([^ ]+) !== 'checked'/\\1 !== 'checked' \&\& \\1 !== 'selected'/g" $@ + ( echo '// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0-only'; \ + echo '// @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause'; \ + echo '// @source: https://code.blicky.net/yorhel/vndb/src/branch/master/elm'; \ + echo '// SPDX-License-Identifier: AGPL-3.0-only and BSD-3-Clause'; \ + cat $@ \ + ) | sed 's/var \$$author\$$project\$$Lib\$$Ffi\$$/var __unused__/g' \ + | sed -E 's/\$$author\$$project\$$Lib\$$Ffi\$$([a-zA-Z0-9_]+)/window.elmFfi_\1(_Json_wrap,_Browser_call)/g' \ + | sed -E "s/([^ ]+) !== 'checked'/\\1 !== 'checked' \&\& \\1 !== 'selected'/g" >$@~ for fn in ${JS_FILES}; do \ - echo "(function(){'use strict';"; \ + echo; \ + echo "(function(){'use strict'; /* $$fn */"; \ cat $$fn; \ echo "})();"; \ - done >>$@ + done >>$@~ + echo '// @license-end' >>$@~ + mv $@~ $@ endef elm/Gen/.generated: lib/VNWeb/*.pm lib/VNWeb/*/*.pm lib/VNDB/Types.pm lib/VNDB/Config.pm data/conf.pl @@ -157,7 +157,9 @@ static/f/v2rw.js: ${ELM_FILES} ${JS_FILES} elm/Gen/.generated | static/f static/f/v2rw.min.js: ${ELM_FILES} ${JS_FILES} elm/Gen/.generated | static/f cd elm && ELM_HOME=elm-stuff elm make --optimize ${ELM_MODULES} --output ../$@ ${fix-js} - uglifyjs $@ --compress 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe' | uglifyjs --mangle -o $@~ + uglifyjs $@ --comments '/(@license|@source|SPDX-)/' --compress \ + 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe'\ + | uglifyjs --mangle --comments all -o $@~ mv $@~ $@ diff --git a/data/js/main.js b/data/js/main.js index 3d4248b9..de2fba2e 100644 --- a/data/js/main.js +++ b/data/js/main.js @@ -1,3 +1,8 @@ +// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0-only +// @source: https://code.blicky.net/yorhel/vndb/src/branch/master/data/js +// SPDX-License-Identifier: AGPL-3.0-only + + /* This is the main Javascript file. This file is processed by util/jsgen.pl to * generate the final JS file(s) used by the site. */ @@ -48,3 +53,5 @@ VARS = /*VARS*/; // Character editing (/c+/edit) //include chartraits.js //include charvns.js + +// @license-end diff --git a/elm/checkall.js b/elm/checkall.js index 5b7dc44e..bc87bad4 100644 --- a/elm/checkall.js +++ b/elm/checkall.js @@ -1,3 +1,5 @@ +//order:9 - After Elm initialization + /* "checkall" checkbox, usage: * * <input type="checkbox" class="checkall" name="$somename"> diff --git a/elm/checkhidden.js b/elm/checkhidden.js index cfe2f8a2..486b3c1d 100644 --- a/elm/checkhidden.js +++ b/elm/checkhidden.js @@ -1,3 +1,5 @@ +//order:9 - After Elm initialization + /* "checkhidden" checkbox, usage: * * <input type="checkbox" class="checkhidden" value="$somename"> diff --git a/elm/elm-init.js b/elm/elm-init.js index 1aefbb09..1388b0cd 100644 --- a/elm/elm-init.js +++ b/elm/elm-init.js @@ -1,3 +1,5 @@ +//order:8 - After all regular JS, as other files may modify pageVars or modules in the Elm.* namespace. + /* Add the X-CSRF-Token header to every POST request. Based on: * https://stackoverflow.com/questions/24196140/adding-x-csrf-token-header-globally-to-all-instances-of-xmlhttprequest/24196317#24196317 */ diff --git a/elm/pagevars.js b/elm/pagevars.js index 8fc92d88..e36ed7da 100644 --- a/elm/pagevars.js +++ b/elm/pagevars.js @@ -1,3 +1,5 @@ +//order:0 - Before anything else that may use window.pageVars + /* Load global page-wide variables from <script id="pagevars">...</script> and store them into window.pageVars */ var e = document.getElementById('pagevars'); window.pageVars = e ? JSON.parse(e.innerHTML) : {}; diff --git a/elm/polyfills.js b/elm/polyfills.js index 02179ee3..4bb85105 100644 --- a/elm/polyfills.js +++ b/elm/polyfills.js @@ -1,3 +1,5 @@ +//order:0 - Must be loaded before anything else. + /* classList.toggle() */ (function() { var historic = DOMTokenList.prototype.toggle; |