diff --git a/composer.json b/composer.json index ed9f12f..d3956ea 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ }, "require": { "php": "^7.3|^8.0", - "roots/acorn": "dev-main" + "roots/acorn": "2.0.0-alpha.0" }, "require-dev": { "filp/whoops": "^2.9", diff --git a/composer.lock b/composer.lock index 6fce98a..b3cf42f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c46b9828c77f0d325fe2a0e54271c346", + "content-hash": "6df33c071d30bb6f8425603747516212", "packages": [ { "name": "brick/math", @@ -1874,16 +1874,16 @@ }, { "name": "roots/acorn", - "version": "dev-main", + "version": "2.0.0-alpha.0", "source": { "type": "git", "url": "https://github.com/roots/acorn.git", - "reference": "70452f2cf768aaea7c452df32db27a1162e7c515" + "reference": "eb238de53431d300b567a295962170831581b43c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/roots/acorn/zipball/70452f2cf768aaea7c452df32db27a1162e7c515", - "reference": "70452f2cf768aaea7c452df32db27a1162e7c515", + "url": "https://api.github.com/repos/roots/acorn/zipball/eb238de53431d300b567a295962170831581b43c", + "reference": "eb238de53431d300b567a295962170831581b43c", "shasum": "" }, "require": { @@ -1916,13 +1916,13 @@ "pestphp/pest": "^1.0", "phpcompatibility/php-compatibility": "^9.3", "roave/security-advisories": "dev-master", + "spatie/pest-plugin-snapshots": "^1.0", "spatie/temporary-directory": "^1.3", "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "filp/whoops": "Required for friendly error pages in development (^2.9)." }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1956,7 +1956,7 @@ "support": { "forum": "https://discourse.roots.io/", "issues": "https://github.com/roots/acorn/issues", - "source": "https://github.com/roots/acorn/tree/main" + "source": "https://github.com/roots/acorn/tree/2.0.0-alpha.0" }, "funding": [ { @@ -1968,7 +1968,7 @@ "type": "patreon" } ], - "time": "2021-02-14T04:52:44+00:00" + "time": "2021-03-31T10:47:07+00:00" }, { "name": "roots/support", @@ -4237,9 +4237,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "roots/acorn": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/config/assets.php b/config/assets.php index b78140b..beb6339 100644 --- a/config/assets.php +++ b/config/assets.php @@ -1,5 +1,7 @@ [ 'theme' => [ - 'strategy' => 'relative', - 'path' => get_theme_file_path('/public'), - 'uri' => get_theme_file_uri('/public'), - 'manifest' => get_theme_file_path('/public/mix-manifest.json'), + 'path' => get_theme_file_path('public'), + 'url' => get_theme_file_uri('public'), + 'assets' => public_path('mix-manifest.json'), ] ] ]; diff --git a/config/view.php b/config/view.php index 6f4d77a..63ce480 100755 --- a/config/view.php +++ b/config/view.php @@ -79,6 +79,6 @@ return [ */ 'directives' => [ - 'asset' => Roots\Acorn\Assets\AssetDirective::class, + // 'foo' => App\View\FooDirective::class, ], ];