From 314ff6777aafe677366be50caba4cc5921a92bc4 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Thu, 23 Feb 2017 00:54:08 +0900
Subject: [PATCH] Separate tsconfig.json so that ts-node can work with
 gulpfile.ts

---
 gulpfile.js       |  1 -
 gulpfile.ts       | 48 +++++++++++++++++++++++------------------------
 package.json      |  1 +
 src/tsconfig.json | 23 +++++++++++++++++++++++
 tsconfig.json     | 42 ++++++++++++++++++-----------------------
 5 files changed, 66 insertions(+), 49 deletions(-)
 delete mode 100644 gulpfile.js
 create mode 100644 src/tsconfig.json

diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 5bd947f72d..0000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1 +0,0 @@
-eval(require('typescript').transpile(require('fs').readFileSync('./gulpfile.ts').toString()));
diff --git a/gulpfile.ts b/gulpfile.ts
index f7503912ce..8e36b56646 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -8,7 +8,7 @@ import * as gulp from 'gulp';
 import * as gutil from 'gulp-util';
 import * as babel from 'gulp-babel';
 import * as ts from 'gulp-typescript';
-import * as tslint from 'gulp-tslint';
+import tslint from 'gulp-tslint';
 import * as glob from 'glob';
 import * as es from 'event-stream';
 import * as webpack from 'webpack-stream';
@@ -32,7 +32,7 @@ if (isDebug) {
 
 const constants = require('./src/const.json');
 
-const tsProject = ts.createProject('tsconfig.json');
+const tsProject = ts.createProject('./src/tsconfig.json');
 
 gulp.task('build', [
 	'build:js',
@@ -92,11 +92,11 @@ gulp.task('build:copy', () =>
 		gulp.src([
 			'./src/**/resources/**/*',
 			'!./src/web/app/**/resources/**/*'
-		]).pipe(gulp.dest('./built/')),
+		]).pipe(gulp.dest('./built/')) as any,
 		gulp.src([
 			'./src/web/about/**/*',
 			'!./src/web/about/**/*.pug'
-		]).pipe(gulp.dest('./built/web/about/'))
+		]).pipe(gulp.dest('./built/web/about/')) as any
 	)
 );
 
@@ -155,8 +155,8 @@ gulp.task('build:client:scripts', () => new Promise(async (ok) => {
 	}
 
 	es.merge(
-		stream.pipe(gulp.dest('./built/web/resources/')),
-		entryPointStream.pipe(gulp.dest('./built/web/resources/client/'))
+		stream.pipe(gulp.dest('./built/web/resources/')) as any,
+		entryPointStream.pipe(gulp.dest('./built/web/resources/client/')) as any
 	);
 
 	ok();
@@ -165,7 +165,7 @@ gulp.task('build:client:scripts', () => new Promise(async (ok) => {
 gulp.task('build:client:styles', () =>
 	gulp.src('./src/web/app/init.css')
 		.pipe(isProduction
-			? cssnano()
+			? (cssnano as any)()
 			: gutil.noop())
 		.pipe(gulp.dest('./built/web/resources/'))
 );
@@ -173,16 +173,16 @@ gulp.task('build:client:styles', () =>
 gulp.task('copy:client', [
 	'build:client:scripts'
 ], () =>
-	gulp.src([
-		'./resources/**/*',
-		'./src/web/resources/**/*',
-		'./src/web/app/*/resources/**/*'
-	])
-	.pipe(isProduction ? imagemin() : gutil.noop())
-	.pipe(rename(path => {
-		path.dirname = path.dirname.replace('resources', '.');
-	}))
-	.pipe(gulp.dest('./built/web/resources/'))
+		gulp.src([
+			'./resources/**/*',
+			'./src/web/resources/**/*',
+			'./src/web/app/*/resources/**/*'
+		])
+			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
+			.pipe(rename(path => {
+				path.dirname = path.dirname.replace('resources', '.');
+			}))
+			.pipe(gulp.dest('./built/web/resources/'))
 );
 
 gulp.task('build:client:pug', [
@@ -190,11 +190,11 @@ gulp.task('build:client:pug', [
 	'build:client:scripts',
 	'build:client:styles'
 ], () =>
-	gulp.src('./src/web/app/*/view.pug')
-		.pipe(pug({
-			locals: {
-				themeColor: constants.themeColor
-			}
-		}))
-		.pipe(gulp.dest('./built/web/app/'))
+		gulp.src('./src/web/app/*/view.pug')
+			.pipe(pug({
+				locals: {
+					themeColor: constants.themeColor
+				}
+			}))
+			.pipe(gulp.dest('./built/web/app/'))
 );
diff --git a/package.json b/package.json
index ae4c817643..2eb26f6e94 100644
--- a/package.json
+++ b/package.json
@@ -137,6 +137,7 @@
     "syuilo-password-strength": "0.0.1",
     "tcp-port-used": "0.1.2",
     "textarea-caret": "3.0.2",
+    "ts-node": "2.1.0",
     "tslint": "4.4.2",
     "typescript": "2.1.6",
     "uuid": "3.0.1",
diff --git a/src/tsconfig.json b/src/tsconfig.json
new file mode 100644
index 0000000000..2909810da0
--- /dev/null
+++ b/src/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noUnusedParameters": false,
+    "noUnusedLocals": true,
+    "noFallthroughCasesInSwitch": true,
+    "declaration": false,
+    "sourceMap": false,
+    "target": "es6",
+    "module": "commonjs",
+    "removeComments": false,
+    "noLib": false
+  },
+  "compileOnSave": false,
+  "include": [
+    "./**/*.ts"
+  ],
+  "exclude": [
+    "./web/app/**/*.ts"
+  ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 24925687a6..515d1847b0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,26 +1,20 @@
 {
-	"compilerOptions": {
-		"noEmitOnError": false,
-		"noImplicitAny": false,
-		"noImplicitReturns": true,
-		"noUnusedParameters": false,
-		"noUnusedLocals": true,
-		"noFallthroughCasesInSwitch": true,
-		"declaration": false,
-		"sourceMap": false,
-		"target": "es6",
-		"module": "commonjs",
-		"removeComments": false,
-		"noLib": false,
-		"outDir": "built",
-		"rootDir": "src"
-	},
-	"compileOnSave": false,
-	"include": [
-		"./node_modules/typescript/lib/lib.es6.d.ts",
-		"./src/**/*.ts"
-	],
-	"exclude": [
-		"./src/web/app/**/*.ts"
-	]
+  "compilerOptions": {
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noUnusedParameters": false,
+    "noUnusedLocals": true,
+    "noFallthroughCasesInSwitch": true,
+    "declaration": false,
+    "sourceMap": false,
+    "target": "es6",
+    "module": "commonjs",
+    "removeComments": false,
+    "noLib": false
+  },
+  "compileOnSave": false,
+  "include": [
+    "./gulpfile.ts"
+  ]
 }