Merge pull request #139 from trailimage/develop

Develop

.gitignore

@@ -1,5 +1,7 @@
 node_modules/
 profile/
-dist/js/maps/
+dist/
+lib/
+public/js/maps/
 .vscode/chrome/
-lib/**/*.js.map
+yarn-error.log

.travis.yml

@@ -1,13 +1,22 @@
 language: node_js
+
 node_js:
-  - "9"
-script: npm test
-sudo: required
-before_install: # if "install" is overridden
-  # Repo for Yarn
-  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
-  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq yarn
+  - "10"
+
+branches:
+  only:
+  - master
+
+script:
+  - yarn global add codecov
+  - yarn test
+  - codecov
+
+sudo: false
+
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH="$HOME/.yarn/bin:$PATH"
+
 cache:
   yarn: true

.vscode/launch.json

@@ -3,62 +3,40 @@
    "configurations": [
       // http://www.mithunvp.com/typescript-tutorials-setting-visual-studio-code/
       {
-         "name": "Node Server",
+         "name": "Server (precompiled)",
          "type": "node",
          "request": "launch",
          "program": "${workspaceRoot}/lib/app.js",
          "protocol": "inspector",
          "sourceMaps": true,
-         "outFiles": [
-            "${workspaceRoot}/lib"
-         ],
+         "outFiles": ["${workspaceRoot}/lib"],
          "cwd": "${workspaceRoot}"
       },
       {
-         "name": "Mocha Test",
+         "name": "Server (ts-node)",
          "type": "node",
          "request": "launch",
-         "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-         "cwd": "${workspaceRoot}",
-         "runtimeExecutable": null,
-         "stopOnEntry": false,
-         "protocol": "inspector",
+         "args": ["${workspaceRoot}/src/app.ts"],
+         "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
          "sourceMaps": true,
-         "outFiles": [
-            "${workspaceRoot}/lib"
-         ],
-         //"args": ["test/**/*.js", "--no-timeouts"]
-         //"args": ["test/factory/*", "--no-timeouts"]
-         //"args": ["test/map/geojson*", "--no-timeouts"]
-         //"args": ["test/factory/photo*", "--no-timeouts"]
-         "args": [
-            "test/providers/google*",
-            "--no-timeouts"
-         ]
+         "cwd": "${workspaceRoot}",
+         "protocol": "inspector"
       },
       {
-         "name": "Attach to Node",
+         "name": "Jest",
          "type": "node",
-         "request": "attach",
-         "port": 9229
-      },
-      // https://github.com/Microsoft/vscode/issues/13405
-      // https://github.com/gulp-sourcemaps/gulp-sourcemaps
-      {
-         "name": "Chrome Debug",
-         "type": "chrome",
          "request": "launch",
-         "url": "http://localhost:3000/map/",
-         "userDataDir": "${workspaceRoot}/.vscode/chrome",
-         "webRoot": "${workspaceRoot}/dist",
-         "showAsyncStacks": true,
-         "skipFiles": [
-            "jquery.js"
+         "port": 9229,
+         "address": "localhost",
+         //"program": "${workspaceRoot}/node_modules/.bin/jest",
+         "runtimeArgs": [
+            "--inspect-brk",
+            "./node_modules/jest/bin/jest.js",
+            "--runInBand",
+            "post.test.ts"
          ],
-         "sourceMaps": true
-         // "sourceMapPathOverrides": {
-         //    "/source/*": "${workspaceRoot}/*"
-         // }
+         //"args": ["post"],
+         "cwd": "${workspaceRoot}"
       },
       {
          "name": "Gulp",
@@ -69,9 +47,7 @@
          "protocol": "inspector",
          "runtimeExecutable": null,
          "stopOnEntry": true,
-         "args": [
-            "js"
-         ]
+         "args": ["js"]
       }
    ]
-}
+}

.vscode/settings.json

@@ -23,5 +23,10 @@
       "**/dist": true
    },
    "tslint.enable": true,
-   "eslint.enable": false
-}
+   "eslint.enable": false,
+   "jest.autoEnable": false,
+   "typescript.tsdk": "node_modules\\typescript\\lib",
+   "[handlebars]": {
+      "editor.formatOnSave": false
+   }
+}

.vscode/tasks.json

@@ -4,34 +4,94 @@
    "version": "2.0.0",
    "tasks": [
       {
-         "label": "Run Server",
-         "command": "./node_modules/.bin/nodemon ./lib/app.js",
+         "label": "View Heroku test logs",
+         "command": "heroku",
+         "args": ["logs", "-a", "trail-image-test"],
          "type": "shell",
-         "isBackground": true,
-         "problemMatcher": [
-            "$tsc-watch"
-         ]
+         "problemMatcher": []
+      },
+      {
+         "label": "View Heroku live logs",
+         "command": "heroku",
+         "args": ["logs", "-a", "trail-image"],
+         "type": "shell",
+         "problemMatcher": []
       },
       {
          "label": "Test",
-         "command": "npm run test-pretty",
+         "command": "./node_modules/.bin/jest",
          "type": "shell",
          "group": "test",
          "problemMatcher": []
       },
       {
          "label": "Build and Watch Client",
-         "command": "npm run watch",
+         "command": "node_modules/.bin/gulp",
+         "args": ["watch"],
+         "group": "build",
          "type": "shell",
-         "isBackground": true,
-         "problemMatcher": []
+         "problemMatcher": ["$gulp-tsc"]
+      },
+      {
+         "label": "Build Client JavaScript",
+         "command": "node_modules/.bin/gulp",
+         "args": ["js"],
+         "group": "build",
+         "type": "shell",
+         "problemMatcher": ["$gulp-tsc"]
+      },
+      {
+         "label": "Build Server",
+         "group": "build",
+         "command": "./node_modules/.bin/tsc",
+         "args": ["-p", "tsconfig.node.json"],
+         "type": "shell",
+         "problemMatcher": "$tsc"
       },
       {
          "label": "Build and Watch Server",
          "group": "build",
-         "command": "./node_modules/.bin/tsc -p tsconfig.node.json",
+         "command": "./node_modules/.bin/tsc",
+         "args": ["-p", "tsconfig.node.json", "-w"],
+         "type": "shell",
+         "problemMatcher": "$tsc"
+      },
+      {
+         "label": "Run",
+         "command": "node",
+         "args": ["./lib/app.js"],
+         "type": "shell",
+         "dependsOn": ["Build Server"],
+         "problemMatcher": []
+      },
+      {
+         "label": "Run with nodemon",
+         "group": {
+            "kind": "build",
+            "isDefault": true
+         },
+         "command": "./node_modules/.bin/nodemon",
+         "args": [
+            "--exec",
+            "./node_modules/.bin/ts-node",
+            "--",
+            "./src/app.ts"
+         ],
          "type": "shell",
          "problemMatcher": "$tsc"
+      },
+      {
+         "label": "List Production Dependencies",
+         "command": "npm",
+         "args": ["ls", "-prod=true"],
+         "type": "shell",
+         "presentation": {
+            "echo": false,
+            "reveal": "always",
+            "focus": true,
+            "panel": "shared"
+         },
+         "problemMatcher": []
       }
    ]
-}
+}