Merge pull request #58 from mckenziearts/2.x

2.x

Author: mckenziearts

.gitignore

@@ -11,6 +11,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-yarn.lock
-package-lock.json
 composer.lock

.travis.yml

@@ -3,11 +3,12 @@ language: php
 sudo: true
 
 php:
-  - 7.2
+  - 7.4
 
 env:
   matrix:
     - LARAVEL_VERSION=7.0.*
+    - LARAVEL_VERSION=8.0.*
 
 matrix:
   fast_finish: true
@@ -20,5 +21,5 @@ cache:
 before_script:
   - travis_retry composer self-update
   - composer require "illuminate/support:${LARAVEL_VERSION}"
-  - npm install
-  - npm run dev
+  - yarn install
+  - yarn run dev

changelog.md

@@ -2,6 +2,20 @@
 
 All notable changes to `laravel-notify` will be documented in this file.
 
+## Version 2.2
+
+### Added
+- Notify timeout
+- Add Support for PHP 7.4
+
+### Updated
+- Upgrade to Tailwind v2
+
+## Version 2.1
+
+### Added
+- Add Support for Laravel 8
+
 ## Version 2.0
 Version 2 is Here 🤩 ! Laravel Notify is a package that lets you add custom notifications to your project. 
 A diverse range of notification design with TailwindCSS and TailwindUI.

composer.json

@@ -13,12 +13,12 @@
   "homepage": "https://github.com/mckenziearts/laravel-notify",
   "keywords": ["Laravel", "laravel-notify", "notification"],
   "require": {
-    "php": ">=7.1",
-    "illuminate/support": "^7.0|^8.0"
+    "php": ">=7.4",
+    "illuminate/support": "~7.0|~8.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "phpunit/phpunit": "^8.0"
+    "phpunit/phpunit": "^8.0|^9.0"
   },
   "autoload": {
     "psr-4": {

config/notify.php

@@ -27,6 +27,17 @@
 
     'demo' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Notification timeout
+    |--------------------------------------------------------------------------
+    |
+    | Defines the number of seconds during which the notification will be visible.
+    |
+    */
+
+    'timeout'   => 5000,
+
     /*
     |--------------------------------------------------------------------------
     | Preset Messages

package.json

@@ -1,26 +1,22 @@
 {
   "private": true,
   "scripts": {
-    "dev": "npm run development",
-    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "npm run development -- --watch",
-    "watch-poll": "npm run watch -- --watch-poll",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    "development": "mix",
+    "watch": "mix watch",
+    "watch-poll": "mix watch -- --watch-options-poll=1000",
+    "hot": "mix watch --hot",
+    "production": "mix --production"
   },
   "devDependencies": {
     "cross-env": "^5.1",
     "resolve-url-loader": "^2.3.1",
-    "sass": "^1.15.2",
-    "sass-loader": "^7.1.0",
     "vue-template-compiler": "^2.6.10"
   },
   "dependencies": {
-    "@tailwindcss/ui": "^0.3.0",
-    "alpinejs": "^2.3.5",
-    "laravel-mix": "^4.0.7",
-    "laravel-mix-tailwind": "^0.1.0",
-    "tailwindcss": "^1.7.3"
+    "alpinejs": "^2.8.1",
+    "autoprefixer": "^10.2.6",
+    "laravel-mix": "^6.0.19",
+    "postcss": "^8.3.0",
+    "tailwindcss": "^2.1.2"
   }
 }