Merge pull request #61 from clarifynl/dev

Version 1.7.8
clarifynl · Dec 5, 2023 · 88943cb · 88943cb
2 parents f8f262f + 990c729
commit 88943cb
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 43 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
   "require-dev": {
     "slowprog/composer-copy-file": "~0.3",
     "woocommerce/action-scheduler": "^3.5",
-    "wpackio/enqueue": "^3.4"
+    "wpackio/enqueue": "^3.5"
   },
   "config": {
     "allow-plugins": {

diff --git a/composer.lock b/composer.lock
diff --git a/dist/focalpoint/admin-0d547173.js b/dist/focalpoint/admin-0d547173.js
diff --git a/dist/focalpoint/admin-7cb5b1a5.css b/dist/focalpoint/admin-7cb5b1a5.css
diff --git a/dist/focalpoint/runtime-0d98a8a8.js b/dist/focalpoint/runtime-0d98a8a8.js
diff --git a/lib/wpackio/enqueue/inc/Enqueue.php b/lib/wpackio/enqueue/inc/Enqueue.php
@@ -143,9 +143,13 @@ private function sanitize_path( $path ) {
 	 * and dynamic imports possible.
 	 */
 	public function printPublicPath() {
-		$publicPath = $this->getUrl( '' );
+		$publicPath = apply_filters( 'wpackio_print_public_path', $this->getUrl( '' ), $this->appName, $this->outputPath );
 		$jsCode = 'window.__wpackIo' . $this->sanitize_path( $this->appName . $this->outputPath ) . '=\'' . esc_js( $publicPath ) . '\';';
-		echo '<script type="text/javascript">/* wpack.io publicPath */' . $jsCode . '</script>';
+
+		// Enqueue an empty script so we can add an inline script that allows for filtering via `wp_inline_script_attributes`
+		\wp_register_script("{$this->appName}/publicPath", '', [], false, true);
+		\wp_enqueue_script("{$this->appName}/publicPath");
+		\wp_add_inline_script("{$this->appName}/publicPath", "/* wpack.io publicPath */ {$jsCode}");
 	}
 
 	/**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "responsive-pics",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "private": true,
   "scripts": {
     "bootstrap": "wpackio-scripts bootstrap",
@@ -11,8 +11,8 @@
   "devDependencies": {
     "@wpackio/scripts": "^6.4.0",
     "cssnano": "^5.1.14",
-    "postcss": "^8.4.31",
-    "sass": "^1.56.1"
+    "postcss": "^8.4.32",
+    "sass": "^1.69.5"
   },
   "dependencies": {
     "@wpackio/entrypoint": "^6.4.0"

diff --git a/responsive-pics.php b/responsive-pics.php
@@ -4,7 +4,7 @@
 	Plugin URI: https://responsive.pics
 	Description: Responsive Pics is a Wordpress tool for resizing images on the fly.
 	Author: Clarify (previously Booreiland)
-	Version: 1.7.7
+	Version: 1.7.8
 	Author URI: https://clarify.nl
 	Copyright: Wimer Hazenberg, Toine Kamps
 */
@@ -38,7 +38,7 @@ function __construct() {
 
 		// Variables
 		define('RESPONSIVE_PICS_DIR', plugin_dir_path(__FILE__));
-		define('RESPONSIVE_PICS_VERSION', '1.7.7');
+		define('RESPONSIVE_PICS_VERSION', '1.7.8');
 		define('RESPONSIVE_PICS_TEXTDOMAIN', 'responsive-pics');
 
 		// Init