Skip to content

Commit

Permalink
chore: supress yarn run output
Browse files Browse the repository at this point in the history
  • Loading branch information
JLHwung committed Nov 30, 2019
1 parent 1b1b573 commit a5cf4c0
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 38 deletions.
73 changes: 38 additions & 35 deletions Makefile
Expand Up @@ -13,6 +13,9 @@ EMPTY :=
SPACE := $(EMPTY) $(EMPTY)
COMMA_SEPARATED_SOURCES = $(subst $(SPACE),$(COMMA),$(SOURCES))

YARN := yarn --silent
NODE := $YARN node


.PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap

Expand All @@ -22,46 +25,46 @@ ifneq ("$(BABEL_COVERAGE)", "true")
endif

build-bundle: clean clean-lib
yarn gulp build
$(YARN) gulp build
$(MAKE) generate-standalone generate-type-helpers
# call build again as the generated files might need to be compiled again.
yarn gulp build
$(YARN) gulp build
$(MAKE) build-typings
$(MAKE) build-dist

build-bundle-ci: bootstrap-only
$(MAKE) build-bundle

generate-standalone:
yarn node packages/babel-standalone/scripts/generate.js
$(NODE) packages/babel-standalone/scripts/generate.js

generate-type-helpers:
yarn node packages/babel-types/scripts/generateTypeHelpers.js
$(NODE) packages/babel-types/scripts/generateTypeHelpers.js

build-typings: build-flow-typings build-typescript-typings

build-flow-typings:
yarn node packages/babel-types/scripts/generators/flow.js > packages/babel-types/lib/index.js.flow
$(NODE) packages/babel-types/scripts/generators/flow.js > packages/babel-types/lib/index.js.flow

build-typescript-typings:
yarn node packages/babel-types/scripts/generators/typescript.js > packages/babel-types/lib/index.d.ts
$(NODE) packages/babel-types/scripts/generators/typescript.js > packages/babel-types/lib/index.d.ts

build-standalone: build-babel-standalone build-preset-env-standalone

build-standalone-ci: build-bundle-ci
$(MAKE) build-standalone

build-babel-standalone:
yarn gulp build-babel-standalone
$(YARN) gulp build-babel-standalone

build-preset-env-standalone:
yarn gulp build-babel-preset-env-standalone
$(YARN) gulp build-babel-preset-env-standalone

prepublish-build-standalone:
BABEL_ENV=production IS_PUBLISH=true yarn gulp build-babel-standalone
BABEL_ENV=production IS_PUBLISH=true $(YARN) gulp build-babel-standalone

prepublish-build-preset-env-standalone:
BABEL_ENV=production IS_PUBLISH=true yarn gulp build-babel-preset-env-standalone
BABEL_ENV=production IS_PUBLISH=true $(YARN) gulp build-babel-preset-env-standalone

build-dist: build-polyfill-dist build-plugin-transform-runtime-dist

Expand All @@ -71,17 +74,17 @@ build-polyfill-dist:

build-plugin-transform-runtime-dist:
cd packages/babel-plugin-transform-runtime; \
yarn node scripts/build-dist.js
$(NODE) scripts/build-dist.js

build-no-bundle: clean clean-lib
BABEL_ENV=development yarn gulp build-no-bundle
BABEL_ENV=development $(YARN) gulp build-no-bundle
# Ensure that build artifacts for types are created during local
# development too.
$(MAKE) generate-type-helpers
$(MAKE) build-typings

watch: build-no-bundle
BABEL_ENV=development yarn gulp watch
BABEL_ENV=development $(YARN) gulp watch

code-quality-ci: flowcheck-ci lint-ci

Expand All @@ -91,10 +94,10 @@ flowcheck-ci: bootstrap-flowcheck
code-quality: flow lint

flow:
yarn flow check --strip-root
$(YARN) flow check --strip-root

bootstrap-flowcheck: bootstrap-only
yarn gulp build-babel-types
$(YARN) gulp build-babel-types
$(MAKE) build-typings

lint-ci: lint-js-ci lint-ts-ci
Expand All @@ -108,18 +111,18 @@ lint-ts-ci: bootstrap-flowcheck
lint: lint-js lint-ts

lint-js:
yarn eslint scripts $(SOURCES) '*.js' --format=codeframe
$(YARN) eslint scripts $(SOURCES) '*.js' --format=codeframe

lint-ts:
scripts/tests/typescript/lint.sh

fix: fix-json fix-js

fix-js:
yarn eslint scripts $(SOURCES) '*.js' --format=codeframe --fix
$(YARN) eslint scripts $(SOURCES) '*.js' --format=codeframe --fix

fix-json:
yarn prettier "{$(COMMA_SEPARATED_SOURCES)}/*/test/fixtures/**/options.json" --write --loglevel warn
$(YARN) prettier "{$(COMMA_SEPARATED_SOURCES)}/*/test/fixtures/**/options.json" --write --loglevel warn

clean: test-clean
rm -f .npmrc
Expand All @@ -132,7 +135,7 @@ test-clean:
$(foreach source, $(SOURCES), \
$(call clean-source-test, $(source)))

