Skip to content

Commit 3796371

Browse files
committed
[changed] Use Browserify to run specs
1 parent 0e649be commit 3796371

File tree

3 files changed

+7
-56
lines changed

3 files changed

+7
-56
lines changed

karma.conf.js

+5-16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = function(config) {
33

44
basePath: '',
55

6-
frameworks: ['mocha'],
6+
frameworks: ['mocha', 'browserify'],
77

88
files: [
99
'specs/main.js'
@@ -12,23 +12,12 @@ module.exports = function(config) {
1212
exclude: [],
1313

1414
preprocessors: {
15-
'specs/main.js': ['webpack', 'sourcemap']
15+
'specs/main.js': ['browserify']
1616
},
1717

18-
webpack: {
19-
cache: true,
20-
devtool: 'inline-source-map',
21-
module: {
22-
loaders: [
23-
{test: /\.js$/, loader: 'jsx-loader'}
24-
]
25-
}
26-
},
27-
28-
webpackServer: {
29-
stats: {
30-
colors: true
31-
}
18+
browserify: {
19+
watch: true,
20+
debug: true
3221
},
3322

3423
reporters: ['progress'],

package.json

+2-7
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,18 @@
2323
"devDependencies": {
2424
"browserify": "4.2.3",
2525
"browserify-shim": "3.6.0",
26-
"bundle-loader": "0.5.0",
2726
"envify": "1.2.0",
2827
"expect": "0.1.1",
29-
"jsx-loader": "0.10.2",
3028
"karma": "0.12.16",
29+
"karma-browserify": "^0.2.1",
3130
"karma-chrome-launcher": "0.1.4",
3231
"karma-cli": "0.0.4",
3332
"karma-firefox-launcher": "0.1.3",
3433
"karma-mocha": "0.1.3",
35-
"karma-sourcemap-loader": "^0.2.0",
36-
"karma-webpack": "1.2.1",
3734
"mocha": "1.20.1",
3835
"react": ">=0.11.0",
3936
"rf-release": "0.3.1",
40-
"uglify-js": "2.4.15",
41-
"webpack": "1.2.0-beta5",
42-
"webpack-dev-server": "1.4.2"
37+
"uglify-js": "2.4.15"
4338
},
4439
"peerDependencies": {
4540
"react": ">=0.11.0"

webpack.config.js

-33
This file was deleted.

0 commit comments

Comments
 (0)