feat: move root and out options to tsconfig (#13)

google · Aug 4, 2017 · 443edfa · 443edfa
1 parent 4ffa71c
commit 443edfa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "build": "npm run compile",
     "clean": "rm -rf ./build/",
-    "compile": "tsc -p . --rootDir . --outDir build/",
+    "compile": "tsc -p .",
     "format-check": "echo \"TODO\"",
     "format": "clang-format -i -style='{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}' src/*.ts",
     "lint": "tslint -c tslint.json  --project . --type-check -t codeFrame",

diff --git a/src/init.ts b/src/init.ts
@@ -52,11 +52,10 @@ async function query(
 async function addScripts(
     packageJson: any, options: Options): Promise<boolean> {
   let edits = false;
-  const outDir = 'build/';
   const scripts: Bag<string> = {
     build: 'npm run compile',
     clean: 'rm -rf ./build/',
-    compile: `tsc -p . --rootDir . --outDir ${outDir}`,
+    compile: `tsc -p .`,
     fix: `gts fix`,
     lint: `gts lint`
   };
@@ -156,6 +155,7 @@ async function generateTsConfig(options: Options): Promise<void> {
   const tsconfig = JSON.stringify(
       {
         extends: `${path.join(pkgDir, 'tsconfig-google.json')}`,
+        compilerOptions: {rootDir: '.', outDir: 'build'},
         include: ['src/*.ts', 'src/**/*.ts', 'test/*.ts', 'test/**/*.ts'],
         exclude: ['node_modules']
       },

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "./tsconfig-google.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "build"
+  },
   "include": [
     "src/*.ts",
     "test/*.ts"