Skip to content

Commit 4b3d37a

Browse files
committed
Update dependencies and use grunt-ts instead of grunt-typescript for compiling typescript.
1 parent 7699890 commit 4b3d37a

22 files changed

Lines changed: 503 additions & 920 deletions

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44

55
# Ignore Node Modules
66
/node_modules/*
7+
8+
# Ignore CI
79
/compiled_spec/*
810
/coverage/*
11+
12+
# Ignore tscache
13+
.tscache

Gruntfile.coffee

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,24 @@ module.exports = (grunt) ->
4646
CMP_CORE_TS = { }
4747
CMP_CORE_NAME = [ ]
4848
for target in SRC_CORE_CMP
49-
CMP_CORE_NAME.push ("typescript:" + target)
49+
CMP_CORE_NAME.push ("ts:" + target)
5050
CMP_CORE_TS[target] =
51-
options:
52-
target: 'es5'
53-
basePath: 'src/core'
54-
src: "src/core/" + target + ".ts"
55-
dest: "src/core/" + target + ".js"
51+
src: ["src/core/" + target + ".ts"]
52+
out: "src/core/" + target + ".js"
5653

5754
# Dynamically generate the kagerou ts targets
5855
CMP_KAGEROU_TS = { }
5956
CMP_KAGEROU_NAME = [ ]
6057
for target,src of SRC_SCRIPTING_KAGEROU
61-
CMP_KAGEROU_NAME.push ('typescript:kagerou_engine_' + target)
58+
CMP_KAGEROU_NAME.push ('ts:kagerou_engine_' + target)
6259
CMP_KAGEROU_TS['kagerou_engine_' + target] =
63-
options:
64-
target: 'es5'
65-
basePath: src.split('/')[0..-1].join('/')
6660
src: src
67-
dest: 'build/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
61+
out: 'build/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
6862

6963
# Append Typescript Tasks
70-
ts_config = {}
64+
ts_config =
65+
options:
66+
target: 'es5'
7167
for key,value of CMP_CORE_TS
7268
ts_config[key] = value
7369
for key,value of CMP_KAGEROU_TS
@@ -101,7 +97,7 @@ module.exports = (grunt) ->
10197
'build/CommentCoreLibrary.js': SRC_CORELIB
10298

10399
# Compile TypeScript
104-
typescript: ts_config
100+
ts: ts_config
105101

106102
# Copy
107103
copy:

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "comment-core-library",
3-
"version": "0.9.2",
3+
"version": "0.9.3",
44
"main": ["build/CommentCoreLibrary.js","build/style.css"],
55
"ignore": [
66
"test/**/*",

0 commit comments

Comments
 (0)