Remove publishable folder

emptynick · Mar 21, 2019 · d87eda1 · d87eda1
1 parent beb746a
commit d87eda1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/mix-manifest.json b/mix-manifest.json
@@ -0,0 +1,4 @@
+{
+    "/resources/assets/dist/scripts.js": "/resources/assets/dist/scripts.js",
+    "/resources/assets/dist/styles.css": "/resources/assets/dist/styles.css"
+}
diff --git a/publishable/mix-manifest.json b/publishable/mix-manifest.json
diff --git a/publishable/assets/js/scripts.js → resources/assets/dist/scripts.js b/publishable/assets/js/scripts.js → resources/assets/dist/scripts.js
diff --git a/publishable/assets/css/styles.css → resources/assets/dist/styles.css b/publishable/assets/css/styles.css → resources/assets/dist/styles.css
diff --git a/src/Http/Controllers/AssetController.php b/src/Http/Controllers/AssetController.php
@@ -7,7 +7,7 @@ class AssetController extends Controller
     public function styles()
     {
         return response(
-            file_get_contents(__DIR__.'/../../../publishable/assets/css/styles.css'),
+            file_get_contents(__DIR__.'/../../../resources/assets/dist/styles.css'),
             200,
             ['Content-Type' => 'text/css']
         );
@@ -16,7 +16,7 @@ public function styles()
     public function scripts()
     {
         return response(
-            file_get_contents(__DIR__.'/../../../publishable/assets/js/scripts.js'),
+            file_get_contents(__DIR__.'/../../../resources/assets/dist/scripts.js'),
             200,
             ['Content-Type' => 'application/javascript']
         );

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -1,5 +1,4 @@
 let mix = require('laravel-mix');
 
-mix.sass('resources/assets/scss/styles.scss', 'publishable/assets/css')
-.js('resources/assets/js/scripts.js', 'publishable/assets/js')
-.setPublicPath('publishable');
+mix.sass('resources/assets/scss/styles.scss', 'resources/assets/dist')
+.js('resources/assets/js/scripts.js', 'resources/assets/dist');