Use roots/sage-lib (incl. new config system)

app/setup.php

@@ -2,9 +2,8 @@
 
 namespace App;
 
-use Illuminate\Contracts\Container\Container as ContainerContract;
+use Roots\Sage\Container;
 use Roots\Sage\Assets\JsonManifest;
-use Roots\Sage\Config;
 use Roots\Sage\Template\Blade;
 use Roots\Sage\Template\BladeProvider;
 
@@ -101,29 +100,6 @@ add_action('the_post', function ($post) {
  * Setup Sage options
  */
 add_action('after_setup_theme', function () {
-    /**
-     * Sage config
-     */
-    $paths = [
-        'dir.stylesheet' => get_stylesheet_directory(),
-        'dir.template'   => get_template_directory(),
-        'dir.upload'     => wp_upload_dir()['basedir'],
-        'uri.stylesheet' => get_stylesheet_directory_uri(),
-        'uri.template'   => get_template_directory_uri(),
-    ];
-    $viewPaths = collect(preg_replace('%[\/]?(resources/views)?[\/.]*?$%', '', [STYLESHEETPATH, TEMPLATEPATH]))
-        ->flatMap(function ($path) {
-            return ["{$path}/resources/views", $path];
-        })->unique()->toArray();
-
-    config([
-        'assets.manifest' => "{$paths['dir.stylesheet']}/../dist/assets.json",
-        'assets.uri'      => "{$paths['uri.stylesheet']}/dist",
-        'view.compiled'   => "{$paths['dir.upload']}/cache/compiled",
-        'view.namespaces' => ['App' => WP_CONTENT_DIR],
-        'view.paths'      => $viewPaths,
-    ] + $paths);
-
     /**
      * Add JsonManifest to Sage container
      */
@@ -134,24 +110,19 @@ add_action('after_setup_theme', function () {
     /**
      * Add Blade to Sage container
      */
-    sage()->singleton('sage.blade', function (ContainerContract $app) {
+    sage()->singleton('sage.blade', function (Container $app) {
         $cachePath = config('view.compiled');
         if (!file_exists($cachePath)) {
             wp_mkdir_p($cachePath);
         }
         (new BladeProvider($app))->register();
-        return new Blade($app['view'], $app);
+        return new Blade($app['view']);
     });
 
     /**
      * Create @asset() Blade directive
      */
     sage('blade')->compiler()->directive('asset', function ($asset) {
-        return "<?= App\\asset_path({$asset}); ?>";
+        return "<?= " . __NAMESPACE__ . "\\asset_path({$asset}); ?>";
     });
 });
-
-/**
- * Init config
- */
-sage()->bindIf('config', Config::class, true);