Skip to content

Commit

Permalink
updated to webcompiler 1.4.0 [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
thealjey committed Aug 19, 2015
1 parent 9df0908 commit cbba809
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 140 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: node_js
node_js:
- "iojs"
- "iojs-v2.5.0"
after_script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### v2.0.3

* updated webcompiler to v1.4.0, which allowed to significantly simplify and improve the process of the creation of a
development server

### v2.0.1

* updated webcompiler to 1.3.1
Expand Down
60 changes: 3 additions & 57 deletions bin/server.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,11 @@
/* @flow */

/* @noflow */
import {SASS} from 'webcompiler';

/* @noflow */
import {DirectoryWatcher} from 'simple-recursive-watch';
import WebpackDevServer from 'webpack-dev-server';
import webpack from 'webpack';
import {DevServer} from 'webcompiler';
import {join} from 'path';
import tinylr from 'tiny-lr';

var rootDir = join(__dirname, '..'),
compiler = new SASS(),
lr = tinylr(),
devDir = join(rootDir, 'development'),
inPath = join(devDir, 'script.js'),
webSASS = compiler.feDev.bind(compiler,
join(devDir, 'app.scss'),
join(devDir, 'style.css'),
function () {
lr.changed({body: {files: ['style.css']}});
});

lr.listen(35729);
webSASS();
DirectoryWatcher.watch(rootDir, 'scss', webSASS, 'bin', 'build', 'docs',
'lib', 'node_modules', 'spec');
server = new DevServer(join(devDir, 'script.js'), join(devDir, 'app.scss'), devDir);

new WebpackDevServer(webpack({
cache: {},
debug: true,
devtool: 'eval-source-map',
entry: [
'webpack-dev-server/client?http://localhost:3000',
'webpack/hot/only-dev-server',
inPath
],
output: {
path: devDir,
filename: 'script.js',
publicPath: '/'
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin()
],
module: {
loaders: [{
test: /\.js$/,
exclude: /node_modules/,
loaders: ['react-hot', 'babel-loader']
}]
}
}), {
contentBase: devDir,
publicPath: '/',
hot: true,
historyApiFallback: true
}).listen(3000, '0.0.0.0', function (e) {
if (e) {
return console.error(e);
}
console.log('Listening at localhost:3000');
});
server.run(rootDir, 'bin', 'build', 'docs', 'lib', 'node_modules', 'spec');
2 changes: 1 addition & 1 deletion development/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export default class App extends React.Component {
<Combo items={{
a: {label: 'Winter', header: true},
b: 'December',
c: 'January',
d: 'Febuary',
c: 'January',
e: '-',
f: {label: 'Spring', header: true},
g: 'March',
Expand Down
14 changes: 0 additions & 14 deletions development/index.html

This file was deleted.

56 changes: 0 additions & 56 deletions development/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion development/style.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Combo.html
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Combo.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 12 2015 23:25:08 GMT+0300 (EEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 19 2015 23:28:23 GMT+0300 (EEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Combo.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Combo.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 12 2015 23:25:08 GMT+0300 (EEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 19 2015 23:28:23 GMT+0300 (EEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Combo.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 12 2015 23:25:08 GMT+0300 (EEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Wed Aug 19 2015 23:28:23 GMT+0300 (EEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-bootstrap-combobox",
"version": "2.0.2",
"version": "2.0.3",
"description": "A combo-box component for React Bootstrap",
"main": "build/index.js",
"scripts": {
Expand Down Expand Up @@ -30,21 +30,19 @@
"babel-runtime": "^5.8.19",
"lodash": "^3.10.1",
"react": "^0.13.3",
"react-bootstrap": "^0.24.4"
"react-bootstrap": "^0.24.5"
},
"devDependencies": {
"babel": "^5.8.21",
"babel-istanbul": "^0.2.10",
"babel-istanbul": "^0.3.17",
"babel-loader": "^5.3.2",
"bootstrap-sass": "^3.3.5",
"coveralls": "^2.11.3",
"jasmine-es6": "^0.0.17",
"jsdoc": "^3.3.2",
"proxyquire": "^1.6.0",
"proxyquire": "^1.7.0",
"react-hot-loader": "^1.2.8",
"simple-recursive-watch": "^2.0.2",
"tiny-lr": "^0.1.6",
"webcompiler": "^1.3.2",
"webcompiler": "^1.4.0",
"webpack": "^1.11.0",
"webpack-dev-server": "^1.10.1"
}
Expand Down

0 comments on commit cbba809

Please sign in to comment.