merge with develop

5 years ago · 9e949d5439
3 changed files with 867 additions and 17 deletions
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@ -9,7 +9,8 @@
    "noImplicitAny": true,
    "esModuleInterop": true,
    "resolveJsonModule": true,
-    "incremental": true
+    "incremental": true,
    "types": [ "node", "jest"],
  },
  "include": [
    "./src/**/*",
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -13,6 +13,10 @@
    },
    "./package.json": "./package.json"
  },
  "files": [
    "dist",
    "src"
  ],
  "scripts": {
    "build": "tsc && rollup -c",
    "dev:builder": "tsc && rollup -cw",