Merge pull request #107 from apility/develop

Merge develop into master
apility · Nov 13, 2019 · 40cde58 · 40cde58
2 parents f9b007c + 4d5eebf
commit 40cde58
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     "ivopetkov/html5-dom-document-php": "^2.0",
     "apility/netflex-support": "^1.0",
     "psy/psysh": "^0.9.9",
-    "apility/webpack-assets": "^1.0"
+    "apility/webpack-assets": "^1.0.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/NF.php b/src/NF.php
@@ -117,16 +117,19 @@ public static function init($site = null, $branch = null, $path = [])
     self::$commerce = new Commerce();
 
     self::$search = new ElasticSearch();
-
-    self::setWebpackAssets();
   }
 
   /** Sets webpackAssets */
   public static function setWebpackAssets () {
+    global $payload;
+
+    $basePath = $payload->domain ?? null;
+
     self::$webpackAssets = isset(self::$config['webpackManifest'])
       ? new WebpackAssets(self::$config['webpackManifest'], [
         'defaultEntrypoint' => 'app',
         'preload' => true,
+        'basePath' => $basePath,
       ])
       : null;
 

diff --git a/src/controller_page.php b/src/controller_page.php
@@ -23,6 +23,8 @@
     $payload = NF::$jwt->decode($token);
     $controller = NF::nfPath('pagefinder/' . $payload->scope . '_' . $payload->relation . '.php');
 
+    NF::setWebpackAssets();
+
     if (file_exists($controller)) {
       require $controller;
       die();
@@ -33,6 +35,8 @@
   die('Invalid or expired token');
 }
 
+NF::setWebpackAssets();
+
 if ($url == '') {
   $url = 'index';
 }