Remove assets directory and update references to use .wordpress-org/assets

.github/workflows/assets.yml

@@ -6,7 +6,6 @@ on:
       - main
     paths:
       - '.wordpress-org/**'
-      - 'assets/**'
 
 jobs:
   assets:
@@ -15,10 +14,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        
+
       - name: WordPress.org plugin asset/readme update
         uses: 10up/action-wordpress-plugin-asset-update@stable
         env:
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
-          SLUG: wp-fix-plugin-does-not-exist-notices 
+          SLUG: wp-fix-plugin-does-not-exist-notices

.wordpress-org/README.md

@@ -16,12 +16,10 @@ This directory contains assets specific to the WordPress.org plugin repository a
 
 ## Asset Organization
 
-- **PNG Files**: All PNG files for WordPress.org are stored in this directory (`.wordpress-org/assets/`)
+- **All Asset Files**: All files for WordPress.org are stored in this directory (`.wordpress-org/assets/`)
-- **Source Files**: Source files (PXD, SVG) are stored in the main `assets/` directory:
+  - PNG files (icon-256x256.png, banner-772x250.png, etc.)
-  - `assets/banner/banner-1544x500.pxd`
+  - Source files (PXD, SVG)
-  - `assets/icon/icon.svg`
+  - Documentation
-  - `assets/icon/icon-1024x1024.pxd`
-  - `assets/screenshots/screenshot-1.pxd`
 
 ## Purpose
 
@@ -55,9 +53,8 @@ Note that the `-rtl` suffix is specifically for Right-to-Left language support,
 ## Build Process
 
 The build script (`build.sh`) is configured to:
-1. Keep source files (PXD, SVG) in the `assets/` directory for development
+1. Use all asset files from the `.wordpress-org/assets/` directory
-2. Use PNG files from the `.wordpress-org/assets/` directory for the build
+2. Copy these files to the appropriate locations in the build directory
-3. Copy these PNG files to the appropriate locations in the build directory
 
 ## Additional Resources
 
