From 0013bafc62571bc81f2984974c4893c3770b1786 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Wed, 17 Oct 2018 14:14:48 +1100 Subject: fix(monorepo-scripts): Format date as UTC not local time. Down under is in the future and causes many conflicts when formatting the timestamp in the local context. All previous releases jumped a day ahead. By setting this to UTC we will have consistent formatted dates in the changelogs no matter where one publishes from. npm-cli-login fails on node 10 as a deprecation in node 9 has finished. This package appears to be unmaintained so we now have a fork with a fix --- package.json | 2 +- packages/monorepo-scripts/CHANGELOG.json | 9 +++++++++ packages/monorepo-scripts/src/utils/changelog_utils.ts | 3 ++- yarn.lock | 14 +++++++------- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 031f73ba8..15fb8df64 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.8", "lcov-result-merger": "^3.0.0", - "npm-cli-login": "^0.0.10", + "@0xproject/npm-cli-login": "^0.0.11", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json index 3b8684fab..cf7a22bb7 100644 --- a/packages/monorepo-scripts/CHANGELOG.json +++ b/packages/monorepo-scripts/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.6", + "changes": [ + { + "note": "Render date formats in UTC to prevent conflicts when publishing in different timezones.", + "pr": 1143 + } + ] + }, { "timestamp": 1534210131, "version": "1.0.5", diff --git a/packages/monorepo-scripts/src/utils/changelog_utils.ts b/packages/monorepo-scripts/src/utils/changelog_utils.ts index 8058d222b..0b46bf670 100644 --- a/packages/monorepo-scripts/src/utils/changelog_utils.ts +++ b/packages/monorepo-scripts/src/utils/changelog_utils.ts @@ -19,7 +19,8 @@ CHANGELOG export const changelogUtils = { getChangelogMdTitle(versionChangelog: VersionChangelog): string { - const date = moment(`${versionChangelog.timestamp}`, 'X').format('MMMM D, YYYY'); + // Use UTC rather than the local machines time (formatted date time is +0:00) + const date = moment.utc(`${versionChangelog.timestamp}`, 'X').format('MMMM D, YYYY'); const title = `\n## v${versionChangelog.version} - _${date}_\n\n`; return title; }, diff --git a/yarn.lock b/yarn.lock index 5dbc8310f..490f18f98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -571,6 +571,12 @@ jsonschema "1.2.2" lodash.values "4.3.0" +"@0xproject/npm-cli-login@^0.0.11": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e" + dependencies: + npm-registry-client "7.0.9" + "@0xproject/order-utils@^0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.9.tgz#75225dfbd87335d18810abf995d8e077b9a84868" @@ -6375,7 +6381,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep: ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default" ethereumjs-util "^5.2.0" ethereumjs-vm "2.3.5" - ethereumjs-wallet "0.6.0" + ethereumjs-wallet "~0.6.0" fake-merkle-patricia-tree "~1.0.1" heap "~0.2.6" js-scrypt "^0.2.0" @@ -10337,12 +10343,6 @@ npm-bundled@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" -npm-cli-login@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/npm-cli-login/-/npm-cli-login-0.0.10.tgz#b1e8b5b7405008e0a26ccc170443434a59c5364c" - dependencies: - npm-registry-client "7.0.9" - npm-lifecycle@^2.0.0: version "2.0.3" resolved "http://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.0.3.tgz#696bedf1143371163e9cc16fe872357e25d8d90e" -- cgit