diff --git a/.env-cmdrc b/.env-cmdrc new file mode 100644 index 000000000..59d3db357 --- /dev/null +++ b/.env-cmdrc @@ -0,0 +1,5 @@ +{ + "version": { + "IN_VERSION_SCRIPT": "true" + } +} diff --git a/package.json b/package.json index 72b4d6976..c69d599d9 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "lint": "eslint . --rulesdir eslint-internal-rules", "lint:fix": "eslint . --rulesdir eslint-internal-rules --fix", "tsc": "tsc", - "preversion": "npm test && npm run update && git add .", - "version": "npm run lint -- --fix && git add .", + "preversion": "npm test && git add .", + "version": "env-cmd -e version npm run update && npm run lint -- --fix && git add .", "update": "node ./tools/update.js", "docs:watch": "vuepress dev docs", "predocs:build": "npm run update", @@ -66,6 +66,7 @@ "@typescript-eslint/parser": "^3.0.2", "@vuepress/plugin-pwa": "^1.4.1", "babel-eslint": "^10.1.0", + "env-cmd": "^10.1.0", "eslint": "^7.0.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-eslint-plugin": "^2.2.1", diff --git a/tools/update-docs.js b/tools/update-docs.js index ce89c6d0d..50e77ad2e 100644 --- a/tools/update-docs.js +++ b/tools/update-docs.js @@ -67,12 +67,8 @@ function pickSince(content) { return since[1] } } - if ( - process.env.npm_package_version && - process.env.npm_package_version !== require('../package.json').version - ) { - // Maybe version script - return `v${process.env.npm_package_version}` + if (process.env.IN_VERSION_SCRIPT) { + return `v${require('../package.json').version}` } return null }