From be37afb7507158a1d6aec96a4e39a84608ae797f Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sun, 28 Apr 2019 21:19:30 +0100 Subject: [PATCH] Fix resolution logic & tree-shaking --- .npmignore | 5 +++++ Client.mjs | 2 ++ Client/Router.mjs | 2 +- README.md | 4 ++-- Server.mjs | 2 ++ logo-large.png | Bin 696 -> 317 bytes logo.png | Bin 414 -> 234 bytes 7 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .npmignore create mode 100644 Client.mjs create mode 100644 Server.mjs diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..06865af --- /dev/null +++ b/.npmignore @@ -0,0 +1,5 @@ +lantern-build-engine/ +docs/ +.tern-project +logo.piskel +logo-large.png diff --git a/Client.mjs b/Client.mjs new file mode 100644 index 0000000..426e460 --- /dev/null +++ b/Client.mjs @@ -0,0 +1,2 @@ +import ClientRouter from './Client/Router.mjs'; +export default ClientRouter; diff --git a/Client/Router.mjs b/Client/Router.mjs index afa0f26..88d710d 100644 --- a/Client/Router.mjs +++ b/Client/Router.mjs @@ -58,7 +58,7 @@ class ClientRouter extends EventEmitter { add_page(routespec, callback) { this.routes.push({ spec: routespec, - match: pathspec instanceof RegExp ? { regex: routespec, tokens: [] } : pathspec_to_regex(routespec), + match: routespec instanceof RegExp ? { regex: routespec, tokens: [] } : pathspec_to_regex(routespec), callback }); } diff --git a/README.md b/README.md index e261356..70c25e3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Syntax | Meaning Initialise a new router like this: ```js -import { ClientRouter } from 'powahroot'; +import ClientRouter from 'powahroot/Client.mjs'; // .... @@ -51,7 +51,7 @@ const router = new ClientRouter({ The server router works slightly differently, to account for the different environment it's designed for. Here's how to use it: ```js -import { ServerRouter } from 'powahroot'; +import ServerRouter from 'powahroot/Server.mjs'; // .... diff --git a/Server.mjs b/Server.mjs new file mode 100644 index 0000000..5ca6274 --- /dev/null +++ b/Server.mjs @@ -0,0 +1,2 @@ +import ServerRouter from './Server/Router.mjs'; +export default ServerRouter; diff --git a/logo-large.png b/logo-large.png index 9aaa3a81ed644e3a2673d7014f5e851fb05dd410..62146551256adf9e2c87625c21806fea9c1a17d1 100644 GIT binary patch delta 302 zcmV+}0nz@r1-$~07=Hu<00013M{Ml?001yhOjJbx001pg12kL(He~=ufdz96B!Lbn zj1McH5;CY0HO|8t;MYR!Z){B}-TU`*rF5M_XZ0K{la2t>T(8$xKr$YY{fv{`GK{(*y(s)mxon`S}g1WRhUErY3;|G(4l;kwHs9{YC!nLTr^yy?3 z1v!-?rbm~P1tt<807*qoM6N<$g68pn Ay8r+H delta 684 zcmV;d0#p6H0=NZ`7=H)`00020X>r~F00MqVL_t(|UhSH@P6A;Ng?BN;XuL$QQVRyC0OkOt0*hPW`p+dVw-vENt$!32#}|hc;j+0EN36&B zp&q&4`Mz{1t{)nc=Q~Nt^Re4gBVYoU0|Jf!V`^qu3WW2^pEb`dx_d)noW%roJ#1VZ z1K5TpfH@%G2p}Ry(OL1_Pc2=EDQm~m;+Te$9<0hCIBd44(N0Q z4kB^EI3m#Fc7KVlO7*HI^SC~-lNDdN>$(c|@@zz0Uwr;vVBd5MFagW~9fkm7hCOE) z61X0p`-zNX-g%HKFa{LvRt4j4#k^QBK6&bidBdOyK%%BOfGE)R2;lwQTrUX5`UhfS zN^~^i$ruXKz&t$X8}xmI7_h6$1DIoJ9$*5P0|Jf!V}D3HUQf&S0uC^~ou2UAGFi+~ zY&F;9>t??>u?b)f2p9sX!70yv0b=t3{eoicOHA2&&kJl>E%5x56YG8N2QcnU0CPZx zA%M(bEzoMqGvu`6>O8;%fDVi~0LtOEM*v%5kztvevmP4?fPH<;{av5y`=(=n2>?Ao zb3o7#(0?+7^R?x!w!UY%KZ{X#z3M!G31k8&>wR;8vc>iP5!jRs57y&j^*%!m$F;Ba z{Eq=9fH^?4z&Z{ARt_^}6MZqy9wGMp*nZ89t7Cu(K>7jf7cmF48v^)xT$^h%N3ii` zkz@PQ7+?ax{{zecHbZ zmx~)1eAqC3dDD&<=^OWr4oorlki%eDaha*1jp3@n2DXM&hehlQR!QuTlwb&85Ix^l SE%FCwDTAl0pUXO@geCxlR#0sK delta 400 zcmV;B0dM~50iFYp7=H)`0000V^Z#K000Cu5L_t(IPh(`D5HKR^cW-3<|NhBuhJW8# z8O|*E&1ja&@E^ox;{45UYBmFyFDS#xu(SR*Tpx-7FvCn@SpS3AKfnD03$b%C!3{xo zFjfOVidG1l{_pX;z>vL7m*MT-pA01*uYz3watX2_7zWH2GJgWw&dJEk@csW^ux1b_ zZobOEn1|4O?y%H=}