Merge pull request #1385 from krayin/2.x

feat: 2.x updates to master

Author: devansh-webkul

.env.example

@@ -7,6 +7,9 @@ APP_URL=http://localhost
 APP_TIMEZONE=Asia/Kolkata
 APP_LOCALE=en
 
+VITE_HOST=
+VITE_PORT=
+
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 

.gitattributes

@@ -1,5 +1,11 @@
-* text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+* text=auto eol=lf
+
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
 CHANGELOG.md export-ignore
+.styleci.yml export-ignore

.github/workflows/ci.yml

@@ -13,12 +13,10 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: krayin_testing
-          MYSQL_USER: krayin
-          MYSQL_PASSWORD: secret
+          MYSQL_DATABASE: krayin
         ports:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
@@ -34,39 +32,37 @@ jobs:
           extensions: curl, gd, intl, mbstring, openssl, pdo, pdo_mysql, tokenizer, zip
 
       - name: Composer Install
-        run: |
-          set -e
-          composer install --no-cache
+        run: composer install
 
       - name: Set Testing Environment
         run: |
-          cp .env.example .env.testing
-          set -e
-          sed -i "s|^\(DB_HOST=\s*\).*$|\1127.0.0.1|" .env.testing
-          sed -i "s|^\(DB_PORT=\s*\).*$|\1${{ job.services.mysql.ports['3306'] }}|" .env.testing
-          sed -i "s|^\(DB_DATABASE=\s*\).*$|\1krayin_testing|" .env.testing
-          sed -i "s|^\(DB_USERNAME=\s*\).*$|\1krayin|" .env.testing
-          sed -i "s|^\(DB_PASSWORD=\s*\).*$|\1secret|" .env.testing
+          cp .env.example .env
+          sed -i "s|^\(APP_ENV=\s*\).*$|\1testing|" .env
+          sed -i "s|^\(DB_HOST=\s*\).*$|\1127.0.0.1|" .env
+          sed -i "s|^\(DB_PORT=\s*\).*$|\1${{ job.services.mysql.ports['3306'] }}|" .env
+          sed -i "s|^\(DB_DATABASE=\s*\).*$|\1krayin|" .env
+          sed -i "s|^\(DB_USERNAME=\s*\).*$|\1root|" .env
+          sed -i "s|^\(DB_PASSWORD=\s*\).*$|\1root|" .env
 
       - name: Key Generate
-        run: set -e && php artisan key:generate --env=testing
+        run: php artisan key:generate
 
-      - name: Complete Testing Env File
+      - name: Complete ENV File
         run: |
-          printf "The complete `.env.testing` ... \n\n"
-          cat .env.testing
+          printf "The complete `.env` ... \n\n"
+          cat .env
 
       - name: Migrate Database
-        run: set -e && php artisan migrate --env=testing
+        run: php artisan migrate
 
       - name: Seed Database
-        run: set -e && php artisan db:seed --env=testing
+        run: php artisan db:seed
 
       - name: Vendor Publish
-        run: set -e && php artisan vendor:publish --all --force --env=testing
+        run: php artisan vendor:publish --provider=Webkul\\Core\\Providers\\CoreServiceProvider --force
 
       - name: Optimize Stuffs
-        run: set -e && php artisan optimize:clear --env=testing
+        run: php artisan optimize:clear
 
       - name: Run Tests
-        run: set -e && vendor/bin/pest
+        run: vendor/bin/pest

.github/workflows/linting_tests.yml

@@ -0,0 +1,22 @@
+name: Linting Tests
+
+on: [push, pull_request]
+
+jobs:
+  linting_tests:
+    runs-on: ${{ matrix.operating-systems }}
+
+    strategy:
+      matrix:
+        operating-systems: [ubuntu-latest]
+        php-versions: ['8.1']
+
+    name: PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-systems }}
+
+    steps:
+        - uses: actions/checkout@v1
+        - name: Running Pint Test
+          uses: aglipanci/[email protected]
+          with:
+            testMode: true
+            verboseMode: true

.gitignore

@@ -1,14 +1,12 @@
 .env
 .env.testing
-.env.backup
-.DS_Store
-.phpunit.result.cache
-docker-compose.override.yml
 .idea
 .php_cs.cache
+.phpunit.result.cache
 .vscode
-todo.txt
 .vagrant
+*.hot
+/stubs
 /data
 /docker-compose-collection
 Homestead.json
@@ -18,13 +16,13 @@ Homestead.yaml
 npm-debug.log
 package-lock.json
 /public/css
-/public/fonts
 /public/js
 /public/hot
 /public/storage
-/public/themes
 /public/vendor
+/lang/vendor
 /storage/*.key
 /storage/dcc-data/
-/stubs
 /vendor
+yarn.lock
+yarn-error.log

.htaccess

@@ -5,9 +5,5 @@ php:
   finder:
     not-name:
       - index.php
-      - server.php
-js:
-  finder:
-    not-name:
-      - webpack.mix.js
+js: true
 css: true

.styleci.yml

@@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
      */
     protected function schedule(Schedule $schedule)

app/Console/Kernel.php

@@ -20,7 +20,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Webkul\Installer\Http\Middleware\CanInstall::class,
     ];
 
     /**

app/Http/Kernel.php

@@ -12,6 +12,6 @@ class EncryptCookies extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'dark_mode',
     ];
 }