Merge pull request #48 from asdfdotdev/development

WordPress v5.5.3 Updates
asdfdotdev · Nov 8, 2020 · 8754f96 · 8754f96
2 parents 67388cb + 7e24371
commit 8754f96
Show file tree

Hide file tree

Showing 20 changed files with 22,762 additions and 6,139 deletions.
diff --git a/.babel.config.js b/.babel.config.js
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align="center" style="padding-bottom:20px"><img src="img/utm-dot-codes-logo.png" width="400"></p><p>&nbsp;</p>
 
-[![Build Status](https://travis-ci.org/asdfdotdev/utm.codes.svg?branch=main)](https://travis-ci.org/asdfdotdev/utm.codes) [![codecov](https://codecov.io/gh/asdfdotdev/utm.codes/branch/main/graph/badge.svg)](https://codecov.io/gh/asdfdotdev/utm.codes) [![RIPS CodeRisk](https://coderisk.com/wp/plugin/utm-dot-codes/badge "RIPS CodeRisk")](https://coderisk.com/wp/plugin/utm-dot-codes)
+[![Build Status](https://travis-ci.org/asdfdotdev/utm.codes.svg?branch=main)](https://travis-ci.org/asdfdotdev/utm.codes) [![codecov](https://codecov.io/gh/asdfdotdev/utm.codes/branch/main/graph/badge.svg)](https://codecov.io/gh/asdfdotdev/utm.codes)
 
 Welcome to the developer repository for utm.codes, a WordPress plugin that makes creating analytics friendly marketing links quick and easy.
 

diff --git a/README.txt b/README.txt
@@ -3,9 +3,9 @@ Contributors: chrislarrycarl
 Donate link: https://utm.codes/pricing/
 Tags: analytics, utm codes, analytics, google analytics, campaign marketing, link generator
 Requires at least: 4.7.0
-Tested up to: 5.5.0
+Tested up to: 5.5.3
 Requires PHP: 5.6.0
-Stable tag: 1.7.2
+Stable tag: 1.7.3
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,12 @@ That isn't a question. But thank you.
 
 == Changelog ==
 
+= 1.7.3 =
+
+- Supports WordPress v5.5.3
+- Changes webpack build
+- Update dependencies
+
 = 1.7.2 =
 
 - Supports WordPress v5.5

diff --git a/_build/README.md b/_build/README.md
@@ -4,7 +4,7 @@ utm.codes uses webpack to combine, compress, and optimize static resources.
 
 ## Install
 
-From the project root directory use npm to install the required node modules. 
+From the project root directory use npm to install the required node modules.
 
 ```
 $ npm install
@@ -26,10 +26,4 @@ $ npm run COMMAND_NAME
 
 **development** - alias for *dev*
 
-**dev-dashboard** - runs dev command within webpack dashboard for a cooler dev experience
-
-**development-dashboard** - alias for *dev-dashboard*
-
 **delete-maps** - deletes files ending in `.map`. Used by production build to remove js sourcemaps
-
-**version-check** - outputs utm.codes build version from package.json along with the output for `$ node -v` and `$ npm -v` for easy version checking.
diff --git a/_build/styles/mixins/_toggle.scss b/_build/styles/mixins/_toggle.scss
@@ -8,8 +8,8 @@
 	position: relative;
 
 	*,
-	*::before,
-	*::after {
+	*:before,
+	*:after {
 		box-sizing: border-box;
 	}
 
@@ -37,12 +37,12 @@
 				div {
 					background-color: lighten($on-color, 5%);
 
-					&::before {
+					&:before {
 						content: attr(data-off);
 						left: 0;
 					}
 
-					&::after {
+					&:after {
 						content: attr(data-on);
 						color: darken($on-color, 5%);
 						transform: translate3d($width - ($switch-width + $offset),0,0);
@@ -66,14 +66,14 @@
 			height: $height;
 			flex: 0 0 $width;
 
-			&::before,
-			&::after {
+			&:before,
+			&:after {
 				text-transform: uppercase;
 				text-align: center;
 				position: absolute;
 			}
 
-			&::before {
+			&:before {
 				color: $text-color;
 				left: $width/2;
 				line-height: $height;
@@ -82,7 +82,7 @@
 				top: 0;
 			}
 
-			&::after {
+			&:after {
 				top: $offset;
 				left: $offset;
 				width: $switch-width - $offset;

diff --git a/_build/styles/partials/_dashboard.scss b/_build/styles/partials/_dashboard.scss
@@ -2,7 +2,7 @@
 
   	&-count {
 
-	  	&::before {
+	  	&:before {
 			content: "\f103" !important;
 			color: transparent !important;
 			background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0yMi4yMjIyMjIyMjIyMjIyMjUgLTIyLjIyMjIyMjIyMjIyMjIyNSAxNDQuNDQ0NDQ0NDQ0NDQ0NDYgMTU1LjU1NTU1NTU1NTU1NTU3IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTYuNjY2NjY2NjY2NjY2NjY0IC0xMS4xMTExMTExMTExMTExMSkgc2NhbGUoNS41NTU1NTU1NTU1NTU1NTUpIj48ZyBmaWxsPSIjODI4NzhjIj48cGF0aCBkPSJNMTUgMmMtMS42IDAtMy4xLjctNC4yIDEuNy44LjIgMS41LjUgMi4xLjkuNi0uNCAxLjMtLjYgMi4xLS42IDIuMiAwIDQgMS44IDQgNHY1YzAgMi4yLTEuOCA0LTQgNHMtNC0xLjgtNC00VjkuNWMtLjUtLjYtMS4yLTEtMi0xVjEzYzAgMy4zIDIuNyA2IDYgNnM2LTIuNyA2LTZWOGMwLTMuMy0yLjctNi02LTZ6Ij48L3BhdGg+PHBhdGggZD0iTTkgMjJjMS42IDAgMy4xLS43IDQuMi0xLjctLjgtLjItMS41LS41LTIuMS0uOS0uNi40LTEuMy42LTIuMS42LTIuMiAwLTQtMS44LTQtNHYtNWMwLTIuMiAxLjgtNCA0LTRzNCAxLjggNCA0djMuNWMuNS42IDEuMiAxIDIgMVYxMWMwLTMuMy0yLjctNi02LTZzLTYgMi43LTYgNnY1YzAgMy4zIDIuNyA2IDYgNnoiPjwvcGF0aD48L2c+PC9nPjwvc3ZnPg==) !important;

diff --git a/_build/styles/partials/_settings.scss b/_build/styles/partials/_settings.scss
@@ -65,8 +65,8 @@
 				background: $white;
 				border: solid 2px $wp_blue;
 
-				&::before,
-				&::after {
+				&:before,
+				&:after {
 					right: 100%;
 					top: 50%;
 					border: solid transparent;
@@ -77,14 +77,14 @@
 					pointer-events: none;
 				}
 
-				&::before {
+				&:before {
 					border-color: transparent;
 					border-right-color: $wp_blue;
 					border-width: 13px;
 					margin-top: -13px;
 				}
 
-				&::after {
+				&:after {
 					border-color: transparent;
 					border-right-color: $white;
 					border-width: 10px;

diff --git a/_test/tests/test-integration.php b/_test/tests/test-integration.php
@@ -1031,16 +1031,16 @@ function test_add_static_resources() {
 
 		$this->assertTrue( array_key_exists( 'utm-dot-codes', $wp_scripts->registered ) );
 		$this->assertEquals( $wp_scripts->registered['utm-dot-codes']->deps[0], 'jquery' );
-		$this->assertEquals( $wp_scripts->registered['utm-dot-codes']->src, UTMDC_PLUGIN_URL . 'js/utmdotcodes.min.js' );
+		$this->assertEquals( $wp_scripts->registered['utm-dot-codes']->src, UTMDC_PLUGIN_URL . 'js/utmdotcodes.js' );
 		$this->assertTrue( in_array( 'utm-dot-codes', $wp_scripts->queue ) );
 
 		$this->assertTrue( array_key_exists( 'font-awesome', $wp_styles->registered ) );
-		$this->assertEquals( $wp_styles->registered['font-awesome']->src, 'https://use.fontawesome.com/releases/v5.7.2/css/all.css' );
+		$this->assertEquals( $wp_styles->registered['font-awesome']->src, 'https://use.fontawesome.com/releases/v5.15.0/css/all.css' );
 		$this->assertTrue( in_array( 'font-awesome', $wp_styles->queue ) );
 
 		$this->assertTrue( array_key_exists( 'utm-dot-codes', $wp_styles->registered ) );
 		$this->assertEquals( $wp_styles->registered['utm-dot-codes']->deps[0], 'font-awesome' );
-		$this->assertEquals( $wp_styles->registered['utm-dot-codes']->src, UTMDC_PLUGIN_URL . 'css/utmdotcodes.min.css' );
+		$this->assertEquals( $wp_styles->registered['utm-dot-codes']->src, UTMDC_PLUGIN_URL . 'css/utmdotcodes.css' );
 		$this->assertTrue( in_array( 'utm-dot-codes', $wp_styles->queue ) );
 	}
 

diff --git a/classes/class-utmdotcodes.php b/classes/class-utmdotcodes.php
@@ -1346,16 +1346,16 @@ public function bulk_actions( $bulk_actions ) {
 	public function add_css() {
 		wp_enqueue_style(
 			'font-awesome',
-			'https://use.fontawesome.com/releases/v5.7.2/css/all.css',
+			'https://use.fontawesome.com/releases/v5.15.0/css/all.css',
 			array(),
 			UTMDC_VERSION,
 			'all'
 		);
 		wp_enqueue_style(
 			'utm-dot-codes',
-			UTMDC_PLUGIN_URL . 'css/utmdotcodes.min.css',
+			UTMDC_PLUGIN_URL . 'css/utmdotcodes.css',
 			array( 'font-awesome' ),
-			hash_file( 'sha1', UTMDC_PLUGIN_DIR . 'css/utmdotcodes.min.css' ),
+			hash_file( 'sha1', UTMDC_PLUGIN_DIR . 'css/utmdotcodes.css' ),
 			'all'
 		);
 	}
@@ -1368,9 +1368,9 @@ public function add_css() {
 	public function add_js() {
 		wp_enqueue_script(
 			'utm-dot-codes',
-			UTMDC_PLUGIN_URL . 'js/utmdotcodes.min.js',
+			UTMDC_PLUGIN_URL . 'js/utmdotcodes.js',
 			array( 'jquery' ),
-			hash_file( 'sha1', UTMDC_PLUGIN_DIR . 'js/utmdotcodes.min.js' ),
+			hash_file( 'sha1', UTMDC_PLUGIN_DIR . 'js/utmdotcodes.js' ),
 			'all'
 		);
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "asdfdotdev/utm.codes",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "A plugin that makes building analytics friendly links quick and easy.",
     "type": "wordpress-plugin",
     "require-dev": {