diff --git a/Makefile b/Makefile index 1197785d34..2528fc3289 100644 --- a/Makefile +++ b/Makefile @@ -225,6 +225,11 @@ endif 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 + $(call set-json-field, ./eslint/$(PKG)/package.json, private, true) + bootstrap-only: lerna-bootstrap yarn-install: clean-all @@ -276,3 +281,10 @@ define clean-source-all rm -rf $(1)/*/package-lock.json endef + +define set-json-field + node -e "\ + require('fs').writeFileSync('$1'.trim(), \ + JSON.stringify({ ...require('$1'.trim()), $2: $3 }, null, 2) + '\\n' \ + )" +endef diff --git a/eslint/babel-eslint-config-internal/package.json b/eslint/babel-eslint-config-internal/package.json index a46867e3c6..e7431a11a5 100644 --- a/eslint/babel-eslint-config-internal/package.json +++ b/eslint/babel-eslint-config-internal/package.json @@ -5,6 +5,7 @@ "author": "Sebastian McKenzie ", "homepage": "https://babeljs.io/", "license": "MIT", + "private": true, "repository": { "type": "git", "url": "https://github.com/babel/eslint-config-babel" diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json index a92949e7e0..7192d29cdf 100644 --- a/eslint/babel-eslint-parser/package.json +++ b/eslint/babel-eslint-parser/package.json @@ -4,6 +4,7 @@ "description": "Custom parser for ESLint", "author": "Sebastian McKenzie ", "license": "MIT", + "private": true, "repository": { "type": "git", "url": "https://github.com/babel/babel-eslint.git" @@ -14,7 +15,6 @@ "homepage": "https://github.com/babel/babel-eslint", "scripts": { "test": "cd test && mocha specs && cd -", - "preversion": "npm test", "changelog": "git log `git describe --tags --abbrev=0`..HEAD --pretty=format:' * %s (%an)' | grep -v 'Merge pull request'" }, "engines": { diff --git a/eslint/babel-eslint-plugin-development/package.json b/eslint/babel-eslint-plugin-development/package.json index 9a65d7b6cf..96199d9cbd 100644 --- a/eslint/babel-eslint-plugin-development/package.json +++ b/eslint/babel-eslint-plugin-development/package.json @@ -2,6 +2,7 @@ "name": "@babel/eslint-plugin-development", "version": "1.0.1", "description": "A set of eslint rules to enforce best practices in the development of Babel plugins.", + "private": true, "keywords": [ "eslint", "eslintplugin", diff --git a/eslint/babel-eslint-plugin/package.json b/eslint/babel-eslint-plugin/package.json index 1d07201d04..32b7d09e1c 100644 --- a/eslint/babel-eslint-plugin/package.json +++ b/eslint/babel-eslint-plugin/package.json @@ -19,6 +19,7 @@ ], "author": "Jason Quense @monasticpanic", "license": "MIT", + "private": true, "engines": { "node": ">=4" }, diff --git a/lerna.json b/lerna.json index d51103fbc2..326ffefc80 100644 --- a/lerna.json +++ b/lerna.json @@ -22,7 +22,9 @@ "test/**", "codemods/**", "# We ignore every JSON file, except for built-in-modules, built-ins and plugins defined in babel-preset-env/data.", - "@(!(built-in-modules|built-ins|plugins|package)).json" + "@(!(built-in-modules|built-ins|plugins|package)).json", + "# Until the ESLint packages version are aligned with Babel's, we ignore them", + "eslint/**" ] } }, diff --git a/scripts/integration-tests/publish-local.sh b/scripts/integration-tests/publish-local.sh index d16f123512..8a77d31cb5 100755 --- a/scripts/integration-tests/publish-local.sh +++ b/scripts/integration-tests/publish-local.sh @@ -11,6 +11,13 @@ source utils/local-registry.sh source utils/git.sh source utils/cleanup.sh +function publishESLintPkg { + cd eslint/$1 + yarn version --patch --no-git-tag-version + cd ../.. + make publish-eslint PKG=$1 +} + # Echo every command being executed set -x @@ -30,4 +37,9 @@ loginLocalRegistry I_AM_USING_VERDACCIO=I_AM_SURE make publish-test +publishESLintPkg babel-eslint-config-internal +publishESLintPkg babel-eslint-parser +publishESLintPkg babel-eslint-plugin +publishESLintPkg babel-eslint-plugin-development + cleanup