From 788dfb8ba6fe2525cd5974a9e57e2bd1a54daf07 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Tue, 27 Nov 2018 13:17:06 +0100
Subject: [PATCH] Date: Optimize the usage of moment-timezone to save some
 kilobytes

---
 lib/packages-dependencies.php       |  1 -
 package-lock.json                   |  8 --------
 packages/block-library/package.json |  3 ---
 packages/date/src/index.js          | 16 +++++++++-------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/packages-dependencies.php b/lib/packages-dependencies.php
index f4f1695c966a3..34c70851ff727 100644
--- a/lib/packages-dependencies.php
+++ b/lib/packages-dependencies.php
@@ -25,7 +25,6 @@
 	'wp-block-library'                      => array(
 		'editor',
 		'lodash',
-		'moment',
 		'wp-api-fetch',
 		'wp-autop',
 		'wp-blob',
diff --git a/package-lock.json b/package-lock.json
index c2e08b8f0d903..ab4562395d1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2360,9 +2360,6 @@
 				"classnames": "^2.2.5",
 				"lodash": "^4.17.10",
 				"memize": "^1.0.5",
-				"moment": "^2.22.1",
-				"querystring": "^0.2.0",
-				"querystringify": "^1.0.0",
 				"url": "^0.11.0"
 			}
 		},
@@ -17740,11 +17737,6 @@
 			"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
 			"dev": true
 		},
-		"querystringify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-			"integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
-		},
 		"quick-lru": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 700c2d9801e60..5f6dbcd09b932 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -38,9 +38,6 @@
 		"classnames": "^2.2.5",
 		"lodash": "^4.17.10",
 		"memize": "^1.0.5",
-		"moment": "^2.22.1",
-		"querystring": "^0.2.0",
-		"querystringify": "^1.0.0",
 		"url": "^0.11.0"
 	},
 	"devDependencies": {
diff --git a/packages/date/src/index.js b/packages/date/src/index.js
index 4bd87396a58aa..24eb69434fd2e 100644
--- a/packages/date/src/index.js
+++ b/packages/date/src/index.js
@@ -2,9 +2,11 @@
  * External dependencies
  */
 import momentLib from 'moment';
-import 'moment-timezone';
+import 'moment-timezone/moment-timezone';
 import 'moment-timezone/moment-timezone-utils';
 
+const WP_ZONE = 'WP';
+
 // Changes made here will likely need to be made in `lib/client-assets.php` as
 // well because it uses the `setSettings()` function to change these settings.
 let settings = {
@@ -92,8 +94,8 @@ export function __experimentalGetSettings() {
 function setupWPTimezone() {
 	// Create WP timezone based off dateSettings.
 	momentLib.tz.add( momentLib.tz.pack( {
-		name: 'WP',
-		abbrs: [ 'WP' ],
+		name: WP_ZONE,
+		abbrs: [ WP_ZONE ],
 		untils: [ null ],
 		offsets: [ -settings.timezone.offset * 60 || 0 ],
 	} ) );
@@ -371,8 +373,8 @@ export function dateI18n( dateFormat, dateValue = new Date(), gmt = false ) {
  * @return {boolean} Is in the future.
  */
 export function isInTheFuture( dateValue ) {
-	const now = momentLib.tz( 'WP' );
-	const momentObject = momentLib.tz( dateValue, 'WP' );
+	const now = momentLib.tz( WP_ZONE );
+	const momentObject = momentLib.tz( dateValue, WP_ZONE );
 
 	return momentObject.isAfter( now );
 }
@@ -386,10 +388,10 @@ export function isInTheFuture( dateValue ) {
  */
 export function getDate( dateString ) {
 	if ( ! dateString ) {
-		return momentLib.tz( 'WP' ).toDate();
+		return momentLib.tz( WP_ZONE ).toDate();
 	}
 
-	return momentLib.tz( dateString, 'WP' ).toDate();
+	return momentLib.tz( dateString, WP_ZONE ).toDate();
 }
 
 setupWPTimezone();