Skip to content

Commit c1c7d59

Browse files
committed
Prepare to release 0.11.0
- Updated tool versions and changed build process - Bumped version to full 0.11.0 - Fixed tests to be inline only - Removed unnecessary polyfills since grunt-contrib-jasmine uses headless chrome now - BUG: Broke code coverage. Need to fix this!
1 parent e8e551d commit c1c7d59

17 files changed

+712
-1489
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121
.baseDir.ts
2222
.baseDir.js
2323
.baseDir.js.map
24+
25+
# Ignore temporary core compile output
26+
/compiled_src/*

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
language: node_js
22
sudo: false
33
node_js:
4-
- "7.9.0"
4+
- "10.3.0"
55
before_install:
66
- npm install npm -g
77
before_script:
88
- npm install -g grunt-cli
99
script:
1010
- grunt ci
11-
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

Gruntfile.coffee

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ module.exports = (grunt) ->
1717

1818
SRC_CORE = [
1919
'src/Array.js'
20-
'src/core/js/CommentUtils.js'
21-
'src/core/js/Comment.js'
22-
'src/core/js/css-renderer/CssComment.js'
23-
'src/core/js/CommentFactory.js'
24-
'src/core/js/CommentSpaceAllocator.js'
2520
'src/CommentManager.js'
21+
'compiled_src/core/Comment.js'
22+
'compiled_src/core/CommentFactory.js'
23+
'compiled_src/core/CommentSpaceAllocator.js'
24+
'compiled_src/core/CommentUtils.js'
25+
'compiled_src/core/css-renderer/CssComment.js'
2626
]
2727

2828
SRC_MODULES =
@@ -35,10 +35,10 @@ module.exports = (grunt) ->
3535
# Typescript targets
3636
SRC_TS_CORE = [
3737
'src/core/Comment.ts'
38-
'src/core/css-renderer/CssComment.ts'
3938
'src/core/CommentFactory.ts'
4039
'src/core/CommentSpaceAllocator.ts'
4140
'src/core/CommentUtils.ts'
41+
'src/core/css-renderer/CssComment.ts'
4242
]
4343

4444
SRC_TS_SCRIPTING_KAGEROU =
@@ -61,7 +61,7 @@ module.exports = (grunt) ->
6161
CMP_CORE_TS =
6262
'core':
6363
src: SRC_TS_CORE
64-
outDir: 'src/core/js/'
64+
outDir: 'compiled_src/'
6565
CMP_CORE_NAME = ['ts:core']
6666

6767
# Dynamically generate the kagerou ts targets
@@ -78,6 +78,7 @@ module.exports = (grunt) ->
7878
options:
7979
target: 'es5'
8080
sourceMap: false
81+
rootDir: 'src/'
8182
for key,value of CMP_CORE_TS
8283
ts_config[key] = value
8384
for key,value of CMP_KAGEROU_TS
@@ -92,9 +93,9 @@ module.exports = (grunt) ->
9293
dist: ['dist']
9394

9495
# Concat CSS and JS files
95-
# dist_core : builds CCL with just the comment system
96-
# dist_all : builds CCL with everything
97-
# scripting_host : builds just the scripting host
96+
# dist_core : builds CCL with just the comment system
97+
# dist_all : builds CCL with everything
98+
# scripting_host : builds just the scripting host
9899
concat:
99100
dist_core:
100101
files:
@@ -172,40 +173,39 @@ module.exports = (grunt) ->
172173
# Jasmine test
173174
jasmine:
174175
coverage:
175-
src: 'src/**/*.js'
176+
src: ['src/**/*.js', 'compiled_src/**/*.js']
176177
options:
177-
specs: 'compiled_spec/*spec.js'
178-
helpers: 'spec/*helper.js'
178+
specs: ['compiled_spec/*_spec.js']
179+
helpers: ['compiled_spec/*_helper.js']
179180
vendor: [
180181
'node_modules/jquery/dist/jquery.js'
181-
'node_modules/jasmine-jquery/lib/jasmine-jquery.js'
182182
'node_modules/sinon/pkg/sinon.js'
183183
'node_modules/jasmine-sinon/lib/jasmine-sinon.js'
184-
'node_modules/promise-polyfill/promise.js' # TODO: remove when phantomjs supports promises
185184
]
186-
template: require('grunt-template-jasmine-istanbul')
187-
templateOptions:
188-
report: 'coverage'
189-
coverage: 'coverage/coverage.json'
185+
# Don't use this, it doesnt work anymore
186+
#template: require('grunt-template-jasmine-istanbul')
187+
#templateOptions:
188+
# report: 'coverage'
189+
# coverage: 'coverage/coverage.json'
190190
ci:
191-
src: 'dist/CommentCoreLibrary.js'
191+
src: ['dist/CommentCoreLibrary.js']
192192
options:
193-
specs: 'compiled_spec/*spec.js'
194-
helpers: 'spec/*helper.js'
193+
specs: ['compiled_spec/*_spec.js']
194+
helpers: ['compiled_spec/*_helper.js']
195195
vendor: [
196196
'node_modules/jquery/dist/jquery.js'
197-
'node_modules/jasmine-jquery/lib/jasmine-jquery.js'
198197
'node_modules/sinon/pkg/sinon.js'
199198
'node_modules/jasmine-sinon/lib/jasmine-sinon.js'
200-
'node_modules/promise-polyfill/promise.js' # TODO: remove when phantomjs supports promises
201199
]
202-
template: require('grunt-template-jasmine-istanbul')
203-
templateOptions:
204-
report:
205-
type: 'lcovonly'
206-
options:
207-
dir: 'coverage'
208-
coverage: 'coverage/coverage.json'
200+
# Don't use this, it doesnt work anymore
201+
#template: require('grunt-template-jasmine-istanbul')
202+
#templateOptions:
203+
# report:
204+
# type: 'lcovonly'
205+
# options:
206+
# dir: 'coverage'
207+
# coverage: 'coverage/coverage.json'
208+
209209
coffee:
210210
glob_to_multiple:
211211
expand: true,

0 commit comments

Comments
 (0)