Skip to content

Commit

Permalink
Fix failing travis-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
John Nguyen committed Jan 23, 2018
1 parent cd629d1 commit 4601a4e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
sudo: required
dist: trusty
addons:
chrome: stable
before_script:
- "sudo chown root /opt/google/chrome/chrome-sandbox"
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
addons:
chrome: stable

language: node_js

node_js:
Expand Down
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const path = require("path")
const { version } = require("./package.json");
const webpackConfig = require("./webpack.test.js")

module.exports = function(config) {
Expand All @@ -21,7 +20,7 @@ module.exports = function(config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: false,
browsers: ['Chrome'],
browsers: ['Chrome', 'ChromeHeadless'],
singleRun: true,
concurrency: Infinity
})
Expand Down
9 changes: 0 additions & 9 deletions webpack.common.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require("path");
const webpack = require("webpack");
const { version } = require("./package.json");

module.exports = {
entry: path.join(__dirname, "lib", "index.js"),
Expand All @@ -9,14 +8,6 @@ module.exports = {
filename: "[name].js"
},
devtool: "source-map",
plugins: [
new webpack.DefinePlugin({
"process.env": {
NODE_ENV: '"webpack"'
},
__VERSION__: JSON.stringify(version)
})
],
module: {
rules: [
{ test: /\.js$/, exclude: /node_modules/, loader: "babel-loader" },
Expand Down
2 changes: 1 addition & 1 deletion webpack.production.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ module.exports = webpackMerge(commonConfig, {
},
plugins: [
new CleanWebpackPlugin(["dist"], {root: process.cwd()})
],
]
})

0 comments on commit 4601a4e

Please sign in to comment.