diff --git a/karma.conf.js b/karma.conf.js index f1ae2be096..9fc2ea0ac0 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -3,7 +3,7 @@ module.exports = function(config) { basePath: '', - frameworks: ['mocha'], + frameworks: ['mocha', 'browserify'], files: [ 'specs/main.js' @@ -12,23 +12,12 @@ module.exports = function(config) { exclude: [], preprocessors: { - 'specs/main.js': ['webpack', 'sourcemap'] + 'specs/main.js': ['browserify'] }, - webpack: { - cache: true, - devtool: 'inline-source-map', - module: { - loaders: [ - {test: /\.js$/, loader: 'jsx-loader'} - ] - } - }, - - webpackServer: { - stats: { - colors: true - } + browserify: { + watch: true, + debug: true }, reporters: ['progress'], diff --git a/package.json b/package.json index 1720c94c2a..7dbe8f23bd 100644 --- a/package.json +++ b/package.json @@ -23,23 +23,18 @@ "devDependencies": { "browserify": "4.2.3", "browserify-shim": "3.6.0", - "bundle-loader": "0.5.0", "envify": "1.2.0", "expect": "0.1.1", - "jsx-loader": "0.10.2", "karma": "0.12.16", + "karma-browserify": "^0.2.1", "karma-chrome-launcher": "0.1.4", "karma-cli": "0.0.4", "karma-firefox-launcher": "0.1.3", "karma-mocha": "0.1.3", - "karma-sourcemap-loader": "^0.2.0", - "karma-webpack": "1.2.1", "mocha": "1.20.1", "react": ">=0.11.0", "rf-release": "0.3.1", - "uglify-js": "2.4.15", - "webpack": "1.2.0-beta5", - "webpack-dev-server": "1.4.2" + "uglify-js": "2.4.15" }, "peerDependencies": { "react": ">=0.11.0" diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index 5f543c4b67..0000000000 --- a/webpack.config.js +++ /dev/null @@ -1,33 +0,0 @@ -var path = require('path'); -var fs = require('fs'); - -function buildEntries() { - return fs.readdirSync('examples').reduce(function(entries, dir) { - if (dir === 'build') { - return entries; - } - var isDraft = dir.charAt(0) === '_'; - if (!isDraft && fs.lstatSync(path.join('examples', dir)).isDirectory()) { - entries[dir] = './examples/'+dir+'/'+'app.js'; - } - return entries; - }, {}); -} - -module.exports = { - entry: buildEntries(), - - output: { - filename: '[name].js', - chunkFilename: '[id].chunk.js', - path: path.join(__dirname, 'examples', 'build'), - publicPath: '../build/' - }, - - module: { - loaders: [ - {test: /\.js$/, loader: 'jsx-loader'} - ] - } -}; -