wireui · ph7jack · Nov 3, 2023 · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -8,14 +8,8 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[*.ts]
-indent_size = 2
-
-[*.js]
-indent_size = 2
-
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,yaml}]
+[*.{ts,js,yml,yaml}]
 indent_size = 2
diff --git a/.eslintrc b/.eslintrc
@@ -18,7 +18,6 @@
         // Possible Errors
         "no-extra-parens": ["error", "all", { "returnAssign": false }],
         "import/first": "off",
-        "import/named": "error",
         "import/namespace": "error",
         "import/default": "error",
         "import/export": "error",
@@ -30,7 +29,7 @@
 
         // Best Practices
         "eqeqeq": "error",
-        "no-invalid-this": "error",
+//        "no-invalid-this": "error",
         "no-return-assign": ["error", "except-parens"],
         "no-unused-expressions": ["error", { "allowTernary": true }],
         "no-useless-concat": "error",
@@ -107,8 +106,11 @@
             "plugins": ["@typescript-eslint"],
             "rules": {
                 "indent": "off",
+                "no-use-before-define": "off",
+                "@typescript-eslint/ban-ts-comment": "warn",
                 "@typescript-eslint/no-explicit-any": "off",
-                "@typescript-eslint/indent": ["error", 2]
+                "@typescript-eslint/indent": ["error", 2],
+                "@typescript-eslint/no-use-before-define": "error"
             }
         }
     ]

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      - 2.x
+      - 0.x
 
   pull_request:
     types: [ready_for_review, synchronize, opened]
@@ -16,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1, 8.2]
+        php: [8.2]
         laravel: [10.*]
 
     name: PHP:${{ matrix.php }} / Laravel:${{ matrix.laravel }}
@@ -25,14 +27,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node and run tests
-        uses: actions/setup-node@v1
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: "16.x"
-      - run: yarn install --frozen-lockfile
-      - run: yarn lint
-      - run: yarn build
-      - run: yarn test
+          node-version: "v18.12.x"
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -42,25 +40,30 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-          restore-keys: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-
+      - name: Install Node Modules
+        run: yarn install --frozen-lockfile
 
       - name: Install Composer dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
           composer update --no-interaction --no-suggest
 
+      - name: Check Composer configuration
+        run: composer validate --strict
+
       - name: Setup dusk/chrome
         run: vendor/bin/dusk-updater detect --auto-update
 
+      - name: Code Style Check
+        run: |
+          composer pint:test
+          yarn lint
+
+      - name: Run Jest tests
+        run: |
+          yarn build
+          yarn test
+
       - name: Run PHPUnit tests
         run: composer test
         env:

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,9 @@ coverage
 tests/Browser/console
 tests/Browser/screenshots
 tests/Browser/source
+tests/Browser/tmp
 .phpunit.result.cache
+.phpunit.cache/
 yarn-error.log
 .idea
 .vscode

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.15.0
+v18.18.0
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,54 +1,78 @@
-# Contributing
+# Contributing to WireUI
 
-## Before you start
+We welcome contributions from everyone, and are grateful for the time and effort spent by contributors. 
+This document provides guidelines and steps for contributing to WireUI.
 
