Fixed GH-72

Author: Rafael Grigorian

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+yarn-error.log
 /node_modules/
 /staging/
 /build/

gulpfile.js

@@ -11,6 +11,7 @@ const sass = require ("gulp-sass")
 const uglify = require ("gulp-uglify")
 const webpack = require ("webpack")
 const webpackStream = require ("webpack-stream")
+const gulpIgnore = require ("gulp-ignore")
 const webpackConfig = require ( path.join ( __dirname, "webpack.config.js" ) )
 const tar = require ("gulp-tar")
 
@@ -49,9 +50,9 @@ gulp.task ( "build-styles", [ "init" ], ( callback ) => {
 
 gulp.task ( "build-scripts", [ "init" ], ( callback ) => {
 	gulp.src ( path.join ( SOURCE_PATH, MAGENTO_SKIN_JS, MODULE_SHORT_NAME, "index.js" ) )
-	    .pipe ( webpackStream ( webpackConfig ), webpack )
+		.pipe ( webpackStream ( webpackConfig ), webpack )
 		.pipe ( minifyJs ({ ext: { min: ".min.js" } }) )
-	    .pipe ( gulp.dest ( path.join ( BUILD_PATH, MAGENTO_SKIN_JS, MODULE_SHORT_NAME ) ) )
+		.pipe ( gulp.dest ( path.join ( BUILD_PATH, MAGENTO_SKIN_JS, MODULE_SHORT_NAME ) ) )
 		.on ( "end", () => {
 			fs.unlinkSync ( path.join ( BUILD_PATH, MAGENTO_SKIN_JS, MODULE_SHORT_NAME, "bundle.js" ) )
 			callback ()
@@ -88,9 +89,10 @@ gulp.task ( "package", () => {
 		"output": "package.xml",
 		"version": EXTENSION_VERSION
 	}
-    gulp.src ([ path.join ( BUILD_PATH, "**", "*" ) ])
+	gulp.src ([ path.join ( BUILD_PATH, "**", "*" ) ])
 		.pipe ( magepack ( options ) )
+		.pipe ( gulpIgnore.exclude ("package.xml") )
 		.pipe ( tar (`${EXTENSION_NAMESPACE}-${EXTENSION_VERSION}`) )
-        .pipe ( gzip ({ extension: "tgz" }) )
-        .pipe ( gulp.dest ("dist") )
+		.pipe ( gzip ({ extension: "tgz" }) )
+		.pipe ( gulp.dest ("dist") )
 })

package.json

@@ -14,6 +14,7 @@
 		"gulp": "^3.9.1",
 		"gulp-concat": "^2.6.1",
 		"gulp-gzip": "^1.4.2",
+		"gulp-ignore": "^2.0.2",
 		"gulp-magepack": "^1.0.3",
 		"gulp-minify": "^2.1.0",
 		"gulp-minify-css": "^1.2.4",

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
-	<date>2018-06-27</date>
-	<time>12:55:53</time>
+	<date>2018-07-02</date>
+	<time>15:06:13</time>
 	<version>1.0.0</version>
 	<contents>
 		<target name="magecommunity">
@@ -38,16 +38,16 @@
 								<dir name="SslController.php" hash="65ed76a240167c40d809f29ed86ac338"/>
 								<dir name="Tls13Controller.php" hash="704c46bf4db3037e4a81686ef776f94e"/>
 							</dir>
+							<dir name="Dns">
+								<dir name="CloudflareNameserversController.php" hash="de0dbecb4baf89d7c5ce37f0dae8f7ad"/>
+								<dir name="DnsRecordsController.php" hash="966b3a5e42f6b79898edbd183fa32461"/>
+							</dir>
 							<dir name="Firewall">
 								<dir name="AccessRulesController.php" hash="f2454cfe250cacf1a171055a4ad5ad0d"/>
 								<dir name="ChallengePassageController.php" hash="8ed38de3c3b0fad63d7849df32e2249f"/>
 								<dir name="SecurityLevelController.php" hash="a98061a3e73f53ce4f80acf6048c27ac"/>
 								<dir name="UserAgentBlockingController.php" hash="56e88562fddc5e49f68758ea9b7bf4c4"/>
 							</dir>
-							<dir name="Dns">
-								<dir name="CloudflareNameserversController.php" hash="de0dbecb4baf89d7c5ce37f0dae8f7ad"/>
-								<dir name="DnsRecordsController.php" hash="966b3a5e42f6b79898edbd183fa32461"/>
-							</dir>
 							<dir name="Network">
 								<dir name="Http2Controller.php" hash="825798572e555bab0c787e50fecc1e23"/>
 								<dir name="IpGeolocationController.php" hash="a9a4e8f065afa5f3e814bf04f03e86a7"/>
@@ -95,6 +95,17 @@
 								<dir name="PageGetter.php" hash="6d251bb3712ceff4d1ef1ddeffd178ae"/>
 								<dir name="Request.php" hash="dd4db11fb957d79be6568949c3e67c0e"/>
 								<dir name="Setter.php" hash="2dc6f66fb656b7cb8a7d65b4adc26d33"/>
+								<dir name="Caching">
+									<dir name="AlwaysOnline.php" hash="0204885c4ade41cca61410d9ce82f715"/>
+									<dir name="BrowserCacheExpiration.php" hash="bd41074f07281e9c1562b5583380d981"/>
+									<dir name="CachingLevel.php" hash="d9e0cbe306812a0c82063237b52202d9"/>
+									<dir name="DevelopmentMode.php" hash="c4127f2bff6018154d8d625d28a446ee"/>
+									<dir name="PurgeCache.php" hash="c413c455ed036d6cd1efb335d2c9ffb6"/>
+								</dir>
+								<dir name="Dns">
+									<dir name="CloudflareNameservers.php" hash="c00d418680fae6c13ab9d9716598dbb1"/>
+									<dir name="DnsRecords.php" hash="bede95054d21264ac29df86e0ce7001c"/>
+								</dir>
 								<dir name="Crypto">
 									<dir name="AlwaysUseHttps.php" hash="f5b62f6f627edf83485501b89207f543"/>
 									<dir name="AuthenticatedOriginPulls.php" hash="669b9bbb8e919b07b21bbb727320de94"/>
@@ -107,17 +118,6 @@
 									<dir name="Ssl.php" hash="3fe60a7b6046edce68a35fcdee460557"/>
 									<dir name="Tls13.php" hash="cfb2536708367ca4abfa4eed2e6a336c"/>
 								</dir>
-								<dir name="Caching">
-									<dir name="AlwaysOnline.php" hash="0204885c4ade41cca61410d9ce82f715"/>
-									<dir name="BrowserCacheExpiration.php" hash="bd41074f07281e9c1562b5583380d981"/>
-									<dir name="CachingLevel.php" hash="d9e0cbe306812a0c82063237b52202d9"/>
-									<dir name="DevelopmentMode.php" hash="c4127f2bff6018154d8d625d28a446ee"/>
-									<dir name="PurgeCache.php" hash="c413c455ed036d6cd1efb335d2c9ffb6"/>
-								</dir>
-								<dir name="Dns">
-									<dir name="CloudflareNameservers.php" hash="c00d418680fae6c13ab9d9716598dbb1"/>
-									<dir name="DnsRecords.php" hash="bede95054d21264ac29df86e0ce7001c"/>
-								</dir>
 								<dir name="Firewall">
 									<dir name="AccessRules.php" hash="2c80be81aaba7cf6dfd3e76a30494aad"/>
 									<dir name="ChallengePassage.php" hash="0b5dbe0180dc1d1c939d634fb8a23489"/>
@@ -132,7 +132,7 @@
 									<dir name="Websockets.php" hash="f3879096f241d33e51e82ee134d8c6db"/>
 								</dir>
 								<dir name="Overview">
-									<dir name="Configuration.php" hash="c853ceffd491dcd97aca7628f3521f81"/>
+									<dir name="Configuration.php" hash="65ef2ba5192efc4bff3f3cde6562303c"/>
 									<dir name="Status.php" hash="cee8801bdac5b05ad661d3a27a8cb676"/>
 								</dir>
 								<dir name="PageRules">
@@ -251,6 +251,14 @@
 			<dir name="adminhtml">
 				<dir name="base">
 					<dir name="default">
+						<dir name="css">
+							<dir name="cloudflare">
+								<dir name="bundle.min.css" hash="8a9b5c81c0f4a641bfbc60d26e57f8f9"/>
+								<dir name="fonts">
+									<dir name="cloudflare-font.woff" hash="23613915553427be651a4781521f0ec9"/>
+								</dir>
+							</dir>
+						</dir>
 						<dir name="images">
 							<dir name="cloudflare">
 								<dir name="cloudflare.svg" hash="e7bcf4c627debf23d51cf96418cdf130"/>
@@ -261,14 +269,6 @@
 								<dir name="search.svg" hash="b83bec273c1f0f3e5b009d8bdf733fac"/>
 							</dir>
 						</dir>
-						<dir name="css">
-							<dir name="cloudflare">
-								<dir name="bundle.min.css" hash="8a9b5c81c0f4a641bfbc60d26e57f8f9"/>
-								<dir name="fonts">
-									<dir name="cloudflare-font.woff" hash="23613915553427be651a4781521f0ec9"/>
-								</dir>
-							</dir>
-						</dir>
 						<dir name="js">
 							<dir name="cloudflare">
 								<dir name="bundle.min.js" hash="2b593a7e02d39d405200050751db76fe"/>

yarn.lock

@@ -1578,6 +1578,13 @@ gulp-gzip@^1.4.2:
     stream-to-array "^2.3.0"
     through2 "^2.0.3"
 
+gulp-ignore@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/gulp-ignore/-/gulp-ignore-2.0.2.tgz#5c2ea2a0a4402e0ab4a2bcd12efd9295344d78f2"
+  dependencies:
+    gulp-match "^1.0.3"
+    through2 "^2.0.1"
+
 gulp-magepack@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/gulp-magepack/-/gulp-magepack-1.0.3.tgz#a053f5212931f173380e938570212a35774c707b"
@@ -1593,6 +1600,12 @@ gulp-magepack@^1.0.3:
     vinyl "^2.1.0"
     xml2js "^0.4.19"
 
+gulp-match@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.0.3.tgz#91c7c0d7f29becd6606d57d80a7f8776a87aba8e"
+  dependencies:
+    minimatch "^3.0.3"
+
 gulp-minify-css@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz#b6164957602ea27f9e5ad88227695dd205778c06"
@@ -2690,7 +2703,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies: