Make custom blocks path configurable

area17 · Mar 2, 2020 · 9a75480 · 9a75480
1 parent aef641f
commit 9a75480
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/config/blocks.php b/config/blocks.php
@@ -18,6 +18,7 @@
     // Indicates if blocks templates should be inlined in HTML.
     // When setting to false, make sure to build Twill with your all your custom blocks.
     'inline_blocks_templates' => true,
+    'custom_vue_blocks_resource_path' => 'assets/js/blocks',
     'blocks' => [
         'text' => [
             'title' => 'Body text',

diff --git a/src/Commands/Build.php b/src/Commands/Build.php
@@ -99,7 +99,7 @@ private function npmBuild()
      */
     private function copyBlocks()
     {
-        $localCustomBlocksPath = resource_path('assets/js/blocks');
+        $localCustomBlocksPath = resource_path(config('twill.block_editor.custom_vue_blocks_resource_path', 'assets/js/blocks'));
         $twillCustomBlocksPath = base_path(config('twill.vendor_path')) . '/frontend/js/components/blocks/customs';
 
         if (!$this->filesystem->exists($twillCustomBlocksPath)) {

diff --git a/src/Commands/GenerateBlocks.php b/src/Commands/GenerateBlocks.php
@@ -11,7 +11,7 @@
 class GenerateBlocks extends Command
 {
     const NO_BLOCKS_DEFINED = "There are no blocks defined yet. Please refer to https://twill.io/docs/#block-editor-3 in order to create blocks.";
-    const SCANNING_BLOCKS   = "Starting to scan block views directory...";
+    const SCANNING_BLOCKS = "Starting to scan block views directory...";
 
     /**
      * The name and signature of the console command.
@@ -73,7 +73,7 @@ public function handle()
                 'render' => $this->sanitize($vueBlockTemplate),
             ])->render();
 
-            $vueBlockPath = $this->makeDirectory(resource_path('assets/js/blocks/')) . 'Block' . Str::title($blockName) . '.vue';
+            $vueBlockPath = $this->makeDirectory(resource_path(config('twill.block_editor.custom_vue_blocks_resource_path', 'assets/js/blocks'))) . '/Block' . Str::title($blockName) . '.vue';
 
             $this->filesystem->put($vueBlockPath, $vueBlockContent);
 

diff --git a/tests/integration/CommandsTest.php b/tests/integration/CommandsTest.php
@@ -2,8 +2,8 @@
 
 namespace A17\Twill\Tests\Integration;
 
-use A17\Twill\Models\User;
 use A17\Twill\Commands\GenerateBlocks;
+use A17\Twill\Models\User;
 
 class CommandsTest extends TestCase
 {
@@ -32,7 +32,7 @@ public function testCanExecuteModuleCommand()
     public function testCanExecuteBlocksCommand()
     {
         $this->deleteDirectory($path = resource_path('views/admin/blocks'));
-        $this->deleteDirectory(resource_path('assets/js/blocks'));
+        $this->deleteDirectory(resource_path(config('twill.custom_vue_blocks_resource_path', 'assets/js/blocks')));
 
         $this->artisan('twill:blocks')->expectsOutput(
             GenerateBlocks::NO_BLOCKS_DEFINED
@@ -44,7 +44,7 @@ public function testCanExecuteBlocksCommand()
             true
         );
         $this->files->makeDirectory(
-            resource_path('assets/js/blocks'),
+            resource_path(config('twill.custom_vue_blocks_resource_path', 'assets/js/blocks')),
             0755,
             true
         );
@@ -63,12 +63,12 @@ public function testCanExecuteBlocksCommand()
         );
 
         $this->assertFileExists(
-            resource_path('assets/js/blocks/BlockQuote.vue')
+            resource_path(config('twill.custom_vue_blocks_resource_path', 'assets/js/blocks') . '/BlockQuote.vue')
         );
 
         $this->assertEquals(
             read_file(stubs('blocks/BlockQuote.vue')),
-            read_file(resource_path('assets/js/blocks/BlockQuote.vue'))
+            read_file(resource_path(config('twill.custom_vue_blocks_resource_path', 'assets/js/blocks') . '/BlockQuote.vue'))
         );
     }