Load javascript assets via URL. Fixes #16

facade · Sep 18, 2019 · bd3e661 · bd3e661
1 parent 36b5472
commit bd3e661
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `ignition` will be documented in this file
 
+## 1.6.7 - 2019-09-18
+
+- Load javascript assets via URL. Fixes #16
+
 ## 1.6.6 - 2019-09-16
 
 - Prevent undefined index exception in `TestCommand`

diff --git a/resources/views/errorPage.php b/resources/views/errorPage.php
@@ -21,6 +21,8 @@
     <?php endforeach; ?>
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css">
+
+    <script src="/<?=$housekeepingEndpoint?>/assets"></script>
 </head>
 <body class="scrollbar-lg">
 
@@ -40,7 +42,6 @@
 
 <div id="app"></div>
 
-<script><?= $getAssetContents('ignition.js') ?></script>
 <script>
     window.Ignition = window.ignite(window.data);
 </script>

diff --git a/src/ErrorPage/ErrorPageViewModel.php b/src/ErrorPage/ErrorPageViewModel.php
@@ -121,13 +121,6 @@ public function jsonEncode($data): string
         return json_encode($data, JSON_PARTIAL_OUTPUT_ON_ERROR | $jsonOptions);
     }
 
-    public function getAssetContents(string $asset): string
-    {
-        $assetPath = __DIR__."/../../resources/compiled/{$asset}";
-
-        return file_get_contents($assetPath);
-    }
-
     public function styles(): array
     {
         return array_keys(Ignition::styles());
@@ -158,7 +151,6 @@ public function toArray(): array
             'scripts' => $this->scripts(),
             'tabs' => $this->tabs(),
             'jsonEncode' => Closure::fromCallable([$this, 'jsonEncode']),
-            'getAssetContents' => Closure::fromCallable([$this, 'getAssetContents']),
         ];
     }
 }
diff --git a/src/Http/Controllers/IgnitionAssetsController.php b/src/Http/Controllers/IgnitionAssetsController.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Facade\Ignition\Http\Controllers;
+
+class IgnitionAssetsController
+{
+    public function __invoke()
+    {
+        return file_get_contents(__DIR__.'/../../../resources/compiled/ignition.js');
+    }
+}
diff --git a/src/IgnitionServiceProvider.php b/src/IgnitionServiceProvider.php
@@ -38,6 +38,7 @@
 use Illuminate\View\Engines\PhpEngine as LaravelPhpEngine;
 use Facade\Ignition\Http\Controllers\HealthCheckController;
 use Facade\Ignition\Http\Controllers\ShareReportController;
+use Facade\Ignition\Http\Controllers\IgnitionAssetsController;
 use Facade\Ignition\Http\Controllers\ExecuteSolutionController;
 use Facade\Ignition\SolutionProviders\SolutionProviderRepository;
 use Facade\Ignition\SolutionProviders\ViewNotFoundSolutionProvider;
@@ -128,6 +129,7 @@ protected function registerHousekeepingRoutes()
             Route::post('execute-solution', ExecuteSolutionController::class);
             Route::post('share-report', ShareReportController::class);
 
+            Route::get('assets', IgnitionAssetsController::class);
             Route::get('scripts/{script}', ScriptController::class);
             Route::get('styles/{style}', StyleController::class);
         });