From f9b2444e4c9e710ac4fbc6b21e813193881faa90 Mon Sep 17 00:00:00 2001 From: ark120202 Date: Wed, 27 Mar 2019 23:50:32 +0500 Subject: [PATCH 1/2] Add shared tsconfig --- README.md | 12 ++++++------ package.json | 1 + tsconfig-lua.json | 7 +++++++ 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 tsconfig-lua.json diff --git a/README.md b/README.md index 61009e43a..3c5fa9ce9 100644 --- a/README.md +++ b/README.md @@ -38,15 +38,15 @@ Changelog can be found in [CHANGELOG.md](https://github.com/TypeScriptToLua/Type `tstl -p path/to/tsconfig.json --watch` **Example tsconfig.json** -``` +```json { + "extends": "typescript-to-lua/tsconfig-lua.json", "compilerOptions": { - "noImplicitAny" : true, - "noImplicitThis" : true, - "alwaysStrict" : true, - "strictNullChecks": true + "strict": true }, - "luaTarget": "JIT" + "tstl": { + "luaTarget": "JIT" + } } ``` diff --git a/package.json b/package.json index c99850749..15bccc90c 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "transpiler" ], "files": [ + "tsconfig-lua.json", "dist/**/*.js", "dist/**/*.lua", "dist/**/*.ts" diff --git a/tsconfig-lua.json b/tsconfig-lua.json new file mode 100644 index 000000000..906e1b0fc --- /dev/null +++ b/tsconfig-lua.json @@ -0,0 +1,7 @@ +{ + "compilerOptions": { + "target": "esnext", + "lib": ["es2015", "es2016", "es2017", "es2018", "esnext"], + "moduleResolution": "classic" + } +} From e3bb1b43c3eda5a15f4def6dacf611a0c386e74b Mon Sep 17 00:00:00 2001 From: ark120202 Date: Thu, 28 Mar 2019 00:52:42 +0500 Subject: [PATCH 2/2] Remove shared tsconfig and change example instead --- README.md | 3 ++- package.json | 1 - tsconfig-lua.json | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 tsconfig-lua.json diff --git a/README.md b/README.md index 3c5fa9ce9..6051d5be8 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,9 @@ Changelog can be found in [CHANGELOG.md](https://github.com/TypeScriptToLua/Type **Example tsconfig.json** ```json { - "extends": "typescript-to-lua/tsconfig-lua.json", "compilerOptions": { + "target": "esnext", + "lib": ["es2015", "es2016", "es2017", "es2018", "esnext"], "strict": true }, "tstl": { diff --git a/package.json b/package.json index 15bccc90c..c99850749 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "transpiler" ], "files": [ - "tsconfig-lua.json", "dist/**/*.js", "dist/**/*.lua", "dist/**/*.ts" diff --git a/tsconfig-lua.json b/tsconfig-lua.json deleted file mode 100644 index 906e1b0fc..000000000 --- a/tsconfig-lua.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "compilerOptions": { - "target": "esnext", - "lib": ["es2015", "es2016", "es2017", "es2018", "esnext"], - "moduleResolution": "classic" - } -}