Merge pull request #1627 from DmitriySmolin/main

add migrate Laravel Mix to Vite

.env.example

@@ -43,8 +43,8 @@ PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GITHUB_URL_REDIRECT=

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /public/hot
+/public/build
 /public/storage
 /storage/*.key
 /vendor
@@ -15,10 +16,10 @@ yarn-error.log
 _ide_helper.php
 _ide_helper_models.php
 .phpstorm.meta.php
-/public/mix-manifest.json
-public/css
-public/js
+/mix-manifest.json
+css
+js
 public/img/*
-public/images
+images
 composer.phar
 .phpunit.cache

Dockerfile

@@ -17,7 +17,7 @@ COPY . .
 
 RUN composer dump-autoload --no-dev --optimize
 
-RUN npm run prod
+RUN npm run build
 
 CMD ["bash", "-c", "make db-prepare start-app"]
 

Makefile

@@ -10,7 +10,7 @@ deploy:
 	git push heroku main
 
 setup: env-prepare sqlite-prepare install key db-prepare ide-helper
-	npm run development
+	npm run build
 
 install-app:
 	composer install
@@ -27,7 +27,7 @@ start-app:
 	php artisan serve --host 0.0.0.0 --port ${PORT}
 
 start-frontend:
-	npm run watch
+	npm run dev
 
 db-prepare:
 	php artisan migrate:fresh --force --seed

config/app.php

@@ -227,6 +227,7 @@
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
         'Yaml' => Symfony\Component\Yaml\Yaml::class,
+        'Vite' => Illuminate\Support\Facades\Vite::class,
     ],
 
 ];

docker-compose.yml

@@ -20,6 +20,8 @@ services:
       dockerfile: Dockerfile.dev
     volumes:
       - .:/app:delegated
+    ports:
+      - 5173:5173
     command: ["make", "start-frontend"]
 
   database:
@@ -29,7 +31,7 @@ services:
     ports:
       - 54320:5432
     volumes:
-    - hexlet-sicp-pgdata:/var/lib/postgresql/data
+      - hexlet-sicp-pgdata:/var/lib/postgresql/data
 
 volumes:
   hexlet-sicp-pgdata: