Merge branch 'develop' into trunk

10up · Dec 15, 2021 · 32a77aa · 32a77aa
2 parents d8f3080 + 78ad53c
commit 32a77aa
Show file tree

Hide file tree

Showing 8 changed files with 1,503 additions and 450 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -12,6 +12,6 @@
 /CREDITS.md export-ignore
 /Gruntfile.js export-ignore
 /LICENSE.md export-ignore
-/package.json export-ignore
 /package-lock.json export-ignore
+/package.json export-ignore
 /README.md export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased]
 
+## [1.1.3] - 2021-12-13
+### Changed
+- Bump WordPress version "tested up to" 5.8 (props [@barneyjeffries](https://github.com/barneyjeffries), [@jeffpaul](https://github.com/jeffpaul) via [#74](https://github.com/10up/eight-day-week/pull/74)).
+
+### Fixed
+- Windows compatibility: Use `DIRECTORY_SEPARATOR` instead of slash in filepaths (props [@mnelson4](https://github.com/mnelson4), [@dinhtungdu](https://github.com/dinhtungdu), [@Intelligent2013](https://github.com/Intelligent2013), [@samthinkbox](https://github.com/samthinkbox) via [#73](https://github.com/10up/eight-day-week/pull/73)).
+
+### Security
+- Bump `bl` from 1.2.2 to 1.2.3 (props [@dependabot](https://github.com/apps/dependabot) via [#66](https://github.com/10up/eight-day-week/pull/66)).
+- Bump `ini` from 1.3.5 to 1.3.7 (props [@dependabot](https://github.com/apps/dependabot) via [#67](https://github.com/10up/eight-day-week/pull/67)).
+- Bump `grunt` from 1.0.4 to 1.3.0 (props [@dependabot](https://github.com/apps/dependabot) via [#69](https://github.com/10up/eight-day-week/pull/69)).
+- Bump `lodash` from 4.17.19 to 4.17.21 (props [@dependabot](https://github.com/apps/dependabot) via [#70](https://github.com/10up/eight-day-week/pull/70)).
+- Bump `ws` from 6.2.1 to 6.2.2 (props [@dependabot](https://github.com/apps/dependabot) via [#71](https://github.com/10up/eight-day-week/pull/71)).
+- Bump `path-parse` from 1.0.6 to 1.0.7 (props [@dependabot](https://github.com/apps/dependabot) via [#72](https://github.com/10up/eight-day-week/pull/72)).
+
 ## [1.1.2] - 2020-10-08
 ### Changed
 - Plugin documentation and screenshots (props [@jeffpaul](https://github.com/jeffpaul) via [#56](https://github.com/10up/eight-day-week/pull/56), [#61](https://github.com/10up/eight-day-week/pull/61)).
@@ -43,6 +58,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial Release
 
 [Unreleased]: https://github.com/10up/eight-day-week/compare/trunk...develop
+[1.1.3]: https://github.com/10up/eight-day-week/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/10up/eight-day-week/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/10up/eight-day-week/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/10up/eight-day-week/compare/9057a7f...1.1.0

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ The `develop` branch is the development branch which means it contains the next
 ## Release instructions
 
 1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
-2. Version bump: Bump the version number in `eight-day-week.php`, `package.json`, and `readme.txt` if it does not already reflect the version being released.  Update both the plugin "Version:" property and the plugin `EDW_VERSION` constant in `eight-day-week.php`.
+2. Version bump: Bump the version number in `eight-day-week.php`, `package-lock.json`, `package.json`, and `readme.txt` if it does not already reflect the version being released.  Update both the plugin "Version:" property and the plugin `EDW_VERSION` constant in `eight-day-week.php`.
 3. Changelog: Add/update the changelog in both `readme.txt` and `CHANGELOG.md`
 4. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
 5. Readme updates: Make any other readme changes as necessary. `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
@@ -38,5 +38,5 @@ The `develop` branch is the development branch which means it contains the next
 8. Release: Create a [new release](https://github.com/10up/eight-day-week/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the `X.Y.Z` milestone (e.g. `https://github.com/10up/eight-day-week/milestone/2?closed=1`).
 9. SVN: Wait for the [GitHub Action](https://github.com/10up/eight-day-week/actions) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
 10. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/eight-day-week-print-workflow/.  This may take a few minutes.
-11. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/eight-day-week/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close `X.Y.Z` milestone.
+11. Close milestone: Edit the [milestone](https://github.com/10up/eight-day-week/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close `X.Y.Z` milestone.
 12. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 > Optimize publication workflows by using WordPress as your print CMS.
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/eight-day-week.svg)](https://github.com/10up/eight-day-week/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.5%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/eight-day-week.svg)](https://github.com/10up/eight-day-week/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/eight-day-week.svg)](https://github.com/10up/eight-day-week/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.8%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/eight-day-week.svg)](https://github.com/10up/eight-day-week/blob/develop/LICENSE.md)
 
 ## Table of Contents
 * [Overview](#overview)
@@ -55,7 +55,6 @@ Issue Statuses | Publications | Article Statuses
 ------------- | ----------------- | ------------
 [![Editing of Issue Statuses](.wordpress-org/screenshot-4.png)](.wordpress-org/screenshot-4.png) | [![Editing of Publications](.wordpress-org/screenshot-5.png)](.wordpress-org/screenshot-5.png) | [![Editing of Article Statuses](.wordpress-org/screenshot-6.png)](.wordpress-org/screenshot-6.png)
 
-
 ## Requirements
 
 * PHP 5.6+
@@ -125,4 +124,4 @@ Please read [CODE_OF_CONDUCT.md](https://github.com/10up/eight-day-week/blob/dev
 
 ## Like what you see?
 
-<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
+<a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
diff --git a/eight-day-week.php b/eight-day-week.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Eight Day Week
  * Description: Tools that help improve digital & print workflows.
- * Version:     1.1.2
+ * Version:     1.1.3
  * Author:      10up
  * Author URI:  http://10up.com
  * License:     GPLv2+
@@ -34,7 +34,7 @@
 require_once __DIR__ . '/plugins.php';
 
 // Useful global constants
-define( 'EDW_VERSION', '1.1.2' );
+define( 'EDW_VERSION', '1.1.3' );
 define( 'EDW_URL',     Eight_Day_Week\plugins_url(  __FILE__ ) );
 define( 'EDW_PATH',    dirname( __FILE__ ) . '/' );
 define( 'EDW_INC',     EDW_PATH . 'includes/' );
@@ -70,7 +70,7 @@ function edw_bootstrap() {
 		return;
 	}
 
-	$core_file = EDW_INC . 'functions/core.php';
+	$core_file = EDW_INC . 'functions' . DIRECTORY_SEPARATOR . 'core.php';
 
 	if( ! isset( $map[ $core_file ] ) ) {
 		return;
@@ -139,10 +139,10 @@ function edw_build_namespace_map() {
 
 		$path = $file->getPathInfo()->getPathname();
 		if( $dir !== $path ) {
-			$sub_directory = str_replace( $dir . '/', '', $path );
+			$sub_directory = str_replace( $dir . DIRECTORY_SEPARATOR, '', $path );
 
 			//convert slashes to spaces
-			$capitalized = ucwords( str_replace( '/', ' ', $sub_directory ) );
+			$capitalized = ucwords( str_replace( DIRECTORY_SEPARATOR, ' ', $sub_directory ) );
 
 			$tip_of_the_iceberg = str_replace( ' ', '\\', $capitalized ) . '\\' . $tip_of_the_iceberg;
 		}