Use npm-run-all instead of concurrently

This commit is contained in:
Josh Johnson 2018-10-13 11:19:24 +01:00
parent e53ebdda42
commit 5b68505b1a
5 changed files with 599 additions and 578 deletions

View file

@ -13,16 +13,18 @@
"cypress:open": "$(npm bin)/cypress open",
"test:unit": "mocha --require ./config/test.js --compilers js:babel-core/register \"./src/**/**/**/**/*.test.js\" --exit",
"test:unit:watch": "npm run test -- --watch --inspect=5556",
"test:e2e": "concurrently --kill-others --prefix-colors yellow,green \"npm run start\" \"npm run cypress:run\"",
"test:e2e": "run-p --race start cypress:run",
"js:build:minimised": "webpack --env.minimize --config webpack.config.prod.js",
"js:build:unminimised": "webpack --config webpack.config.prod.js",
"js:build": "run-p js:build:minimised js:build:unminimised",
"css:watch": "nodemon -e scss -x \"npm run css:build\"",
"css:build": "npm run css:sass -s && npm run css:prefix -s && npm run css:min -s",
"css:build": "run-p css:sass css:prefix css:min",
"css:sass": "node-sass --output-style expanded --include-path scss src/styles/base.scss public/assets/styles/base.css && node-sass --output-style expanded --include-path scss src/styles/choices.scss public/assets/styles/choices.css",
"css:prefix": "postcss --use autoprefixer -b 'last 2 versions' public/assets/styles/*.css -d public/assets/styles",
"css:min": "csso public/assets/styles/base.css public/assets/styles/base.min.css && csso public/assets/styles/choices.css public/assets/styles/choices.min.css",
"js:build": "concurrently --prefix-colors yellow,green \"webpack --env.minimize --config webpack.config.prod.js\" \"webpack --config webpack.config.prod.js\"",
"version": "node version.js --current $npm_package_version --new $npm_config_newVersion",
"postversion": "npm run js:build",
"prepush": "npm run lint && npm run test:unit"
"prepush": "run-p lint test:unit"
},
"repository": {
"type": "git",
@ -50,7 +52,6 @@
"babel-preset-env": "^1.6.1",
"babel-preset-stage-2": "^6.24.1",
"chai": "^4.1.0",
"concurrently": "^3.1.0",
"csso": "^1.8.2",
"cypress": "^3.1.0",
"eslint": "^3.19.0",
@ -68,6 +69,7 @@
"mocha": "^3.4.2",
"node-sass": "^3.4.2",
"nodemon": "^1.9.1",
"npm-run-all": "^4.1.3",
"nyc": "^11.0.3",
"opn": "^5.1.0",
"postcss-cli": "^2.5.1",

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -19,10 +19,7 @@
.choices.is-disabled .choices__input {
background-color: #EAEAEA;
cursor: not-allowed;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
user-select: none;
}
.choices.is-disabled .choices__item {
@ -305,10 +302,7 @@
.choices__item--disabled {
cursor: not-allowed;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
user-select: none;
opacity: .5;
}
@ -323,8 +317,7 @@
.choices__button {
text-indent: -9999px;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
appearance: none;
border: 0;
background-color: transparent;
background-repeat: no-repeat;