diff --git a/package.json b/package.json index 5b0aea05..a532dac0 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,24 @@ { "scripts": { - "bootstrap": "yarn && lerna bootstrap", + "bootstrap": "run-s bootstrap:install bootstrap:lerna", + "bootstrap:install": "yarn", + "bootstrap:lerna": "lerna bootstrap", "start": "run-s bootstrap develop", "watch": "lerna run watch --parallel", "develop": "lerna run develop --parallel", - "build": "npm run clean && lerna run build", - "build-preview": "npm run build && lerna run build-preview", + "build": "run-s clean build:lerna", + "build:lerna": "lerna run build", + "build-preview": "run-s build build-preview:lerna", + "build-preview:lerna": "lerna run build-preview", "clean": "rimraf packages/*/dist dev-test/*.js", - "reset": "npm run clean && lerna clean --yes", + "clean:lerna": "lerna clean --yes", + "reset": "run-s clean clean:lerna", "cache-ci": "node scripts/cache.js", "test": "run-s lint jest e2e", "test-ci": "run-s lint-quiet cache-ci jest e2e-ci", "jest": "cross-env NODE_ENV=test jest --no-cache", - "e2e-prep": "npm run build && cp -r packages/netlify-cms/dist dev-test/", + "e2e-prep": "run-s build e2e-move-build", + "e2e-move-build": "cp -r packages/netlify-cms/dist dev-test/", "e2e-serve": "http-server dev-test", "e2e-exec": "cypress run", "e2e-exec-ci": "cypress run --record", @@ -23,19 +29,25 @@ "e2e-ci": "run-s e2e-prep e2e-run-ci", "e2e-dev": "start-test develop 8080 e2e-exec-dev", "publish": "run-s publish:before-manual-version publish:after-manual-version", - "publish:before-manual-version": "run-s test publish:version", + "publish:before-manual-version": "run-s bootstrap test publish:version", "publish:after-manual-version": "run-s publish:prepare publish:push", "publish:prepare": "run-s bootstrap build", "publish:version": "lerna version --no-push", - "publish:push": "git push --follow-tags && lerna publish from-git", - "publish:dry-run": "lerna version --no-git-tag-version --no-push", + "publish:push": "run-s publish:push-git publish:from-git", + "publish:push-git": "git push --follow-tags", + "publish:from-git": "lerna publish from-git", + "publish:dry-run": "run-s \"publish:version --no-git-tag-version\"", + "publish:beta": "run-s publish:beta:before-manual-version publish:after-manual-version", + "publish:beta:before-manual-version": "run-s bootstrap test publish:beta:version", + "publish:beta:version": "lerna version prepatch --preid alpha --no-push", + "publish:beta:dry-run": "run-s \"publish:beta:version --no-git-tag-version\"", "format": "run-s \"lint:css -- --fix --quiet\" \"lint:js -- --fix --quiet\" \"format:prettier -- --write\"", "format:prettier": "prettier \"{{packages,scripts,website}/**/,}*.{js,css}\"", "lint": "run-p -c --aggregate-output lint:*", "lint-quiet": "run-p -c --aggregate-output \"lint:* -- --quiet\"", "lint:css": "stylelint --ignore-path .gitignore \"{packages/**/*.{css,js},website/**/*.css}\"", - "lint:js": "eslint --ignore-path .gitignore \"{{packages,scripts,website}/**/,}*.js\"", - "lint:format": "npm run format:prettier -- --list-different", + "lint:js": "eslint --color --ignore-path .gitignore \"{{packages,scripts,website}/**/,}*.js\"", + "lint:format": "prettier \"{{packages,scripts,website}/**/,}*.{js,css}\" --list-different", "add-contributor": "all-contributors add" }, "browserslist": [