archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 10:14:04 +00:00
Code Activity

Merge branch 'archtechx:3.x' into 3.x

Browse source
This commit is contained in:
Leandro Gehlen 2024-06-28 13:50:58 -03:00 • committed by GitHub
commit 23e614f05b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -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

1
docker-compose.yml
View file

@ -1,4 +1,3 @@
version: '2.4'
services:
test:
build:

5
src/Vite.php
View file

@ -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);
}
}