diff --git a/projects/packages/external-media/.gitattributes b/projects/packages/external-media/.gitattributes index b0b228d4ad6ad..211137773e029 100644 --- a/projects/packages/external-media/.gitattributes +++ b/projects/packages/external-media/.gitattributes @@ -6,6 +6,7 @@ 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 +src/build/** 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. diff --git a/projects/packages/external-media/src/class-external-media.php b/projects/packages/external-media/src/class-external-media.php index 6e03f9508865b..92ba746e359ff 100644 --- a/projects/packages/external-media/src/class-external-media.php +++ b/projects/packages/external-media/src/class-external-media.php @@ -34,8 +34,13 @@ public static function enqueue_block_editor_assets() { $assets_base_path . "$asset_name/$asset_name.js", __FILE__, array( - 'enqueue' => true, - 'css_path' => $assets_base_path . "$asset_name/$asset_name" . is_rtl() ? '.rtl.css' : '.css', + 'enqueue' => true, + 'textdomain' => 'jetpack-external-media', + + /** + * It depends on the `jetpack-blocks-editor` since the feature requires `Jetpack_Editor_Initial_State`. + */ + 'dependencies' => array( 'jetpack-blocks-editor' ), ) ); } diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json index 7092b747b3737..e107b9b0d5ab5 100644 --- a/projects/plugins/jetpack/composer.json +++ b/projects/plugins/jetpack/composer.json @@ -27,6 +27,7 @@ "automattic/jetpack-constants": "@dev", "automattic/jetpack-device-detection": "@dev", "automattic/jetpack-error": "@dev", + "automattic/jetpack-external-media": "@dev", "automattic/jetpack-forms": "@dev", "automattic/jetpack-image-cdn": "@dev", "automattic/jetpack-import": "@dev", diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 23014c28bf7f7..dfcb369551e3f 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7b6c53f88fcb9c7098d80137fd6d13c1", + "content-hash": "4ff7d971fbdbfab4e0db1e3b7b772645", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -1265,6 +1265,64 @@ "relative": true } }, + { + "name": "automattic/jetpack-external-media", + "version": "dev-trunk", + "dist": { + "type": "path", + "url": "../../packages/external-media", + "reference": "8b1d91b8ac276c9b4db25a80b2c23462b843fc4c" + }, + "require": { + "php": ">=7.2" + }, + "require-dev": { + "automattic/jetpack-changelogger": "@dev", + "yoast/phpunit-polyfills": "^1.1.1" + }, + "suggest": { + "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." + }, + "type": "jetpack-library", + "extra": { + "branch-alias": { + "dev-trunk": "0.1.x-dev" + }, + "textdomain": "jetpack-external-media", + "version-constants": { + "::PACKAGE_VERSION": "src/class-external-media.php" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "scripts": { + "build-development": [ + "pnpm run build-js" + ], + "build-production": [ + "pnpm run build-production-js" + ], + "phpunit": [ + "./vendor/phpunit/phpunit/phpunit --colors=always" + ], + "test-coverage": [ + "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\"" + ], + "test-php": [ + "@composer phpunit" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "description": "The external media feature allows users to select and import photos from external media", + "transport-options": { + "relative": true + } + }, { "name": "automattic/jetpack-forms", "version": "dev-trunk", @@ -6145,6 +6203,7 @@ "automattic/jetpack-constants": 20, "automattic/jetpack-device-detection": 20, "automattic/jetpack-error": 20, + "automattic/jetpack-external-media": 20, "automattic/jetpack-forms": 20, "automattic/jetpack-image-cdn": 20, "automattic/jetpack-import": 20, diff --git a/projects/plugins/jetpack/modules/external-media.php b/projects/plugins/jetpack/modules/external-media.php new file mode 100644 index 0000000000000..0a74a64a867fb --- /dev/null +++ b/projects/plugins/jetpack/modules/external-media.php @@ -0,0 +1,19 @@ +