# Does not work on Windows; use "yarn jest" instead
# Does not work on Windows; use "$(YARN) jest" instead
test-only:
BABEL_ENV=test ./scripts/test.sh
$(MAKE) test-clean
Expand All @@ -142,7 +145,7 @@ test: lint test-only
test-ci: jest-ci

jest-ci: build-standalone-ci
BABEL_ENV=test yarn jest --maxWorkers=4 --ci
BABEL_ENV=test $(YARN) jest --maxWorkers=4 --ci
$(MAKE) test-clean

# Does not work on Windows
Expand All @@ -159,13 +162,13 @@ bootstrap-flow:
cd build/flow && git checkout $(FLOW_COMMIT)

test-flow:
yarn node scripts/tests/flow/run_babel_parser_flow_tests.js
$(NODE) scripts/tests/flow/run_babel_parser_flow_tests.js

test-flow-ci: build-bundle-ci bootstrap-flow
$(MAKE) test-flow

test-flow-update-whitelist:
yarn node scripts/tests/flow/run_babel_parser_flow_tests.js --update-whitelist
$(NODE) scripts/tests/flow/run_babel_parser_flow_tests.js --update-whitelist

bootstrap-test262:
rm -rf build/test262
Expand All @@ -174,13 +177,13 @@ bootstrap-test262:
cd build/test262 && git checkout $(TEST262_COMMIT)

test-test262:
yarn node scripts/tests/test262/run_babel_parser_test262.js
$(NODE) scripts/tests/test262/run_babel_parser_test262.js

test-test262-ci: build-bundle-ci bootstrap-test262
$(MAKE) test-test262

test-test262-update-whitelist:
yarn node scripts/tests/test262/run_babel_parser_test262.js --update-whitelist
$(NODE) scripts/tests/test262/run_babel_parser_test262.js --update-whitelist

# Does not work on Windows
clone-license:
Expand All @@ -197,11 +200,11 @@ prepublish:

new-version:
git pull --rebase
yarn lerna version --force-publish=$(FORCE_PUBLISH)
$(YARN) lerna version --force-publish=$(FORCE_PUBLISH)

# NOTE: Run make new-version first
publish: prepublish
yarn lerna publish from-git
$(YARN) lerna publish from-git
$(MAKE) clean

publish-ci: prepublish
Expand All @@ -211,7 +214,7 @@ else
echo "Missing NPM_TOKEN env var"
exit 1
endif
yarn lerna publish from-git --yes
$(YARN) lerna publish from-git --yes
rm -f .npmrc
$(MAKE) clean

Expand All @@ -221,23 +224,23 @@ ifneq ("$(I_AM_USING_VERDACCIO)", "I_AM_SURE")
exit 1
endif
$(MAKE) prepublish-build
yarn lerna version patch --force-publish=$(FORCE_PUBLISH) --no-push --yes --tag-version-prefix="version-e2e-test-"
yarn lerna publish from-git --registry http://localhost:4873 --yes --tag-version-prefix="version-e2e-test-"
$(YARN) lerna version patch --force-publish=$(FORCE_PUBLISH) --no-push --yes --tag-version-prefix="version-e2e-test-"
$(YARN) lerna publish from-git --registry http://localhost:4873 --yes --tag-version-prefix="version-e2e-test-"
$(MAKE) clean

publish-eslint:
$(call set-json-field, ./eslint/$(PKG)/package.json, private, false)
cd eslint/$(PKG); yarn publish
cd eslint/$(PKG); $(YARN) publish
$(call set-json-field, ./eslint/$(PKG)/package.json, private, true)

bootstrap-only: lerna-bootstrap

yarn-install: clean-all
yarn --ignore-engines
$(YARN)-install: clean-all
$(YARN) --ignore-engines

lerna-bootstrap: yarn-install
lerna-bootstrap: $(YARN)-install
# todo: remove `-- -- --ignore-engines` in Babel 8
yarn lerna bootstrap -- -- --ignore-engines
$(YARN) lerna bootstrap -- -- --ignore-engines

bootstrap: bootstrap-only
$(MAKE) build
Expand Down Expand Up @@ -284,7 +287,7 @@ define clean-source-all
endef

define set-json-field
yarn node -e "\
$(NODE) -e "\
require('fs').writeFileSync('$1'.trim(), \
JSON.stringify({ ...require('$1'.trim()), $2: $3 }, null, 2) + '\\n' \
)"
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-cov.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

node="yarn node"
node="yarn --silent node"
jestArgs="--coverage"

if [ -n "$CI" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

node="yarn node"
node="yarn --silent node"
jestArgs=()

if [ "$TEST_DEBUG" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/typescript/lint.sh
Expand Up @@ -3,4 +3,4 @@ set -e

tsFlags="--strict"

yarn tsc $tsFlags ./packages/babel-types/lib/index.d.ts
yarn --silent tsc $tsFlags ./packages/babel-types/lib/index.d.ts

0 comments on commit a5cf4c0

Please sign in to comment.