Update tsconfig files and switch to _build for outputs, for consistency with main grist repo

.gitignore

@@ -1,5 +1,5 @@
 /node_modules/
-/build/
+/_build/
 /static/*.bundle.js
 /static/*.bundle.js.map
 

app/client/tsconfig.json

@@ -1,9 +1,6 @@
 {
-    "extends": "../../buildtools/tsconfig-base.json",
+  "extends": "../../buildtools/tsconfig-base.json",
-    "compilerOptions": {
+  "references": [
-        "outDir": "../../build/app/client"
+    { "path": "../common" }
-    },
+  ]
-    "references": [
-        { "path": "../common" }
-    ]
 }

app/common/tsconfig.json

@@ -1,6 +1,3 @@
 {
-    "extends": "../../buildtools/tsconfig-base.json",
+  "extends": "../../buildtools/tsconfig-base.json",
-    "compilerOptions": {
-        "outDir": "../../build/app/common",
-    }
 }

app/server/tsconfig.json

@@ -1,9 +1,6 @@
 {
-    "extends": "../../buildtools/tsconfig-base.json",
+  "extends": "../../buildtools/tsconfig-base.json",
-    "compilerOptions": {
+  "references": [
-        "outDir": "../../build/app/server",
+    { "path": "../common" }
-    },
+  ]
-    "references": [
-        { "path": "../common" }
-    ]
 }

app/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "files": [],
-    "include": [],
+  "include": [],
-    "references": [
+  "references": [
-      { "path": "./client" },
+    { "path": "./client" },
-      { "path": "./server" },
+    { "path": "./server" },
-      { "path": "./common" },
+    { "path": "./common" },
-    ]
+  ]
 }

buildtools/tsconfig-base.json

@@ -8,7 +8,16 @@
     "noImplicitAny": true,
     "noUnusedLocals": true,
     "moduleResolution": "node",
+    "allowJs": true,
     "baseUrl": "..",
+    "rootDir": "..",
+    "outDir": "../_build",
+    "paths": {
+      "*": [
+        "*",
+        "grist-core/*",
+      ],
+    },
     "composite": true,
     "plugins": [{
       "name": "typescript-tslint-plugin"

buildtools/webpack.config.js

@@ -7,7 +7,7 @@ const path = require('path');
 module.exports = {
   target: 'web',
   entry: {
-    main: "./build/app/client/index.js",
+    main: "app/client/index.js",
   },
   output: {
     filename: "[name].bundle.js",
@@ -33,7 +33,7 @@ module.exports = {
   devtool: "source-map",
   resolve: {
     modules: [
-      path.resolve('./build'),
+      path.resolve('./_build'),
       path.resolve('./node_modules')
     ],
   },

package.json

@@ -4,9 +4,9 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "tsc --build app -w --preserveWatchOutput & webpack --config buildtools/webpack.config.js --mode development --watch --hide-modules & nodemon -w build/app/server -w build/app/common build/app/server/server & wait",
+    "start": "tsc --build -w --preserveWatchOutput & webpack --config buildtools/webpack.config.js --mode development --watch --hide-modules & nodemon -w _build/app/server -w _build/app/common _build/app/server/server & wait",
-    "build:prod": "tsc --build app && webpack --config buildtools/webpack.config.js --mode production",
+    "build:prod": "tsc --build && webpack --config buildtools/webpack.config.js --mode production",
-    "start:prod": "node build/app/server/server"
+    "start:prod": "node _build/app/server/server"
   },
   "keywords": [],
   "author": "",

tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./buildtools/tsconfig-base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    { "path": "./app" },
+    // { "path": "./test" },
+  ]
+}