Skip to content

Commit 0fabc18

Browse files
mjacksonmjackson
committed
Revert "Merge pull request remix-run#2492 from taion/housekeeping"
This reverts commit 0825e9b, reversing changes made to c6968d5.
1 parent 9ee114e commit 0fabc18

6 files changed

+142
-170
lines changed

‎.travis.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
1-
sudo: false
2-
31
language: node_js
42
node_js:
5-
- stable
6-
7-
cache:
8-
directories:
9-
- node_modules
10-
3+
- "4"
4+
sudo: false
115
before_script:
126
- wget http://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip
137
- unzip BrowserStackLocal-linux-x64.zip
148
- "./BrowserStackLocal $BROWSER_STACK_ACCESS_KEY localhost,8001,0 > /dev/null &"
159
- sleep 10
16-
1710
after_success:
1811
- cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
1912
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
20-
2113
branches:
22-
only:
23-
- master
14+
except:
15+
- latest
16+
- "/^v\\d/"

‎karma.conf.babel.js

-151
This file was deleted.

‎karma.conf.js

+131-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,131 @@
1-
require('babel-core/register')
2-
module.exports = require('./karma.conf.babel.js')
1+
var webpack = require('webpack')
2+
var path = require('path')
3+
4+
module.exports = function (config) {
5+
// Browsers to run on BrowserStack
6+
var customLaunchers = {
7+
BS_Chrome: {
8+
base: 'BrowserStack',
9+
os: 'Windows',
10+
os_version: '8.1',
11+
browser: 'chrome',
12+
browser_version: '39.0'
13+
},
14+
BS_Firefox: {
15+
base: 'BrowserStack',
16+
os: 'Windows',
17+
os_version: '8.1',
18+
browser: 'firefox',
19+
browser_version: '32.0'
20+
},
21+
BS_Safari: {
22+
base: 'BrowserStack',
23+
os: 'OS X',
24+
os_version: 'Yosemite',
25+
browser: 'safari',
26+
browser_version: '8.0'
27+
},
28+
BS_MobileSafari: {
29+
base: 'BrowserStack',
30+
os: 'ios',
31+
os_version: '7.0',
32+
browser: 'iphone',
33+
real_mobile: false
34+
},
35+
// BS_InternetExplorer9: {
36+
// base: 'BrowserStack',
37+
// os: 'Windows',
38+
// os_version: '7',
39+
// browser: 'ie',
40+
// browser_version: '9.0'
41+
// },
42+
BS_InternetExplorer10: {
43+
base: 'BrowserStack',
44+
os: 'Windows',
45+
os_version: '8',
46+
browser: 'ie',
47+
browser_version: '10.0'
48+
},
49+
BS_InternetExplorer11: {
50+
base: 'BrowserStack',
51+
os: 'Windows',
52+
os_version: '8.1',
53+
browser: 'ie',
54+
browser_version: '11.0'
55+
}
56+
}
57+
58+
config.set({
59+
customLaunchers: customLaunchers,
60+
61+
browsers: [ 'Chrome' ],
62+
frameworks: [ 'mocha' ],
63+
reporters: [ 'mocha', 'coverage' ],
64+
65+
files: [
66+
'tests.webpack.js'
67+
],
68+
69+
preprocessors: {
70+
'tests.webpack.js': [ 'webpack', 'sourcemap' ]
71+
},
72+
73+
webpack: {
74+
devtool: 'inline-source-map',
75+
module: {
76+
loaders: [
77+
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
78+
{ test: /\.js$/, exclude: /__tests__/, include: path.resolve('modules/'), loader: 'isparta' }
79+
]
80+
},
81+
plugins: [
82+
new webpack.DefinePlugin({
83+
'process.env.NODE_ENV': JSON.stringify('test')
84+
})
85+
]
86+
},
87+
88+
webpackServer: {
89+
noInfo: true
90+
},
91+
92+
coverageReporter: {
93+
reporters: [
94+
{ type: 'html', subdir: 'html' },
95+
{ type: 'lcovonly', subdir: '.' }
96+
]
97+
}
98+
})
99+
100+
if (process.env.USE_CLOUD) {
101+
config.browsers = Object.keys(customLaunchers)
102+
config.reporters = [ 'dots', 'coverage' ]
103+
config.browserDisconnectTimeout = 10000
104+
config.browserDisconnectTolerance = 3
105+
config.browserNoActivityTimeout = 30000
106+
config.captureTimeout = 120000
107+
108+
if (process.env.TRAVIS) {
109+
var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
110+
111+
config.browserStack = {
112+
username: process.env.BROWSER_STACK_USERNAME,
113+
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
114+
pollingTimeout: 10000,
115+
startTunnel: false,
116+
project: 'react-router',
117+
build: buildLabel,
118+
name: process.env.TRAVIS_JOB_NUMBER
119+
}
120+
121+
config.singleRun = true
122+
} else {
123+
config.browserStack = {
124+
username: process.env.BROWSER_STACK_USERNAME,
125+
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
126+
pollingTimeout: 10000,
127+
startTunnel: true
128+
}
129+
}
130+
}
131+
}

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"build": "babel ./modules -d lib --ignore '__tests__'",
2121
"build-umd": "NODE_ENV=production webpack modules/index.js umd/ReactRouter.js",
2222
"build-min": "NODE_ENV=production webpack -p modules/index.js umd/ReactRouter.min.js",
23-
"lint": "eslint modules examples *.js",
23+
"lint": "eslint modules examples",
2424
"start": "node examples/server.js",
2525
"test": "npm run lint && karma start",
2626
"postinstall": "node ./npm-scripts/postinstall.js"
@@ -60,6 +60,7 @@
6060
"karma-browserstack-launcher": "^0.1.4",
6161
"karma-chrome-launcher": "^0.2.0",
6262
"karma-coverage": "^0.5.3",
63+
"karma-firefox-launcher": "^0.1.6",
6364
"karma-mocha": "^0.2.0",
6465
"karma-mocha-reporter": "^1.1.1",
6566
"karma-sourcemap-loader": "^0.3.5",

‎tests.webpack.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
const context = require.context('./modules', true, /-test\.js$/)
2-
context.keys().forEach(context)
1+
var context = require.context('./modules', true, /-test\.js$/);
2+
context.keys().forEach(context);

‎webpack.config.babel.js ‎webpack.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import webpack from 'webpack'
1+
var webpack = require('webpack')
22

3-
export default {
3+
module.exports = {
44

55
output: {
66
library: 'ReactRouter',

0 commit comments

Comments
 (0)