Skip to content

Commit 1ae2994

Browse files
committed
Update dependencies and use grunt-ts instead of grunt-typescript for compiling typescript.
1 parent 21ae497 commit 1ae2994

21 files changed

+441
-806
lines changed

.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
@@ -44,28 +44,24 @@ module.exports = (grunt) ->
4444
CMP_CORE_TS = { }
4545
CMP_CORE_NAME = [ ]
4646
for target in SRC_CORE_CMP
47-
CMP_CORE_NAME.push ("typescript:" + target)
47+
CMP_CORE_NAME.push ("ts:" + target)
4848
CMP_CORE_TS[target] =
49-
options:
50-
target: 'es5'
51-
basePath: 'src/core'
52-
src: "src/core/" + target + ".ts"
53-
dest: "src/core/" + target + ".js"
49+
src: ["src/core/" + target + ".ts"]
50+
out: "src/core/" + target + ".js"
5451

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

6761
# Append Typescript Tasks
68-
ts_config = {}
62+
ts_config =
63+
options:
64+
target: 'es5'
6965
for key,value of CMP_CORE_TS
7066
ts_config[key] = value
7167
for key,value of CMP_KAGEROU_TS
@@ -99,7 +95,7 @@ module.exports = (grunt) ->
9995
'build/CommentCoreLibrary.js': SRC_CORELIB
10096

10197
# Compile TypeScript
102-
typescript: ts_config
98+
ts: ts_config
10399

104100
# Copy
105101
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)