Merge pull request #387 from viralsolani/develop
Merge Develop branch..
Showing
client/.babelrc
0 → 100644
client/src/index.js
0 → 100644
client/webpack.config.js
0 → 100644
... | ... | @@ -14,6 +14,7 @@ |
"php": ">=7.1.3", | ||
"arcanedev/log-viewer": "^4.5", | ||
"arcanedev/no-captcha": "^5.0", | ||
"beyondcode/laravel-self-diagnosis": "^1.2", | ||
"creativeorange/gravatar": "~1.0", | ||
"davejamesmiller/laravel-breadcrumbs": "^5.0", | ||
"doctrine/dbal": "^2.9", | ||
... | ... | @@ -32,6 +33,7 @@ |
"bvipul/generator": "^5.8.1", | ||
"codedungeon/phpunit-result-printer": "^0.19.10", | ||
"filp/whoops": "~2.0", | ||
"friendsofphp/php-cs-fixer": "^2.10", | ||
"fzaninotto/faker": "~1.4", | ||
"laravel/telescope": "^2.0", | ||
"mockery/mockery": "1.2.2", | ||
... | ... | @@ -73,6 +75,30 @@ |
"post-autoload-dump": [ | ||
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", | ||
"@php artisan package:discover" | ||
], | ||
"clear-all": [ | ||
"@php artisan clear-compiled", | ||
"@php artisan cache:clear", | ||
"@php artisan route:clear", | ||
"@php artisan view:clear", | ||
"@php artisan config:clear", | ||
"composer dumpautoload -o" | ||
], | ||
"cache-all": [ | ||
"@php artisan config:cache", | ||
"@php artisan route:cache" | ||
], | ||
"cc": [ | ||
"composer clear-all", | ||
"composer cache-all" | ||
], | ||
"format": [ | ||
"./vendor/bin/php-cs-fixer fix app/ --show-progress=estimating", | ||
"./vendor/bin/php-cs-fixer fix config/ --show-progress=estimating", | ||
"./vendor/bin/php-cs-fixer fix database/ --show-progress=estimating", | ||
"./vendor/bin/php-cs-fixer fix resources/ --show-progress=estimating", | ||
"./vendor/bin/php-cs-fixer fix routes/ --show-progress=estimating", | ||
"./vendor/bin/php-cs-fixer fix tests/ --show-progress=estimating" | ||
] | ||
}, | ||
"config": { | ||
... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
... | ... | @@ -2,7 +2,8 @@ |
"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", | ||
"build-client": "cross-env NODE_ENV=development webpack --mode=development --env build --config=client/webpack.config.js", | ||
"development": "npm run build-client && cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"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", | ||
... | ... | @@ -11,28 +12,28 @@ |
}, | ||
"devDependencies": { | ||
"axios": "^0.18", | ||
"bootstrap-sass": "3.3.7", | ||
"bootstrap-sass": ">=3.4.1", | ||
"cross-env": "^5.1", | ||
"font-awesome": "^4.7.0", | ||
"jquery": "^3.1.1", | ||
"laravel-mix": "^4.0.14", | ||
"jquery": "^3.4.0", | ||
"laravel-mix": "^4.0.15", | ||
"lodash": "^4.17.4", | ||
"resolve-url-loader": "2.3.1", | ||
"sass-loader": "7.*", | ||
"vue-template-compiler": "^2.6.8", | ||
"vue": "^2.5.17", | ||
"webpack-rtl-plugin": "^1.7.0" | ||
"vue": "^2.6.10", | ||
"vue-template-compiler": "^2.6.10", | ||
"webpack-rtl-plugin": "^1.8.2" | ||
}, | ||
"dependencies": { | ||
"bootstrap": "^3.4.1", | ||
"bootstrap-datetimepicker-npm": "^4.17.37-npm", | ||
"datatables.net": "^1.10.15", | ||
"datatables.net-buttons": "^1.3.1", | ||
"datatables.net-buttons": "^1.5.6", | ||
"moment": "^2.24.0", | ||
"nestable2": "^1.5.0", | ||
"sass": "^1.17.3", | ||
"pluralize": "^7.0.0", | ||
"sass": "^1.19.0", | ||
"select2": "^4.0.4", | ||
"tinymce": "^4.9.3" | ||
"tinymce": "^4.9.4" | ||
} | ||
} |
Please register or sign in to comment