Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'stable' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
admturner committed Apr 9, 2024
2 parents 2b08d17 + f61e723 commit 6885966
Show file tree
Hide file tree
Showing 27 changed files with 3,820 additions and 2,476 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
.gitattributes export-ignore
.gitignore export-ignore
.npmpackagejsonlintrc.json export-ignore
.npmrc export-ignore
.nvmrc export-ignore
.prettierrc.js export-ignore
.stylelintrc.json export-ignore
.travis.yml export-ignore
Expand Down
49 changes: 25 additions & 24 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,53 +14,54 @@ jobs:
lint:
name: Script and Style Coding Standards
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Log debug information
run: |
npm --version
node --version
git --version
- name: Install NodeJS v14
uses: actions/setup-node@v2
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 14
- name: Log debug information
run: |
npm --version
node --version
- name: Install npm dependencies
run: npm ci
- name: Run eslint
node-version-file: '.nvmrc'
check-latest: true
cache: npm

- name: Npm install
run: npm install

- name: Lint JavaScript
run: npm run lint:scripts
- name: Run stylelint

- name: Lint Styles
run: npm run lint:styles
- name: Run npmPkgJsonLint

- name: Lint package.json
run: npm run lint:pkg

phpcs:
name: PHP Coding Standards
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
coverage: none
tools: composer, cs2pr
- name: Log debug information
run: |
php --version
composer --version

- name: Install Composer dependencies
uses: ramsey/composer-install@v1
with:
composer-options: "--no-progress --no-ansi --no-interaction"

- name: Make Composer packages available globally
run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH

- name: Log PHPCS debug information
run: phpcs -i

- name: Run PHPCS
run: phpcs -q -n --report=checkstyle | cs2pr
run: phpcs -q -n --report=checkstyle . | cs2pr
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
save-exact = true
engine-strict = true
legacy-peer-deps = true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,43 @@ Changelog formatting (https://keepachangelog.com/en/1.0.0/):
### Security (in case of fixed vulnerabilities)
-->

## 2.3.1 (2024-04-09)

### Changed

- Bump WP tested-to to 6.5.0 to close #106.
- Replace direct call to database for plugin terms cleanup with `wp_delete_term`. (148bbd7)
- Replace direct call to database for plugin posts cleanup with `wp_trash_post`. (148bbd7)
- Separate CoursesList class instantiation from class file. (148bbd7)
- Upgrade Node.js to v20 and track version at project level. (b816b9a)
- Upgrade Composer dependencies and config. (148bbd7)
- Upgrade @wordpress/dependency-extraction-webpack-plugin from 4.29.0 to 5.6.0. (84c8407)
- Upgrade copy-webpack-plugin from 11.0.0 to 12.0.2. (20de331)
- Upgrade postcss-cli from 10.1.0 to 11.0.0. (7d402ee)
- Upgrade postcss-import from 15.1.0 to 16.1.0. (7d402ee)
- Upgrade source-map-loader from 4.0.1 to 5.0.0. (b900def)
- Upgrade stylelint from 14.2.0 to 15.11.0. (b2a3f6e)
- Update @wordpress/icons from 9.37.0 to 9.46.0. (e80c2c6)
- Update eslint from 8.11.0 to 8.57.0. (b816b9a)
- Update @babel/core from 7.17.7 to 7.24.4. (4b8507a)
- Update @babel/runtime from 7.17.7 to 7.24.4. (4b8507a)
- Update @wordpress/babel-preset-default from 7.30.0 to 7.39.0. (4b8507a)
- Update webpack from 5.76.0 to 5.91.0. (84c8407)
- Update @wordpress/eslint-plugin from 17.11.0 to 17.12.0. (9fef8fe)
- Update @wordpress/npm-package-json-lint-config from 4.1.2 to 4.40.0. (db2280b)
- Update @wordpress/stylelint-config from 21.29.0 to 21.38.0. (a198073)
- Update classnames from 2.3.1 to 2.5.1. (99ba0b5)
- Update cssnano from 6.0.1 to 6.1.2. (747a2b0)
- Update postcss-preset-env from 9.3.0 to 9.5.4. (7d402ee)

### Removed

- Remove lodash package. (817f8f2)

### Security

- Bump postcss from 8.4.31 to 8.4.38. (7d402ee)

## 2.3.0 (2023-12-06)

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# WSUWP HRS Courses

[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/wsuwp-plugin-hrs-courses)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/releases/latest) ![WordPress tested up to version 6.4.2](https://img.shields.io/badge/WordPress-v6.4.2%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/wsuwp-plugin-hrs-courses)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/blob/develop/LICENSE.md)
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/wsuwp-plugin-hrs-courses)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/releases/latest) ![WordPress tested up to version 6.5.0](https://img.shields.io/badge/WordPress-v6.5.0%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/wsuwp-plugin-hrs-courses)](https://github.com/washingtonstateuniversity/wsuwp-plugin-hrs-courses/blob/develop/LICENSE.md)

## Overview

Expand Down
15 changes: 2 additions & 13 deletions build/blocks/courses-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

namespace WSUWP\HRS\Courses\Blocks\CoursesList;

use WSUWP\HRS\Courses\Setup;

/**
Expand Down Expand Up @@ -152,7 +153,7 @@ private function create_excerpt( $post ) {

$excerpt_length = (int) $this->get_excerpt_length();
$excerpt_length = (int) apply_filters( 'excerpt_length', $excerpt_length );
$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[…]' );
$excerpt_more = apply_filters( 'excerpt_more', ' […]' );

return wp_trim_words( $content, $excerpt_length, $excerpt_more );
}
Expand Down Expand Up @@ -357,15 +358,3 @@ public function register() {
);
}
}

/**
* Creates a new instance of the `CoursesList` class.
*
* @since 0.5.0
*
* @return CoursesList An instance of the CoursesList class.
*/
function load() {
return new CoursesList();
}
add_action( 'init', __NAMESPACE__ . '\load', 25 );
2 changes: 1 addition & 1 deletion build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3ba17579c78b4c62b0f1');
<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => '3e4131c99215f6163972');
2 changes: 1 addition & 1 deletion build/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/menu.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('wp-polyfill'), 'version' => '3771e35001c9ede272d5');
<?php return array('dependencies' => array('wp-polyfill'), 'version' => '06432b13a8702307e447');
Loading

0 comments on commit 6885966

Please sign in to comment.