Merge branch 'next' into user-status-refactor

This commit is contained in:
Wyatt Johnson
2017-11-13 16:06:16 -07:00
37 changed files with 1025 additions and 493 deletions
+2 -6
View File
@@ -12,7 +12,7 @@
"watch:client": "NODE_ENV=development webpack --progress --watch",
"watch:server": "nodemon --config .nodemon.json",
"start:development": "NODE_ENV=development ./bin/cli -c .env serve -j -w",
"start:production": "NODE_ENV=production ./bin/cli serve -j -w",
"start": "NODE_ENV=production ./bin/cli serve -j -w",
"prebuild": "npm-run-all clean generate-introspection",
"build": "NODE_ENV=production webpack -p --bail",
"lint:yaml": "yamllint locales/*.yml",
@@ -23,12 +23,8 @@
"test:server": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
"test:client": "TEST_MODE=unit NODE_ENV=test jest",
"test:client:watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
"pree2e": "selenium-standalone install",
"pree2e:ci": "selenium-standalone install",
"pree2e:browserstack": "selenium-standalone install",
"e2e": "NODE_ENV=test nightwatch",
"e2e": "./scripts/e2e.js",
"e2e:ci": "./scripts/e2e-ci.sh",
"e2e:browserstack": "NODE_ENV=test ./scripts/e2e-browserstack.js --config nightwatch-browserstack.conf.js",
"heroku-postbuild": "npm-run-all plugins:reconcile build"
},
"talk": {