assume flattened resource structure for a fresh 5.7 app

Author: michaeldyrynda

src/TailwindCssPreset.php

@@ -28,43 +28,38 @@ protected static function updatePackageArray(array $packages)
     {
         return array_merge([
             'laravel-mix' => '^2.1',
-            'laravel-mix-purgecss' => '^2.0',
+            'laravel-mix-purgecss' => '^2.2',
             'laravel-mix-tailwind' => '^0.1.0',
         ], Arr::except($packages, [
             'bootstrap',
             'bootstrap-sass',
             'laravel-mix',
             'jquery',
-            'popper.js',
         ]));
     }
 
     protected static function updateStyles()
     {
         tap(new Filesystem, function ($filesystem) {
-            $filesystem->deleteDirectory(resource_path(self::flattenPath('sass')));
+            $filesystem->deleteDirectory(resource_path('sass'));
             $filesystem->delete(public_path('js/app.js'));
             $filesystem->delete(public_path('css/app.css'));
 
-            if (! $filesystem->isDirectory($directory = resource_path(self::flattenPath('css')))) { 
+            if (! $filesystem->isDirectory($directory = resource_path('css'))) {
                 $filesystem->makeDirectory($directory, 0755, true);
             }
         });
 
-        copy(__DIR__.'/tailwindcss-stubs/resources/assets/css/app.css', resource_path(self::flattenPath('css/app.css')));
+        copy(__DIR__.'/tailwindcss-stubs/resources/css/app.css', resource_path('css/app.css'));
     }
 
     protected static function updateBootstrapping()
     {
         copy(__DIR__.'/tailwindcss-stubs/tailwind.js', base_path('tailwind.js'));
 
-        if (self::flattenResources()) {
-            copy(__DIR__.'/tailwindcss-stubs/webpack57.mix.js', base_path('webpack.mix.js'));
-        } else {
-            copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js'));
-        }
+        copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js'));
 
-        copy(__DIR__.'/tailwindcss-stubs/resources/assets/js/bootstrap.js', resource_path(self::flattenPath('js/bootstrap.js')));
+        copy(__DIR__.'/tailwindcss-stubs/resources/js/bootstrap.js', resource_path('js/bootstrap.js'));
     }
 
     protected static function updateWelcomePage()
@@ -95,14 +90,4 @@ protected static function compileControllerStub()
             file_get_contents(__DIR__.'/tailwindcss-stubs/controllers/HomeController.stub')
         );
     }
-
-    private static function flattenResources()
-    {
-        return version_compare(app()->version(), '5.7.0', '>=');
-    }
-
-    private static function flattenPath($path)
-    {
-        return ((self::flattenResources()) ? '' : 'assets/') . $path;
-    }
 }

src/tailwindcss-stubs/resources/assets/css/app.css renamed to src/tailwindcss-stubs/resources/css/app.css

@@ -1,14 +1,15 @@
-window._ = require("lodash");
+window._ = require('lodash');
+window.Popper = require('popper.js').default;
 
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests
  * to our Laravel back-end. This library automatically handles sending the
  * CSRF token as a header based on the value of the "XSRF" token cookie.
  */
 
-window.axios = require("axios");
+window.axios = require('axios');
 
-window.axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
 /**
  * Next we will register the CSRF Token as a common header with Axios so that
@@ -19,11 +20,9 @@ window.axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
 let token = document.head.querySelector('meta[name="csrf-token"]');
 
 if (token) {
-  window.axios.defaults.headers.common["X-CSRF-TOKEN"] = token.content;
+    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
 } else {
-  console.error(
-    "CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token"
-  );
+    console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
 }
 
 /**
@@ -38,5 +37,7 @@ if (token) {
 
 // window.Echo = new Echo({
 //     broadcaster: 'pusher',
-//     key: 'your-pusher-key'
+//     key: process.env.MIX_PUSHER_APP_KEY,
+//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
+//     encrypted: true
 // });

src/tailwindcss-stubs/resources/assets/js/bootstrap.js renamed to src/tailwindcss-stubs/resources/js/bootstrap.js

@@ -14,8 +14,8 @@ require("laravel-mix-purgecss");
  |
  */
 
-mix.js("resources/assets/js/app.js", "public/js")
-   .postCss("resources/assets/css/app.css", "public/css")
+mix.js('resources/js/app.js', 'public/js')
+   .postCss('resources/css/app.css', 'public/css')
    .tailwind()
    .purgeCss();