diff --git a/scripts/build b/scripts/build index a3dccd46..3c551801 100755 --- a/scripts/build +++ b/scripts/build @@ -1,5 +1,5 @@ #!/bin/bash -npm run webpack -npm run tslint +npm run webpack && +npm run tslint && npm test \ No newline at end of file diff --git a/scripts/test-compile b/scripts/test-compile index 5fc04bec..6d0ca7fa 100755 --- a/scripts/test-compile +++ b/scripts/test-compile @@ -1,4 +1,4 @@ #!/bin/bash -$(npm bin)/tsc -p tsconfig-test.json +$(npm bin)/tsc -p tsconfig-test.json && $(npm bin)/babel test-tmp --out-dir test-tmp --source-maps inline --presets es2015 \ No newline at end of file diff --git a/scripts/test-coveralls b/scripts/test-coveralls index 03e4615a..dbeffbe4 100755 --- a/scripts/test-coveralls +++ b/scripts/test-coveralls @@ -1,6 +1,6 @@ #!/bin/bash -npm run test:compile -$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js --report lcovonly -cat ./coverage/lcov.info | $(npm bin)/coveralls +npm run test:compile && +$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js --report lcovonly && +cat ./coverage/lcov.info | $(npm bin)/coveralls && npm run test:removeTmpDir \ No newline at end of file diff --git a/scripts/test-full b/scripts/test-full index e7cfc94f..bd2a5535 100755 --- a/scripts/test-full +++ b/scripts/test-full @@ -1,6 +1,6 @@ #!/bin/bash -npm run test:compile -node test-tmp/test/dev/test.js -$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js +npm run test:compile && +node test-tmp/test/dev/test.js && +$(npm bin)/istanbul cover $(npm bin)/_mocha -- test-tmp/test/index.spec.js && npm run test:removeTmpDir \ No newline at end of file diff --git a/scripts/test-mocha b/scripts/test-mocha index 03570593..b6523b91 100755 --- a/scripts/test-mocha +++ b/scripts/test-mocha @@ -1,5 +1,5 @@ #!/bin/bash -npm run test:compile -$(npm bin)/mocha test-tmp/test/index.spec.js +npm run test:compile && +$(npm bin)/mocha test-tmp/test/index.spec.js && npm run test:removeTmpDir \ No newline at end of file diff --git a/scripts/travis b/scripts/travis index 2d4e4775..8ebc6706 100755 --- a/scripts/travis +++ b/scripts/travis @@ -1,4 +1,4 @@ #!/bin/bash -npm run tslint +npm run tslint && npm test \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index b3d2861e..036f0f17 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,23 +12,7 @@ ${fs.readFileSync('./LICENSE.BSD', 'utf8')} */`; } -const isTravisEnv = process.env.TRAVIS ? JSON.parse(process.env.TRAVIS) : false; -const plugins = [ - new webpack.BannerPlugin( - { - banner: `${getLicenseText()}\n\nrequire("source-map-support").install();\n`, - raw: true, - entryOnly: false - } - ) -]; - -if (isTravisEnv) { - plugins.push(new webpack.NoErrorsPlugin()); -} - module.exports = { - bail: isTravisEnv, entry: { 'index': './index.ts' }, @@ -44,7 +28,15 @@ module.exports = { extensions: ['', '.ts'], modulesDirectories: ['./src', './node_modules'] }, - plugins: plugins, + plugins: [ + new webpack.BannerPlugin( + { + banner: `${getLicenseText()}\n\nrequire("source-map-support").install();\n`, + raw: true, + entryOnly: false + } + ) + ], output: { path: './dist', filename: '[name].js',