cleanup and package updates

.gitignore

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

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

package-lock.json

@@ -143,12 +143,6 @@
         "@types/range-parser": "*"
       }
     },
-    "@types/graphql": {
-      "version": "0.12.6",
-      "resolved": "http://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz",
-      "integrity": "sha512-wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ==",
-      "dev": true
-    },
     "@types/handlebars": {
       "version": "4.0.39",
       "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.39.tgz",
@@ -174,9 +168,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.9.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz",
-      "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==",
+      "version": "10.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.10.1.tgz",
+      "integrity": "sha512-nzsx28VwfaIykfzMAG9TB3jxF5Nn+1/WMKnmVZc8TsB+LMIVvwUscVn7PAq+LFaY5ng5u4jp5mRROSswo76PPA==",
       "dev": true
     },
     "@types/node-fetch": {
@@ -587,14 +581,13 @@
       }
     },
     "apollo-link": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.2.tgz",
-      "integrity": "sha512-Uk/BC09dm61DZRDSu52nGq0nFhq7mcBPTjy5EEH1eunJndtCaNXQhQz/BjkI2NdrfGI+B+i5he6YSoRBhYizdw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.3.tgz",
+      "integrity": "sha512-iL9yS2OfxYhigme5bpTbmRyC+Htt6tyo2fRMHT3K1XRL/C5IQDDz37OjpPy4ndx7WInSvfSZaaOTKFja9VWqSw==",
       "dev": true,
       "requires": {
-        "@types/graphql": "0.12.6",
         "apollo-utilities": "^1.0.0",
-        "zen-observable-ts": "^0.8.9"
+        "zen-observable-ts": "^0.8.10"
       }
     },
     "apollo-utilities": {
@@ -4313,9 +4306,9 @@
       }
     },
     "graphql-code-generator": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/graphql-code-generator/-/graphql-code-generator-0.12.2.tgz",
-      "integrity": "sha512-y8fEQzYe+Nxvc4R4etQvX4MPFmlU+VguiIiOqtJGcT4vuTRa2O6LK8QKC37NikbISC2/Iy334443Ug1AD08hSQ==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/graphql-code-generator/-/graphql-code-generator-0.12.3.tgz",
+      "integrity": "sha512-zt3sby+SuXLmfXaLU1nmviRznDp///qXFQBT0m0yTdUv9begf+I22ApDSYqHYeHuWjPZlxY/wdpYNrDheqZxrQ==",
       "dev": true,
       "requires": {
         "@graphql-modules/epoxy": "0.1.6",
@@ -4328,8 +4321,8 @@
         "commander": "2.18.0",
         "fb-watchman": "2.0.0",
         "glob": "7.1.3",
-        "graphql-codegen-compiler": "0.12.2",
-        "graphql-codegen-core": "0.12.2",
+        "graphql-codegen-compiler": "0.12.3",
+        "graphql-codegen-core": "0.12.3",
         "graphql-import": "0.7.1",
         "is-glob": "4.0.0",
         "is-valid-path": "0.1.1",
@@ -4489,23 +4482,23 @@
       }
     },
     "graphql-codegen-compiler": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/graphql-codegen-compiler/-/graphql-codegen-compiler-0.12.2.tgz",
-      "integrity": "sha512-0S9liwQw9Yr1FmmViHukd3H0y9TyVI0SJ0Po2q+FDhaybuD8NBISfI/2BGok341/CQrIQezKvdPyd1A3XVCKmA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/graphql-codegen-compiler/-/graphql-codegen-compiler-0.12.3.tgz",
+      "integrity": "sha512-MhROnr0uYQJIgkG/HonEvul429bhp1fulhvDuRvM8ajT8+ufx5FXTmRjBBvkweX1bjQl4noy4XZbsqQCkFP4JA==",
       "dev": true,
       "requires": {
         "@types/handlebars": "4.0.39",
         "change-case": "3.0.2",
         "common-tags": "1.8.0",
-        "graphql-codegen-core": "0.12.2",
+        "graphql-codegen-core": "0.12.3",
         "handlebars": "4.0.12",
         "moment": "2.22.2"
       }
     },
     "graphql-codegen-core": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/graphql-codegen-core/-/graphql-codegen-core-0.12.2.tgz",
-      "integrity": "sha512-fZcsacdD9tBkxstXd6dXygWBYNgXRwBTpEfSaSpCIl9ZJsBqAOx9R86bgHbMoRbaFb7rjlPxMdfnFKuTA6MMTw==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/graphql-codegen-core/-/graphql-codegen-core-0.12.3.tgz",
+      "integrity": "sha512-HOZ8WMw3X9gDTuSs5865l2d3xV+WMfmogARSCr4eRS7ydLwee8jTE82yjDCwWpgHiEbj/I1HBl2XqcECrWfeqQ==",
       "dev": true,
       "requires": {
         "graphql-tag": "2.9.2",
@@ -4564,9 +4557,9 @@
       }
     },
     "graphql-codegen-typescript-template": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/graphql-codegen-typescript-template/-/graphql-codegen-typescript-template-0.12.2.tgz",
-      "integrity": "sha512-zsz820TLmIQZPLrh79R/NIr7AQbsIGw18eZL6wInaOdK+JCS+bqLYOudrewYkeUwZdRlNTk5CEPjHxANA5gKKw==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/graphql-codegen-typescript-template/-/graphql-codegen-typescript-template-0.12.3.tgz",
+      "integrity": "sha512-ScWWV0EDhgVuMo/V4AYTuf8hARFKO7V520NJFEeSCWcQ2vfHIO7qilcdA8zKnKTs7lbgVOUNMf4afwAzlbaWdw==",
       "dev": true
     },
     "graphql-import": {
@@ -6224,9 +6217,9 @@
       "dev": true
     },
     "logform": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-1.9.1.tgz",
-      "integrity": "sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz",
+      "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==",
       "dev": true,
       "requires": {
         "colors": "^1.2.1",
@@ -11546,9 +11539,9 @@
       "dev": true
     },
     "zen-observable-ts": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz",
-      "integrity": "sha512-KJz2O8FxbAdAU5CSc8qZ1K2WYEJb1HxS6XDRF+hOJ1rOYcg6eTMmS9xYHCXzqZZzKw6BbXWyF4UpwSsBQnHJeA==",
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz",
+      "integrity": "sha512-5vqMtRggU/2GhePC9OU4sYEWOdvmayp2k3gjPf4F0mXwB3CSbbNznfDUvDJx9O2ZTa1EIXdJhPchQveFKwNXPQ==",
       "dev": true,
       "requires": {
         "zen-observable": "^0.8.0"

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