@@ -65,4 +62,4 @@ For more detailed information about WordPress.org plugin assets, please see:
 
 - [WordPress Plugin Developer Handbook - Plugin Assets](https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/)
 - [WordPress Plugin Directory README.txt Standard](https://developer.wordpress.org/plugins/wordpress-org/how-your-readme-txt-works/)
-- [WordPress.org Plugin Submission Assets Guide](../assets/WORDPRESS_ORG_ASSETS.md)
+- [WordPress.org Plugin Submission Assets Guide](./.wordpress-org/WORDPRESS_ORG_ASSETS.md)

.wordpress-org/WORDPRESS_ORG_ASSETS.md

@@ -113,10 +113,10 @@ For converting SVG to PNG or creating different sizes of images, you can use:
 - **Command Line** (using ImageMagick):
   ```bash
   # For 256x256 icon
-  convert -background none -size 256x256 assets/icon/icon.svg assets/icon/icon-256x256.png
+  convert -background none -size 256x256 .wordpress-org/assets/icon.svg .wordpress-org/assets/icon-256x256.png
 
   # For 128x128 icon
-  convert -background none -size 128x128 assets/icon/icon.svg assets/icon/icon-128x128.png
+  convert -background none -size 128x128 .wordpress-org/assets/icon.svg .wordpress-org/assets/icon-128x128.png
   ```
 
 ## Resources

.wordpress-org/WORDPRESS_ORG_SUBMISSION.md

@@ -30,15 +30,15 @@ This document outlines the requirements for assets when submitting a plugin to t
 ## Current Status
 
 ### Icon
-- ✅ SVG source available in `assets/icon/icon.svg`
+- ✅ SVG source available in `.wordpress-org/assets/icon.svg`
-- ✅ PNG files created in `assets/icon/icon-256x256.png` and `assets/icon/icon-128x128.png`
+- ✅ PNG files created in `.wordpress-org/assets/icon-256x256.png` and `.wordpress-org/assets/icon-128x128.png`
 
 ### Banner
-- ✅ Both sizes available in `assets/banner/`
+- ✅ Both sizes available in `.wordpress-org/assets/`
 - ✅ Properly named files: `banner-772x250.png` and `banner-1544x500.png`
 
 ### Screenshots
-- ✅ One screenshot available in `assets/screenshots/screenshot-1.png`
+- ✅ One screenshot available in `.wordpress-org/assets/screenshot-1.png`
 - ✅ Screenshot description in readme.txt updated to reference only one screenshot
 
 ## SVN Directory Structure
@@ -68,11 +68,11 @@ When submitting to WordPress.org, your SVN repository will have this structure:
 
 ```bash
 # Copy assets to WordPress.org SVN assets directory
-cp assets/icon/icon-256x256.png /path/to/wordpress-svn/assets/
+cp .wordpress-org/assets/icon-256x256.png /path/to/wordpress-svn/assets/
-cp assets/icon/icon-128x128.png /path/to/wordpress-svn/assets/
+cp .wordpress-org/assets/icon-128x128.png /path/to/wordpress-svn/assets/
-cp assets/banner/banner-772x250.png /path/to/wordpress-svn/assets/
+cp .wordpress-org/assets/banner-772x250.png /path/to/wordpress-svn/assets/
-cp assets/banner/banner-1544x500.png /path/to/wordpress-svn/assets/
+cp .wordpress-org/assets/banner-1544x500.png /path/to/wordpress-svn/assets/
-cp assets/screenshots/screenshot-1.png /path/to/wordpress-svn/assets/
+cp .wordpress-org/assets/screenshot-1.png /path/to/wordpress-svn/assets/
 ```
 
 ## Resources

admin/js/version-fix.js

@@ -8,7 +8,7 @@
     'use strict';
 
     // Current plugin version - this should match the version in the main plugin file
-    const CURRENT_VERSION = '2.0.13';
+    const CURRENT_VERSION = '2.1.1';
 
     // Plugin slugs to check for
     const OUR_SLUGS = ['wp-fix-plugin-does-not-exist-notices', 'fix-plugin-does-not-exist-notices'];

assets/README.md

@@ -1,50 +0,0 @@
-# Plugin Assets for WordPress.org
-
-This directory contains assets for the WordPress.org plugin repository.
-
-## Directory Structure
-
-- `banner/` - Banner images for the plugin page header
-  - `banner-772x250.jpg` - Standard banner (772x250px)
-  - `banner-1544x500.jpg` - Retina banner (1544x500px)
-
-- `icon/` - Plugin icon images
-  - `icon-128x128.jpg` - Standard icon (128x128px)
-  - `icon-256x256.jpg` - Retina icon (256x256px)
-
-- `screenshots/` - Screenshots shown on the plugin page
-  - `screenshot-1.jpg` - Error message with explanation notification
-
-## WordPress.org Requirements
-
-### Required Image Dimensions
-
-- **Banner**: 772x250px with 2x retina version at 1544x500px
-- **Icon**: 128x128px with 2x retina version at 256x256px
-- **Screenshots**: No specific size requirements, but they should be clear and readable
-
-### Image Formats
-
-- All images should be in JPG or PNG format
-- Images should be optimized for web (compressed without losing quality)
-
-### Additional Notes
-
-- Screenshots should be numbered sequentially starting with 1
-- They should match the descriptions in the `readme.txt` file
-- Right-to-Left (RTL) language versions of banners and icons can be provided by appending `-rtl` to the filename
-- There is no official support for dark mode versions of assets in the WordPress.org repository
-
-## Example Filenames
-
-```
-assets/
-├── banner/
-│   ├── banner-772x250.jpg
-│   └── banner-1544x500.jpg
-├── icon/
-│   ├── icon-128x128.jpg
-│   └── icon-256x256.jpg
-└── screenshots/
-    ├── screenshot-1.jpg
-```

build.sh

@@ -38,27 +38,14 @@ cp -r includes/* $BUILD_DIR/includes/
 mkdir -p $BUILD_DIR/languages
 cp -r languages/* $BUILD_DIR/languages/
 
-# Copy assets
+# Copy admin assets
-mkdir -p $BUILD_DIR/assets/css
+mkdir -p $BUILD_DIR/admin/css
-cp -r assets/css/* $BUILD_DIR/assets/css/
+cp -r admin/css/* $BUILD_DIR/admin/css/
-mkdir -p $BUILD_DIR/assets/js
+mkdir -p $BUILD_DIR/admin/js
-cp -r assets/js/* $BUILD_DIR/assets/js/
+cp -r admin/js/* $BUILD_DIR/admin/js/
 
-# Copy asset source files (PXD)
+# Create assets directory structure
-mkdir -p $BUILD_DIR/assets/banner
+mkdir -p $BUILD_DIR/assets
-cp -r assets/banner/*.pxd $BUILD_DIR/assets/banner/ 2>/dev/null || :
-mkdir -p $BUILD_DIR/assets/icon
-cp -r assets/icon/*.pxd $BUILD_DIR/assets/icon/ 2>/dev/null || :
-mkdir -p $BUILD_DIR/assets/screenshots
-cp -r assets/screenshots/*.pxd $BUILD_DIR/assets/screenshots/ 2>/dev/null || :
-
-# Copy README files from assets directories
-cp -r assets/README.md $BUILD_DIR/assets/ 2>/dev/null || :
-cp -r assets/banner/README.md $BUILD_DIR/assets/banner/ 2>/dev/null || :
-cp -r assets/icon/README.md $BUILD_DIR/assets/icon/ 2>/dev/null || :
-cp -r assets/screenshots/README.md $BUILD_DIR/assets/screenshots/ 2>/dev/null || :
-cp -r assets/WORDPRESS_ORG_ASSETS.md $BUILD_DIR/assets/ 2>/dev/null || :
-cp -r assets/WORDPRESS_ORG_SUBMISSION.md $BUILD_DIR/assets/ 2>/dev/null || :
 
 # Copy PNG files from .wordpress-org/assets to the build directory
 mkdir -p $BUILD_DIR/assets/banner

wp-fix-plugin-does-not-exist-notices.php

@@ -253,7 +253,7 @@ class Fix_Plugin_Does_Not_Exist_Notices {
 		// Always load our version fix script on the plugins page
 		wp_enqueue_script(
 			'fpden-version-fix',
-			FPDEN_PLUGIN_URL . 'assets/js/version-fix.js',
+			FPDEN_PLUGIN_URL . 'admin/js/version-fix.js',
 			array( 'jquery', 'thickbox' ),
 			FPDEN_VERSION,
 			true // Load in footer.
@@ -267,14 +267,14 @@ class Fix_Plugin_Does_Not_Exist_Notices {
 
 		wp_enqueue_style(
 			'fpden-admin-styles',
-			FPDEN_PLUGIN_URL . 'assets/css/admin-styles.css',
+			FPDEN_PLUGIN_URL . 'admin/css/admin-styles.css',
 			array(),
 			FPDEN_VERSION
 		);
 
 		wp_enqueue_script(
 			'fpden-admin-scripts',
-			FPDEN_PLUGIN_URL . 'assets/js/admin-scripts.js',
+			FPDEN_PLUGIN_URL . 'admin/js/admin-scripts.js',
 			array( 'jquery' ), // Add dependencies if needed, e.g., jQuery.
 			FPDEN_VERSION,
 			true // Load in footer.
@@ -935,14 +935,14 @@ function fpden_add_update_source_modal() {
     // Enqueue the CSS and JS
     wp_enqueue_style(
         'fpden-update-source-selector',
-        FPDEN_PLUGIN_URL . 'assets/css/update-source-selector.css',
+        FPDEN_PLUGIN_URL . 'admin/css/update-source-selector.css',
         array(),
         FPDEN_VERSION
     );
 
     wp_enqueue_script(
         'fpden-update-source-selector',
-        FPDEN_PLUGIN_URL . 'assets/js/update-source-selector.js',
+        FPDEN_PLUGIN_URL . 'admin/js/update-source-selector.js',
         array('jquery'),
         FPDEN_VERSION,
         true