From e6cd3d554ea19107bb601dd4441aaf4d8ba578a1 Mon Sep 17 00:00:00 2001 From: "Felix W. Dekker" Date: Sun, 18 Apr 2021 18:21:34 +0200 Subject: [PATCH] Use new template system --- Gruntfile.js | 4 ++-- package-lock.json | Bin 140303 -> 310561 bytes package.json | 11 +++++------ src/main/index.html | 9 +++++---- src/main/js/{index.js => main.js} | 8 ++------ 5 files changed, 14 insertions(+), 18 deletions(-) rename src/main/js/{index.js => main.js} (96%) diff --git a/Gruntfile.js b/Gruntfile.js index acad4ee..1badde2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,7 +8,7 @@ module.exports = grunt => { }, copy: { html: { - files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}] }, }, focus: { @@ -54,7 +54,7 @@ module.exports = grunt => { }, webpack: { options: { - entry: "./src/main/js/index.js", + entry: "./src/main/js/main.js", module: { rules: [ { diff --git a/package-lock.json b/package-lock.json index ab55942b59f76e85e4096879db1dcfbee7fe1a30..c809af35589c7ad2897ea6dc189fc3a6562fc15e 100644 GIT binary patch delta 28667 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 Qpl>mnthnSza$(H>12NT&@&Et; delta 1688 zcmY+EU#Q#m701z^+%!#do806k-0e31NSZ&&z1Bb5QcGE{|HzX3N3ty0@_lG4+p;ZN zvSrDZY%|tv>|wMk$wg#87=z_*FqVzdbZcu`TGH-idujuF>q}EgA3Dmmz}VPeV>e~Z z*0=LLoWuE^1D~_|&y}mcf9P5aVs`MaLBvk}vFPV(Ym0xs0B4~C?XYF``=%EI-=^UU z2);>1#4F6Xryu0UrsLYi*o|;&AmE0`grN0nof-}Oc(dJTm@?elvXYARoAN& z*s!3BPG=m>Ftu-#IXbARG1V#wQ*nE%xQ&H5aE%ztvb}h?z7I^Q+ z@G)@b7;^H6W7)RV@eJqe6Q|EULu}IE-fj4C@cB#dp@sAVICl=b@-WIor`OR4yK*3U z_VPN|e-J$%y}OKRDU6<^w0hT_XLKi=45=zROYw=OPzk45fflin6z_C0MlPG>8~D(# z$CPAoZswbKgVz+jJlXCQi}WaiH7a5{FH8i=ETy8|gCuz77JLZYc@;h%z5mTGhp&N8 z{|;Z$;u_o6M1Bxz7}w47v|P(=Pf}^3t7hf;Y?`YS;=SH5C9sLylo>VaVotL9t|hqK zP#rOj)6pr*A?I5|GBgH3%&;>_IuEv9g2m|Y#%XZ)I=lv!J@`m;d*dWH{pkO82e*F% zuYllD^gNJ%3++=$m#lhHsadb;M5riU8*fuOSSC~TW6pp@GloR2F5OQ zNehMXL`bBvsX;LyEH)ge45?Tl z<@W<=Af#9e>*t+X2j8YWM%BmQ$Y+Qc;qVgpXoOS&xCE8K^C)y?=hj((_mTaJ4?N@# z>!7uZ{MXOjtH^rv*Q=K_&l@$^ielFjY%eQL(jD8hQ%NDnc|y`w+*X?>bGpmff|QdL zRUO-vX}ze?T(84$ypc{=_Mq6P#e1!IoNE)d5|^w-8tncJ5y9^shYE|sJIJrT0SX+v zyx9K&bP-xS_6fos+V=%4;N9!cDTn~qF!;$64*=TZ_d&ctfRPJb(Uf$j8*2>tZd0#G zT01Y+97++Dp=KJ{&SYr0nGWuV6p_QnTsvsGwW4NA#I`*ec?6lK`&)WDW81c2wI=v9 zDH{b+R=McR*N=Vy@6o}~a}3*>o10DFzYp-Y7yyOP(a1$t7wTV-A09dQe-+?6JbV&j zqMf&%JoS~%J?CH18_e}r;Vbo#HLsLpiKWIwU7KiKnIs$IoHV4G-DZ&CMx4RPVJ+~>;GPSe1UG&JZ$@|bJp|;dFuHiI2Y-%$yEo9|;3q#tm!jvf{otJ;yd2$P zmVt5;U5W0X7lHf>bRCM{H>QPpCuX)2Lc<^1WIK*KgMO25*os_=$*f41>|txq56kDc zPQ~OH&mU!Syl7TU+EB>Eh_w@>s)<%2*!vh{dCn&4Vo2P7OL>sIi7Mdo+t6xs_!PPa m3Va-Vw*)^>2f&9n(Pi+~pOMw*TJr*!{{wzxf&UV{xAGrH);OX7 diff --git a/package.json b/package.json index fee8192..138019a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "converter", - "version": "1.4.8", + "version": "1.4.9", "description": "Convert numbers to and from various bases.", "author": "Felix W. Dekker", "browser": "dist/bundle.js", @@ -16,19 +16,18 @@ "deploy": "grunt deploy" }, "dependencies": { - "@fwdekker/template": "^0.0.24", "big-integer": "^1.6.48" }, "devDependencies": { "grunt": "^1.3.0", - "grunt-cli": "^1.4.1", + "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-watch": "^1.1.0", "grunt-focus": "^1.0.0", "grunt-text-replace": "^0.4.0", - "grunt-webpack": "^4.0.2", - "webpack": "^5.28.0", - "webpack-cli": "^4.5.0" + "grunt-webpack": "^4.0.3", + "webpack": "^5.33.2", + "webpack-cli": "^4.6.0" } } diff --git a/src/main/index.html b/src/main/index.html index 35c05a4..420edf1 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -11,14 +11,15 @@ Converter | FWDekker +
@@ -41,8 +42,8 @@
- - + + diff --git a/src/main/js/index.js b/src/main/js/main.js similarity index 96% rename from src/main/js/index.js rename to src/main/js/main.js index 450d000..313ec7b 100644 --- a/src/main/js/index.js +++ b/src/main/js/main.js @@ -1,4 +1,5 @@ -import {$, doAfterLoad, footer, header, nav, showPage} from "@fwdekker/template"; +// noinspection JSUnresolvedVariable +const {$, doAfterLoad, footer, header, nav, showPage} = window.fwdekker; import bigInt from "big-integer" @@ -219,11 +220,6 @@ doAfterLoad(() => { description: "Convert numbers to and from various bases" })); $("#footer").appendChild(footer({ - author: "Felix W. Dekker", - authorURL: "https://fwdekker.com/", - license: "MIT License", - licenseURL: "https://git.fwdekker.com/FWDekker/converter/src/branch/master/LICENSE", - vcs: "git", vcsURL: "https://git.fwdekker.com/FWDekker/converter/", version: "v%%VERSION_NUMBER%%" }));