diff --git a/Dockerfile b/Dockerfile index 6a66bde2..407b8a92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # add amd64 platform to support Mac M1 -FROM --platform=linux/amd64 shivammathur/node:latest-amd64 +FROM --platform=linux/amd64 shivammathur/node:jammy-amd64 ARG PHP_VERSION=8.1 diff --git a/docker-compose.yml b/docker-compose.yml index e8e8d418..e1403dd6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.4' services: test: build: diff --git a/src/Vite.php b/src/Vite.php index 1464e3a3..91ab9aad 100644 --- a/src/Vite.php +++ b/src/Vite.php @@ -15,6 +15,9 @@ class Vite extends BaseVite // todo move to a different directory in v4 */ protected function assetPath($path, $secure = null) { - return $this->assetPathResolver ? ($this->assetPathResolver)($path, $secure) : global_asset($path); + // In Laravel 9, the property doesn't exist. + return (isset($this->assetPathResolver) && $this->assetPathResolver) + ? ($this->assetPathResolver)($path, $secure) + : global_asset($path); } }