Skip to content

Commit

Permalink
Merge branch 'trunk' into update/node-to-v18
Browse files Browse the repository at this point in the history
  • Loading branch information
kraftbj committed Jan 19, 2023
2 parents 4ea446b + 1dbbc11 commit c10e781
Show file tree
Hide file tree
Showing 21 changed files with 275 additions and 10 deletions.
4 changes: 4 additions & 0 deletions projects/js-packages/connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### This is a list detailing changes for the Jetpack RNA Connection Component releases.

## 0.24.6 - 2023-01-18
### Fixed
- Clean up JavaScript eslint issues. [#28441]

## 0.24.5 - 2023-01-11
### Changed
- Updated package dependencies.
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion projects/js-packages/connection/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-connection",
"version": "0.24.6-alpha",
"version": "0.24.6",
"description": "Jetpack Connection Component",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand Down
17 changes: 17 additions & 0 deletions projects/packages/jetpack-mu-wpcom/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Files not needed to be distributed in the package.
.gitattributes export-ignore
.github/ export-ignore
package.json export-ignore

# Files to include in the mirror repo, but excluded via gitignore
# Remember to end all directories with `/**` to properly tag every file.
# /src/js/example.min.js production-include

# Files to exclude from the mirror repo, but included in the monorepo.
# Remember to end all directories with `/**` to properly tag every file.
.gitignore production-exclude
changelog/** production-exclude
phpunit.xml.dist production-exclude
.phpcs.dir.xml production-exclude
tests/** production-exclude
.phpcsignore production-exclude
3 changes: 3 additions & 0 deletions projects/packages/jetpack-mu-wpcom/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
vendor/
node_modules/
wordpress/
24 changes: 24 additions & 0 deletions projects/packages/jetpack-mu-wpcom/.phpcs.dir.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<ruleset>

<rule ref="WordPress.WP.I18n">
<properties>
<property name="text_domain" type="array">
<element value="jetpack-mu-wpcom" />
</property>
</properties>
</rule>
<rule ref="Jetpack.Functions.I18n">
<properties>
<property name="text_domain" value="jetpack-mu-wpcom" />
</properties>
</rule>

<rule ref="WordPress.Utils.I18nTextDomainFixer">
<properties>
<property name="old_text_domain" type="array" />
<property name="new_text_domain" value="jetpack-mu-wpcom" />
</properties>
</rule>

</ruleset>
7 changes: 7 additions & 0 deletions projects/packages/jetpack-mu-wpcom/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

13 changes: 13 additions & 0 deletions projects/packages/jetpack-mu-wpcom/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# WordPress.com Features (jetpack-mu-wpcom)

Note: This package is intended for internal use by WordPress.com only.

Enhances your site with features powered by WordPress.com

## Security

Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic).

## License

jetpack-mu-wpcom is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt)
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: added
Comment: Initial package skeleton.


61 changes: 61 additions & 0 deletions projects/packages/jetpack-mu-wpcom/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"name": "automattic/jetpack-mu-wpcom",
"description": "Enhances your site with features powered by WordPress.com",
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {},
"require-dev": {
"yoast/phpunit-polyfills": "1.0.4",
"automattic/jetpack-changelogger": "@dev",
"automattic/wordbless": "dev-master"
},
"autoload": {
"classmap": [
"src/"
]
},
"scripts": {
"phpunit": [
"./vendor/phpunit/phpunit/phpunit --colors=always"
],
"test-coverage": [
"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
],
"test-php": [
"@composer phpunit"
],
"build-production": "echo 'Add your build step to composer.json, please!'",
"build-development": "echo 'Add your build step to composer.json, please!'",
"post-update-cmd": "php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\""
},
"repositories": [
{
"type": "path",
"url": "../../packages/*",
"options": {
"monorepo": true
}
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"mirror-repo": "Automattic/jetpack-mu-wpcom",
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-mu-wpcom/compare/v${old}...v${new}"
},
"autotagger": true,
"branch-alias": {
"dev-trunk": "0.1.x-dev"
},
"textdomain": "jetpack-mu-wpcom",
"version-constants": {
"::PACKAGE_VERSION": "src/class-jetpack-mu-wpcom.php"
}
},
"config": {
"allow-plugins": {
"roots/wordpress-core-installer": true
}
}
}
29 changes: 29 additions & 0 deletions projects/packages/jetpack-mu-wpcom/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"private": true,
"name": "@automattic/jetpack-mu-wpcom",
"version": "0.1.0-alpha",
"description": "Enhances your site with features powered by WordPress.com",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
"bugs": {
"url": "https://github.com/Automattic/jetpack/labels/[Package] Jetpack Mu Wpcom"
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"directory": "projects/packages/jetpack-mu-wpcom"
},
"license": "GPL-2.0-or-later",
"author": "Automattic",
"scripts": {
"build": "echo 'Not implemented.'",
"build-js": "echo 'Not implemented.'",
"build-production": "echo 'Not implemented.'",
"build-production-js": "echo 'Not implemented.'",
"clean": "true"
},
"devDependencies": {},
"engines": {
"node": "^16.13.2",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
}
}
14 changes: 14 additions & 0 deletions projects/packages/jetpack-mu-wpcom/phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" convertDeprecationsToExceptions="true">
<testsuites>
<testsuite name="main">
<directory prefix="test" suffix=".php">tests/php</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="false">
<!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
<!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
<directory suffix=".php">src</directory>
</whitelist>
</filter>
</phpunit>
19 changes: 19 additions & 0 deletions projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php
/**
* Enhances your site with features powered by WordPress.com
* This package is intended for internal use on WordPress.com sites only (simple and Atomic).
* Internal PT Reference: p9dueE-6jY-p2
*
* @package automattic/jetpack-mu-wpcom
*/

namespace Automattic\Jetpack;

/**
* Jetpack_Mu_Wpcom main class.
*/
class Jetpack_Mu_Wpcom {

const PACKAGE_VERSION = '0.1.0-alpha';

}
11 changes: 11 additions & 0 deletions projects/packages/jetpack-mu-wpcom/tests/php/bootstrap.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
/**
* Bootstrap.
*
* @package automattic/
*/

/**
* Include the composer autoloader.
*/
require_once __DIR__ . '/../../vendor/autoload.php';
31 changes: 31 additions & 0 deletions projects/plugins/videopress/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,37 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.3.0 - 2023-01-18
### Added
- Added Replace Control to the block
- Added anchor support to the block
- Added rating selector on video details edit page
- Added "publish first video" popover
- Added embed block transform from/to video block
- Added "Show video sharing menu" control to VideoPress block
- Added VideoPress shortcode
- Added privacy to the edit details page

### Changed
- Updated no video dashboard UI
- Updated footer of the uploader component
- Enhanced behavior when deleting multiple videos
- Filtered the video fields that re-render the player when changed

### Removed
- Removed src/client files from the final bundle
- Removed video chapters block

### Fixed
- Fixed layout visual issues
- Fixed issues when setting the video block video from the media library
- Fixed video attributes not being cleaned when replacing a video file
- Fixed duplicate uploads when replacing a video
- Fixed local videos listed as VideoPress videos
- Fixed player not rendering once file uploads
- Fixed title and description rendering on the block
- Fixed exception when deleting the last video of the page

## 1.2.1 - 2023-01-18
### Changed
- Updated package dependencies.
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/videopress/changelog/prerelease
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: added

Prerelease
2 changes: 1 addition & 1 deletion projects/plugins/videopress/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_videopressⓥ1_2_2_alpha"
"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_videopressⓥ1_4_0_alpha"
}
}
2 changes: 1 addition & 1 deletion projects/plugins/videopress/jetpack-videopress.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Plugin Name: Jetpack VideoPress
* Plugin URI: https://wordpress.org/plugins/jetpack-videopress
* Description: High quality, ad-free video.
* Version: 1.2.2-alpha
* Version: 1.4.0-alpha
* Author: Automattic - Jetpack Video team
* Author URI: https://jetpack.com/videopress/
* License: GPLv2 or later
Expand Down
31 changes: 29 additions & 2 deletions projects/plugins/videopress/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,34 @@ The file size limit is 5 GB. However, on slower networks, there is a chance the
2. Edit your video details, cover image, and privacy from your VideoPress library.

