Skip to content
This repository has been archived by the owner on Nov 6, 2022. It is now read-only.

Commit

Permalink
Merge pull request #159 from trailimage/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Jason-Abbott committed Sep 30, 2019
2 parents 4a6f677 + beb274a commit 4eea1ee
Show file tree
Hide file tree
Showing 57 changed files with 1,192 additions and 2,024 deletions.
14 changes: 14 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@
"cwd": "${workspaceRoot}",
"protocol": "inspector"
},
{
// https://github.com/whitecolor/ts-node-dev/issues/9
// https://github.com/whitecolor/ts-node-dev/issues/64
"name": "Server (ts-node-dev)",
"type": "node",
"request": "launch",
"args": ["${workspaceRoot}/src/app.ts"],
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/ts-node-dev",
//"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
"sourceMaps": true,
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"restart": true
},
{
"name": "Jest",
"type": "node",
Expand Down
41 changes: 37 additions & 4 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@
},
{
"label": "Run with nodemon",
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"group": "run"
},
Expand All @@ -111,6 +107,43 @@
},
"problemMatcher": "$tsc"
},
{
"label": "Run with ts-node-dev",
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"group": "run",
"clear": true,
"echo": false
},
"command": "./node_modules/.bin/ts-node-dev",
"args": [
"--respawn",
"--clear",
"--no-notify",
"--watch",
"views",
"--ignore-watch",
"src/client",
"--debounce",
"4000",
"--project",
"tsconfig.node.json",
//"--transpileOnly",
"--",
"./src/app.ts",
"--serve"
],
"type": "shell",
"options": {
"env": {
"EMAIL_CONTACT": "nobody@nowhere.com"
}
},
"problemMatcher": "$tsc"
},
{
"label": "List Production Dependencies",
"command": "npm",
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
## 5.0.0

- Change layout
- Simplify category selector (remove JavaScript)
- Remove Google Analytics (unecessary privacy invasion)
- Remove Facebook "Like" button
- Remove Twitter link and API

## 4.3.1

- Update Google API and other dependencies
- Update Google API and other dependencies

## 4.3.0

Expand Down
5 changes: 0 additions & 5 deletions nodemon.json

This file was deleted.

Loading

0 comments on commit 4eea1ee

Please sign in to comment.