From ae01ec39582082224bc6e40c8c96216490c445a7 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Mon, 17 Sep 2018 17:37:17 -0700
Subject: [PATCH] cleanup and package updates
---
.gitignore | 2 --
Dockerfile | 9 +++------
package-lock.json | Bin 412027 -> 411721 bytes
package.json | 6 +++---
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 403575e70..0a3b7f873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,4 @@ debug.log
npm-debug.log
*.sublime-workspace
-
-web/render-test/index.js
.idea
diff --git a/Dockerfile b/Dockerfile
index 0a03541a9..9f10bcd80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# This is to build a container that demos the Molstar Canvas prototype
+# This is to build a container that demos the Mol* canvas app
# Source material: https://nodejs.org/en/docs/guides/nodejs-docker-webapp/
# Source material: https://derickbailey.com/2017/05/31/how-a-650mb-node-js-image-for-docker-uses-less-space-than-a-50mb-image/
# Source material: https://hub.docker.com/_/node/
@@ -18,13 +18,10 @@ COPY *.json ./
RUN npm install
COPY . .
-# Build application and bundle results
+# Build library and canvas application then copy results
RUN npm run build
-COPY build/ build/
-
-# Build Canvas application and bundle results
RUN npm run build-canvas
-COPY build/ build/
+COPY build/canvas/ build/canvas/
# Open ports for HTTP
EXPOSE 8080/tcp
diff --git a/package-lock.json b/package-lock.json
index eef7df4dae9988c64bf224ddff9ae23168532855..a458b41d4130941d70df39f03bcd865bc3364365 100644
GIT binary patch
delta 1080
zcmZ9K&2QUu9L8lgZ7Ovg+SJh%RY0L|3B!qB66Zz|JGGNIPW%$vL0YjBzczN>?KlDn
zsRvG=4Ih3IocbSB><~1;p%)~i2?lo%2RLyU;>v{<O{&=8D?QKY`RMsR|9rmp{e!)8
z{blf>4R3?*5_kvvg{`F?eYs1epd7gHAUt_?m`+~Vf9cYeUWE>l*V8FESWXux*@-Nj
zjZds4S2`+6Wz1VtiDr<=AqrOy{7$z=O4D+t!Lgk%lBc~+P-vCLnMPIDh`=W1xHlqv
zLEyz{G%Vy>E%30tewdseq#ymTzf}TX@2#WB`EfeAeSa5}zfHaNU$WaM#v;mF3(awD
z-z1EYWcWf{$uP57eijc=OW+s@tLIdqfm8^#O;Jm%z<Z-sj0gQiL16<iw8XBi^HRO)
z>BWvR7L&94dGK)zrxWe?MsoA`9+XQipxsm9cqJS|)St=ErzkjIz?<M{4Ze2`vz%d5
zBhH9(wc%T;-jH*FAG*RaphgISjMZwpEM@&{EcNBEXqdK@VNtX+qC{=XXeKjPyjFLx
z(2%G<(wY;>F~{A-Bx!$;Pkvdywfd$G4<QHxXYS=!-s9jq&-KdV;J@$wk0}Mdu%3f~
z-_BC&k|XfJBs<sIHP${kLYQGdhw}lB77b^Vv*rUQq~=1%k-8_5nYpzfs;cA*Ub!5e
zM5dZEy!HSOhB2;ojp?{uIjOer8u;lmD4+beoxU2&M{C#{?|_Rx;JaYQft?p<9y{<`
z*EKPGmsGe2Q;Rkw&BZA}=7|B?#}=K8!dd>%E(u~~f}4U^i2IGmG)YgQNi_DTN~DZz
z#-$ApVRKA*fU4sjU70ABIliiC^{ER#*nA=T{Rv#T&K7%$(#g`4V|V7<5b5A0O`2Pz
zQxd9mzR)4iY_nFSO|hc%+GuDoEMFMAgI>QxF6%*Enid9z-QndXXW_aPm6iiTSNh=L
z9q17JI)*n_<thB+_vFcA0+iLY9q<)cds{YrV(77soFgrk<0AyaFrUhF8#HRU(=5GI
z2f1#<EO58I^ha$sKkPSM4Vh(FsX4*0TGx?^NS)T1jND?~(Il@IX-@&SaHs&D-hfh{
zY-wwkms)LU>*TY`sY16=pd4-71gFf#{-r<Iep4pGF*g%zTSm|$$81%Kyo^sZTH*Vl
zug4?w1hc)Cg;%q_8kMn%Xc*09U{P{N)fPn_?Mix%X4QVpY4x0TXjbb{Q*B*!4mft>
G-G2e(x@>X)
delta 1206
zcmY+DJB-_O9LHt%a(5CfqEN0qDwX4CPXg0(Y$r~Pkid2xcAUiVD{-v8>^OcTaUM=`
zwlkpeP}xw6CH@;Au_I828yHxS5GoQw*CHXofW*LBi2(wwL>Ye4cl&+y`TTz0-`@T6
zqunpfosT*ALi){bne^F%^8m%6o%F94wszdmoO-hndKrD3E@uxhJUxwG)FPd3Cv|67
z#k9sy5bcIPXm={ZgrE?ygyt~8S*&J`j*0z&ovj9>E%L&E^*yCsW?fP*w77w@i1ok`
z1sb(6u0R>iQTo!)XVaVK&fGP3{0)c#UzrfGF0!+ZGX}b-IxN@D<y{2{2#>=GD|hJ9
zB~9^hS;pGlf{a8XJ4m=zF&y|(Xi^Rm@I5zbN!(}@lqS8dIA8E(OBlsgrPLj{q1x)E
zH<5$%!*iQ=zdrvI4Tkq&JbifO0{HGe{IaGEQHIS@c0gh!LoO-HJU*_@vg3+3D+E2J
zr4EvOxy)hx<+wJs7p&RTB~MzR%wWjlO*?d|Ji;J;-s_WHWg;_P*I(J-&Nf7*Kc3n;
z{TS;0>wEkEa6Kf!^%%Yc-adp+f%Dwv)9J&jC&4}kolQTxvX$Pudh$K=+A(?!!hQ#z
zS0Ef*58-WaqYrO@Pk8thK-ec<O!u}nw4~^irB%0&G~=UQPR{ig(vhBPv?{?!L)z}r
z=Y4Uus8xGv?r5pXCN7e7p(qI~QE2)@i&t12<r9L)<#L4PVst56^pv$5GW{uY`uJ82
zo<I<uzO{J<eBr>)L-_Gt9p2pie<$p}I$4Dp`H>V+-4Lq;LEGn+L!02T38f}&KC9HS
ztqDFuDkaZMtYxX#WO&8lQJkqxhC~iSSt;bD{z^EqTZxU)gx+R_0MG{z3Ep(z_tzl4
zb>MfOSbx)fOat7IH!`Zxo0~nmL@k(MJYVQGY3qsGVY*FMmm@}<mL0`ZrYt|AjM|);
z(PB)=MbdIPt1*!+vtkv(!Kf8CY-d~%mMTp)8tT6ik2@ZGd;5vSYZu!<oWak5H)il_
zj|e<-E~Cy@MLet4170#(_0TI>P+B0xel{z8Yc0zELM5er$@ifYew8v1awIxU|E5
z)E)M<$gt&6Qyu2na%;fFbd%1zf{?z0Tm*X&ynTE!gn#%IeA>$7z^TrOGvJq2=8|S`
zp;0cj6{jE&u@KjM2{R`uGsP1D>6NWY&o#sOV8s*T1u-t8gqZdEO=UWrh*CqVwHw9+
zjs14S#=g#*mTAz_xzJqS00qYPpsf!cbWW^i<M=@*L;L~4TNxZM)y-ESD!oJQYeH>>
zi^WQ8(KfB+S*2H;8JK`~y5*XMaj`<`CAorlVhsz$ZqFtAY9mmnxXZEnYGxQKAtD(|
X?<AF+HjR`yBaOLQ|B><aUmX4oj-ZQ;
diff --git a/package.json b/package.json
index bf83b6ed9..38c65a8e9 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
"@types/compression": "0.0.36",
"@types/express": "^4.16.0",
"@types/jest": "^23.3.2",
- "@types/node": "^10.9.4",
+ "@types/node": "^10.10.1",
"@types/node-fetch": "^2.1.2",
"@types/react": "^16.4.14",
"@types/react-dom": "^16.0.7",
@@ -87,8 +87,8 @@
"file-loader": "^2.0.0",
"glslify-import": "^3.1.0",
"glslify-loader": "^1.0.2",
- "graphql-code-generator": "^0.12.2",
- "graphql-codegen-typescript-template": "^0.12.2",
+ "graphql-code-generator": "^0.12.3",
+ "graphql-codegen-typescript-template": "^0.12.3",
"jest": "^23.6.0",
"jest-raw-loader": "^1.0.1",
"mini-css-extract-plugin": "^0.4.2",
--
GitLab