Skip to content

Commit 63face2

Browse files
committed
Merge PR 26 to convert gulp tasks to npm scripts
2 parents 030fe14 + 44e0479 commit 63face2

File tree

8 files changed

+1024
-2030
lines changed

8 files changed

+1024
-2030
lines changed

.eslintrc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ rules:
2323
semi:
2424
- error
2525
- always
26+
no-console:
27+
- error
28+
- allow:
29+
- error

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ before_install:
1818
before_script:
1919
- npm install
2020
script:
21-
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then gulp ci; else gulp test-pr; fi
21+
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run lint && npm run test-ci; else npm run test-pr; fi

dist/stackframe.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/stackframe.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

karma.conf.ci.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = function(config) {
22
if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) {
3-
console.log('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
3+
console.error('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
44
process.exit(1);
55
}
66

@@ -156,7 +156,7 @@ module.exports = function(config) {
156156
},
157157
customLaunchers: customLaunchers,
158158
browsers: Object.keys(customLaunchers),
159-
reporters: ['dots', 'saucelabs', 'coverage'],
159+
reporters: ['dots', 'saucelabs', 'coverage', 'coveralls'],
160160
preprocessors: {
161161
'stackframe.js': 'coverage'
162162
},

0 commit comments

Comments
 (0)