cleanup and package updates

.gitignore

@@ -5,6 +5,4 @@ debug.log
 npm-debug.log
 
 *.sublime-workspace
-
-web/render-test/index.js
 .idea

Dockerfile

-# 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

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",