revert prev pr to temp fix osx (#7652)

This commit is contained in:
Henry Zhu 2018-04-02 12:40:03 -04:00 committed by GitHub
parent 59ba3959dc
commit 47ada5ab3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,7 +3,6 @@ FLOW_COMMIT = 622bbc4f07acb77eb1109830c70815f827401d90
TEST262_COMMIT = 52f70e2f637731aae92a9c9a2d831310c3ab2e1e
export BABEL_ENV = test
export PATH := ./node_modules/.bin:$(PATH)
# Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
export FORCE_COLOR = true
@ -13,10 +12,10 @@ SOURCES = packages codemods
.PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap
build: clean clean-lib
gulp build
./node_modules/.bin/gulp build
node ./packages/babel-types/scripts/generateTypeHelpers.js
# call build again as the generated files might need to be compiled again.
gulp build
./node_modules/.bin/gulp build
# generate flow and typescript typings
node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
node scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
@ -28,10 +27,10 @@ ifneq ("$(BABEL_COVERAGE)", "true")
endif
build-standalone:
gulp build-babel-standalone
./node_modules/.bin/gulp build-babel-standalone
build-preset-env-standalone:
gulp build-babel-preset-env-standalone
./node_modules/.bin/gulp build-babel-preset-env-standalone
build-dist: build
cd packages/babel-polyfill; \
@ -43,21 +42,21 @@ watch: clean clean-lib
# Ensure that build artifacts for types are created during local
# development too.
BABEL_ENV=development gulp build-no-bundle
BABEL_ENV=development ./node_modules/.bin/gulp build-no-bundle
node ./packages/babel-types/scripts/generateTypeHelpers.js
node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
BABEL_ENV=development gulp watch
BABEL_ENV=development ./node_modules/.bin/gulp watch
flow:
flow check --strip-root
./node_modules/.bin/flow check --strip-root
lint:
eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --rulesdir="./scripts/eslint_rules"
./node_modules/.bin/eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --rulesdir="./scripts/eslint_rules"
fix:
# The config is hardcoded because otherwise prettier searches for it and also picks up some broken package.json files from tests
prettier --config .prettierrc --write --ignore-path .eslintignore '**/*.json'
eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
./node_modules/.bin/prettier --config .prettierrc --write --ignore-path .eslintignore '**/*.json'
./node_modules/.bin/eslint scripts $(SOURCES) '*.js' '**/.*.js' --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
clean: test-clean
rm -rf packages/babel-polyfill/browser*
@ -120,12 +119,12 @@ publish:
make test
# not using lerna independent mode atm, so only update packages that have changed since we use ^
# --only-explicit-updates
lerna publish --force-publish=* --exact --skip-temp-tag
./node_modules/.bin/lerna publish --force-publish=* --exact --skip-temp-tag
make clean
bootstrap: clean-all
yarn --ignore-engines
lerna bootstrap -- --ignore-engines
./node_modules/.bin/lerna bootstrap -- --ignore-engines
make build
cd packages/babel-runtime; \
node scripts/build-dist.js