fix(publicPath): pass via wp_localize_data

flyntwp · Nov 29, 2019 · bfb2435 · bfb2435
1 parent 325e667
commit bfb2435
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/Components/FeatureAdminComponentScreenshots/admin.js b/Components/FeatureAdminComponentScreenshots/admin.js
@@ -1,4 +1,4 @@
-/* globals wpData */
+/* globals FlyntData, FlyntComponentScreenshots */
 import $ from 'jquery'
 
 const $body = $('body')
@@ -17,7 +17,7 @@ $body.on('mouseleave', 'a[data-layout]', function (e) {
 
 function showComponentScreenshot (layout, $wrapper) {
   const componentName = firstToUpperCase(layout)
-  const image = `${wpData.templateDirectoryUri}/${wpData.components[componentName]}/screenshot.png`
+  const image = `${FlyntData.templateDirectoryUri}/${FlyntComponentScreenshots.components[componentName]}/screenshot.png`
   const $wrapperContainer = $("<div class='flyntComponentScreenshot-imageWrapper'>").appendTo($wrapper)
 
   getImage(image).done(function () {

diff --git a/Components/FeatureAdminComponentScreenshots/functions.php b/Components/FeatureAdminComponentScreenshots/functions.php
@@ -13,7 +13,7 @@
             return str_replace($templateDirectory, '', $componentPath);
         }, $componentManager->getAll()),
     ];
-    wp_localize_script('Flynt/assets/admin', 'wpData', $data);
+    wp_localize_script('Flynt/assets/admin', 'FlyntComponentScreenshots', $data);
 });
 
 if (class_exists('acf')) {

diff --git a/assets/scripts/publicPath.js b/assets/scripts/publicPath.js
@@ -1,2 +1,2 @@
-const themeUrl = document.querySelector("meta[name='themeUrl']").getAttribute('content')
+const themeUrl = window.FlyntData.templateDirectoryUri
 __webpack_public_path__ = `${themeUrl}/dist/` // eslint-disable-line
diff --git a/inc/assets.php b/inc/assets.php
@@ -16,6 +16,10 @@
         'inFooter' => false,
     ]);
     wp_script_add_data('Flynt/assets', 'defer', true);
+    $data = [
+        'templateDirectoryUri' => get_template_directory_uri(),
+    ];
+    wp_localize_script('Flynt/assets', 'FlyntData', $data);
     Asset::enqueue([
         'name' => 'Flynt/assets',
         'path' => 'assets/main.css',
@@ -31,6 +35,10 @@
         'inFooter' => false,
     ]);
     wp_script_add_data('Flynt/assets/admin', 'defer', true);
+    $data = [
+        'templateDirectoryUri' => get_template_directory_uri(),
+    ];
+    wp_localize_script('Flynt/assets/admin', 'FlyntData', $data);
     Asset::enqueue([
         'name' => 'Flynt/assets/admin',
         'path' => 'assets/admin.css',

diff --git a/templates/_document.twig b/templates/_document.twig
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="themeUrl" content="{{ site.theme.uri }}">
     <link rel="alternate" type="application/rss+xml" title="{{ site.title }} {{ __('Feed', 'flynt') }}" href="{{ site.rss2 | e('esc_url') }}">
     {{ function('wp_head') }}
   </head>