Merge branch 'master' into pure-components

* master:
  removing better-npm-script dependency.
  using cross-env for env var compatibility
  keeping 0.0.3 better-npm-run
  keeping sass-loader ^3.0.0 and toolbox-loader 0.0.2
  using better-npm-run for cross platform node_env and uv_threadpool_size vars
old
Javi Velasco 2015-11-13 01:06:01 +01:00
commit 2a2eea57f5
2 changed files with 6 additions and 4 deletions

View File

@ -5,7 +5,7 @@
"author": "React Toolbox Team (http://github.com/react-toolbox)",
"scripts": {
"start": "node ./server",
"build": "NODE_ENV=production UV_THREADPOOL_SIZE=100 webpack --config ./webpack.config.production",
"build": "cross-env NODE_ENV=production UV_THREADPOOL_SIZE=100 webpack --config ./webpack.config.production --colors --profile --progress",
"deploy": "gh-pages -d build"
},
"dependencies": {
@ -22,6 +22,7 @@
"babel-eslint": "^4.1.3",
"babel-loader": "^5.3.2",
"babel-plugin-react-transform": "^1.1.1",
"cross-env": "^1.0.4",
"css-loader": "^0.21.0",
"express": "^4.13.3",
"extract-text-webpack-plugin": "^0.8.2",

View File

@ -21,12 +21,12 @@
"lint": "eslint ./ --ext .js,.jsx",
"babel": "babel ./components --out-dir ./lib",
"sass": "cpx './components/**/*.scss' ./lib",
"build": "NODE_ENV=production npm run babel && npm run sass",
"build": "cross-env NODE_ENV=production npm run babel && npm run sass",
"clean": "rimraf ./lib",
"prebuild": "npm run clean",
"prepublish": "npm run build",
"test": "NODE_ENV=test karma start",
"test:watch": "NODE_ENV=test karma start --no-single-run"
"test": "cross-env NODE_ENV=test karma start",
"test:watch": "cross-env NODE_ENV=test karma start --no-single-run"
},
"bugs": {
"url": "https://github.com/react-toolbox/react-toolbox/issues",
@ -54,6 +54,7 @@
"babel-loader": "^5.3.2",
"babel-plugin-react-transform": "^1.1.1",
"core-js": "^1.2.6",
"cross-env": "^1.0.4",
"cpx": "^1.2.1",
"css-loader": "^0.21.0",
"eslint": "^1.7.3",