== Changelog ==
### 1.2.1 - 2023-01-18
### 1.3.0 - 2023-01-18
#### Added
- Added Replace Control to the block
- Added anchor support to the block
- Added rating selector on video details edit page
- Added "publish first video" popover
- Added embed block transform from/to video block
- Added "Show video sharing menu" control to VideoPress block
- Added VideoPress shortcode
- Added privacy to the edit details page

#### Changed
- Updated package dependencies.
- Updated no video dashboard UI
- Updated footer of the uploader component
- Enhanced behavior when deleting multiple videos
- Filtered the video fields that re-render the player when changed

#### Removed
- Removed src/client files from the final bundle
- Removed video chapters block

#### Fixed
- Fixed layout visual issues
- Fixed issues when setting the video block video from the media library
- Fixed video attributes not being cleaned when replacing a video file
- Fixed duplicate uploads when replacing a video
- Fixed local videos listed as VideoPress videos
- Fixed player not rendering once file uploads
- Fixed title and description rendering on the block
- Fixed exception when deleting the last video of the page

2 changes: 1 addition & 1 deletion tools/stable-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if ! jq -e '.' <<<"$JSON" &>/dev/null; then
die "Failed to retrieve JSON data from https://api.github.com/repos/$MIRROR/releases/latest"
fi

GH_LATEST=$(jq -r '.tag_name' <<<"$GH_JSON")
GH_LATEST=$(jq -r '.tag_name | ltrimstr( "v" )' <<<"$GH_JSON")

yellow "Current stable tag: ${CURRENT_STABLE_VERSION}"
yellow "Latest tag in SVN: ${SVN_LATEST}"
Expand Down

0 comments on commit c10e781

Please sign in to comment.