-Please, make sure you have taken a look on [our documentation](https://livewire-wireui.com/).
+## Table of Contents
+- [Before You Start](#before-you-start)
+- [Setting Up Your Environment](#setting-up-your-environment)
+- [Working on a Local Project](#working-on-a-local-project)
+- [Submitting Your Contributions](#submitting-your-contributions)
 
-Are you with problem with one of ours components? The best way to reach us is to
-open a new issue, we just ask you to search if your problem was discussed before
-and if so continue the discussion there.
+## Before You Start
 
-Wanna to submit a new pull request? Let us know what you're planning to work opening a
-new issue this will prevent that we're working on the same thing. We'll be very happy
-to discuss and review your code.
+- Please ensure you have reviewed [our documentation](https://wireui.dev) to familiarize yourself with the project.
+- If you encounter issues with any of our components, we encourage you to [open a new issue](https://github.com/wireui/wireui/issues). Before doing so, please check for existing issues to avoid duplicates and continue the discussion there if the issue has already been reported.
+- If you're planning to submit a pull request, kindly [open a new issue](https://github.com/wireui/wireui/issues) detailing your plans to ensure we're not working on the same feature/bug fix. We're always excited to review and discuss your code!
 
-## Installing
+## Setting Up Your Environment
 
-To clone the project source and install its dependencies, run:
+1. **Clone the repository and install dependencies:**
 
-```shell
-git clone [email protected]:wireui/wireui.git
-cd wireui
+    ```shell
+    git clone [email protected]:wireui/wireui.git
+    cd wireui
+    composer install
+    yarn install
+    ```
+
+2. **Running Tests:**
+Make sure you have a chromium-based browser installed for running tests.
 
-composer install
-yarn install
-```
+    ```shell
+    composer test 
+    yarn test  
+    ```
+
+3. **Code Formatting:**
+We adhere to a coding standard to maintain consistency. Before submitting your PR, ensure your code is formatted by running:
 
-To run the project test make sure you have installed the chromium-browser and run:
+    ```shell
+    composer pint
+    yarn lint
+    ```
+## Working on a Local Project
+1. **Create a new Laravel project:**
+    ```shell
+    composer create-project laravel/laravel wireui-demo
+   cd wireui-demo
+    ```
 
-```shell
-composer test
-```
-
-Now you can work on the project. We're using a code standard to format our code
-so before send your PR make sure that you run ` composer phpcs `.
-
-## Work on a local project with the project source
-
-After installing the projects using the steps above you can create a brand new laravel
-project and add to the composer.json:
-
-```json
-    ...,
+2. **Link local wireui into composer.json**
+    ```json
     "repositories": {
         "local": {
             "type": "path",
             "url": "../path/to/wireui"
         }
     }
-}
-```
+    ```
+
+3. **Install WireUI as a local dependency:**
+    ```shell
+    composer require wireui/wireui
+    ```
+
+4. **Complete the setup:**
+
+    Follow the WireUI [installation instructions](https://wireui.dev/docs/installation) to finish the setup.
+
+
+5. **You're ready to contribute! 🎉**
+
+## Submitting Your Contributions
+Head over to the Pull Requests section in GitHub and create a new pull request.
+
+Please provide a clear description of the changes you made, and reference any related issues.
 
-After added this configuration you can install the wireui project as a local dependency
-using ` composer require wireui/wireui `, so when you change the wireui source code
-it will be reflected on your laravel package.
+We look forward to your contributions!
diff --git a/composer.json b/composer.json
@@ -10,19 +10,22 @@
         "blade components"
     ],
     "require": {
-        "php": "^8.1",
-        "laravel/framework": "10.*",
-        "livewire/livewire": "^3.0"
+        "php": "^8.2",
+        "laravel/framework": "^10.0",
+        "livewire/livewire": "^3.1",
+        "wireui/heroicons": "^2.4"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.0",
         "orchestra/testbench": "^8.0",
         "orchestra/testbench-dusk": "^8.0",
-        "psy/psysh": "@stable",
-        "friendsofphp/php-cs-fixer": "^3.9",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-mock": "^1.0"
+        "psy/psysh": "^0.11.12",
+        "pestphp/pest": "^2.24",
+        "pestphp/pest-plugin-livewire": "^2.1",
+        "pestphp/pest-plugin-laravel": "^2.0",
+        "laravel/pint": "^1.10",
+        "livewire/volt": "^1.3"
     },
     "authors": [
         {
@@ -50,12 +53,13 @@
         ],
         "test": "./vendor/bin/pest",
         "test:ci": "CI=true ./vendor/bin/pest",
-        "phpcs": "./vendor/bin/php-cs-fixer fix"
+        "pint": "./vendor/bin/pint",
+        "pint:test": "./vendor/bin/pint --test"
     },
     "extra": {
         "laravel": {
             "providers": [
-                "WireUi\\Providers\\WireUiServiceProvider"
+                "WireUi\\ServiceProvider"
             ],
             "aliases": []
         }