Skip to content

Commit

Permalink
v2.4.0
Browse files Browse the repository at this point in the history
- Fixed setup script supressed feedback (logging level 2)
- Dropped Cypress.io in favor of Laravel Dusk
    - Added Laravel Dusk to be installed during creation
        - Added Google Chrome to be installed during setup
        - Added a localization testing helper for Dusk
        - Added a global Pest testing helper
- Updated Vite's Livewire hot-reload settings yet again
- Fix Xdebug log permissions
- Fixed Laraphense extension settings
- Updated [README.md]
  • Loading branch information
GoodM4ven committed Oct 17, 2023
1 parent b03ea20 commit afdbc3c
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 73 deletions.
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This way, I don't have to worry about the things I've mentioned, plus I gain the
- [Mailpit](https://github.com/axllent/mailpit) (http://localhost:8025)
- [MinIO](https://min.io/) (http://localhost:9000)
- Active Services
- [Expose](https://expose.dev/docs) (Installed if `EXPOSE_TOKEN` is provided in [.env] file. And use `expose share https://[site-name].test` to work properly)
- [Expose](https://expose.dev/docs) (Installed if `EXPOSE_TOKEN` is provided in [.env] file. Use `expose share https://[site-name].test` to work properly)

</p>
</details>
Expand All @@ -65,13 +65,10 @@ This way, I don't have to worry about the things I've mentioned, plus I gain the

- Essentials
- [league/flysystem-aws-s3-v3](https://flysystem.thephpleague.com/docs/adapter/aws-s3-v3/)
- [laracasts/cypress](https://github.com/laracasts/cypress) [Dev]
- Use `npx cypress open` to run the tester
- Checkout this [episode](https://laracasts.com/series/jeffreys-larabits/episodes/22) for more details
- [predis/predis](https://github.com/predis/predis)
- [artesaos/seotools](https://github.com/artesaos/seotools)
- [spatie/laravel-data](https://github.com/spatie/laravel-data)
- [laravel/scout](https://laravel.com/docs/10.x/scout)
- [laravel/scout](https://laravel.com/docs/scout)
- [qruto/laravel-wave](https://github.com/qruto/laravel-wave)
- ["spatie/laravel-medialibrary:^10.0.0"](https://spatie.be/docs/laravel-medialibrary/v10)
- [spatie/eloquent-sortable](https://github.com/spatie/eloquent-sortable)
Expand All @@ -82,8 +79,9 @@ This way, I don't have to worry about the things I've mentioned, plus I gain the
- [blade-ui-kit/blade-icons](https://github.com/blade-ui-kit/blade-icons)
- [blade-ui-kit/blade-heroicons](https://github.com/blade-ui-kit/blade-heroicons)
- [gehrisandro/tailwind-merge-laravel](https://github.com/gehrisandro/tailwind-merge-laravel)
- [laravel/breeze](https://laravel.com/docs/10.x/starter-kits#laravel-breeze) [Dev]
- [laravel/telescope](https://laravel.com/docs/10.x/telescope) (https://project-name.test/telescope) [Dev]
- [laravel/dusk](https://laravel.com/docs/dusk) [Dev]
- [laravel/breeze](https://laravel.com/docs/starter-kits#laravel-breeze) [Dev]
- [laravel/telescope](https://laravel.com/docs/telescope) (https://project-name.test/telescope) [Dev]
- [Option] TALL Stack
- [livewire/livewire](https://livewire.laravel.com/)
- [filament/filament:"^3.0-stable"](https://filamentphp.com/docs/3.x/panels/installation) (https://project-name.test/admin)
Expand Down Expand Up @@ -124,7 +122,6 @@ This way, I don't have to worry about the things I've mentioned, plus I gain the
- [Graphite](https://graphite.dev/)

- Essentials
- [cypress](https://www.cypress.io/)
- [laravel-wave](https://github.com/qruto/laravel-wave)
- [tailwindcss](https://tailwindcss.com/) [Dev]
- [postcss](https://github.com/postcss/postcss) [Dev]
Expand Down Expand Up @@ -219,7 +216,6 @@ There's an option not to remove Breeze views and routes during the creation scri
- [Laravel](https://laravel.com)
- [FilamentPHP](https://filamentphp.com)
- [Pest](https://pestphp.com)
- [Cypress](https://cypress.io)
- [Spatie](https://github.com/spatie)
- ( [Tech Stack List](#tech-stack-list) )
- ( [VSC Extensions](./files/.opinionated/extensions.md) )
Expand Down
3 changes: 2 additions & 1 deletion files/.opinionated/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- [m1guelpf.better-pest](https://github.com/m1guelpf/better-pest) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=m1guelpf.better-pest)]
- [calebporzio.better-phpunit](https://github.com/calebporzio/better-phpunit) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=calebporzio.better-phpunit)]
- [wmaurer.change-case](https://github.com/wmaurer/vscode-change-case)
- [naumovs.color-highlight](https://github.com/enyancc/vscode-ext-color-highlight)
- [Equinusocio.vsc-community-material-theme](https://github.com/material-theme/vsc-community-material-theme) (Darker High Contrast)
- [moshfeu.compare-folders](https://github.com/moshfeu/vscode-compare-folders)
- [cshum.convert-newline-list-to-array](https://github.com/colinshum/vsc-newline-to-array) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=cshum.convert-newline-list-to-array)]
Expand Down Expand Up @@ -55,7 +56,7 @@
- [albert.TabOut](https://github.com/albertromkes/tabout)
- [bradlc.vscode-tailwindcss](https://github.com/tailwindlabs/tailwindcss-intellisense)
- [austenc.tailwind-docs](https://github.com/austenc/vscode-tailwind-docs) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=austenc.tailwind-docs)]
- [bourhaouta.tailwindshades](https://github.com/bourhaouta/vscode-tailwindshades) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=bourhaouta.tailwindshades)]
- [GoodM4ven.vsc-tailwind-shades-generator](https://github.com/GoodM4ven/vsc-tailwind-shades-generator)
- [jkjustjoshing.vscode-text-pastry](https://github.com/jkjustjoshing/vscode-text-pastry) [Not on VSX yet | [Market Link](https://marketplace.visualstudio.com/items?itemName=jkjustjoshing.vscode-text-pastry)]
- [Gruntfuggly.todo-tree](https://github.com/Gruntfuggly/todo-tree)
- [hideoo.trailing](https://github.com/HiDeoo/trailing)
22 changes: 11 additions & 11 deletions files/.opinionated/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@
["TailwindMerge::merge\\(\\[?([^\\]]*)\\]?\\)", "'([^']*)'"]
],
// [INTEL - Laraphense]
"Laraphense.disableAssetCompletion": true,
"Laraphense.disableBladeCompletion": true,
"Laraphense.disableEloquentCompletion": true,
"Laraphense.disableConfigCompletion": true,
"Laraphense.disableEnvCompletion": true,
"Laraphense.disableMiddlewareCompletion": true,
"Laraphense.disableRouteCompletion": true,
"Laraphense.disableTranslationCompletion": true,
"Laraphense.disableValidationCompletion": true,
"Laraphense.disableViewCompletion": true,
"Laraphense.expandLeadingNamespaceSeparator": false,
"laraphense.disableAssetCompletion": true,
"laraphense.disableBladeCompletion": true,
"laraphense.disableEloquentCompletion": true,
"laraphense.disableConfigCompletion": true,
"laraphense.disableEnvCompletion": true,
"laraphense.disableMiddlewareCompletion": true,
"laraphense.disableRouteCompletion": true,
"laraphense.disableTranslationCompletion": true,
"laraphense.disableValidationCompletion": true,
"laraphense.disableViewCompletion": true,
"laraphense.expandLeadingNamespaceSeparator": false,
// // [INTEL - Alpine.js IntelliSense]
// "alpine-intellisense.settings.languageScopes": "blade", // TODO uncomment when intel shows within elements only
}
17 changes: 4 additions & 13 deletions files/_stubs/tall/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,11 @@ export default defineConfig({
'resources/css/filament/admin/theme.css',
'resources/js/app.js',
],
refresh: [
"app/Filament/**/*.php",
"app/Forms/**/*.php",
"app/Infolists/**/*.php",
"app/Livewire/**/*.php",
"app/Providers/Filament/**/*.php",
"app/Tables/**/*.php",
"app/View/Components/**/*.php",
"lang/**",
"resources/lang/**",
"routes/**",
],
refresh: false,
}),
livewire({
refresh: ['resources/css/app.css'],
}),
livewire(),
],
server: {
host,
Expand Down
4 changes: 4 additions & 0 deletions files/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export default {
'dark-background-1': colors.gray['800'],
'dark-background-2': colors.gray['900'],
primary: {
50: '#e8f7fb',
100: '#cdf0f6',
200: '#9be2ee',
300: '#6ad3e5',
Expand All @@ -38,8 +39,10 @@ export default {
700: '#046d7f',
800: '#024955',
900: '#01242a',
950: '#001519',
},
'dark-primary': {
50: '#fee7e7',
100: '#fcdada',
200: '#f9b4b4',
300: '#f58f8f',
Expand All @@ -49,6 +52,7 @@ export default {
700: '#8f2929',
800: '#601b1b',
900: '#300e0e',
950: '#1a0707',
},
},
transitionProperty: {},
Expand Down
45 changes: 25 additions & 20 deletions scripts/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ echo -e "\nInstalling Composer packages..." >&3
cd $PROJECTS_DIRECTORY/$escaped_project_name

# Breeze package
composer require --dev laravel/breeze laravel/telescope --with-all-dependencies -n $conditional_quiet
composer require --dev laravel/breeze --with-all-dependencies -n $conditional_quiet

if [ "$laravel_stack" = "tall" ]; then
stack="blade"
Expand Down Expand Up @@ -305,7 +305,7 @@ if [ "$is_localized" == true ]; then
fi

# Dev Packages
composer require laracasts/cypress --dev -n $conditional_quiet
composer require laravel/dusk laravel/telescope --dev -n $conditional_quiet

# Non-dev Packages...
composer require --with-all-dependencies -n league/flysystem-aws-s3-v3:"^3.0" predis/predis laravel/scout spatie/laravel-medialibrary spatie/laravel-data spatie/eloquent-sortable spatie/laravel-sluggable spatie/laravel-tags spatie/laravel-settings blade-ui-kit/blade-icons spatie/laravel-permission qruto/laravel-wave gehrisandro/tailwind-merge-laravel artesaos/seotools $conditional_quiet
Expand Down Expand Up @@ -380,19 +380,6 @@ fi
# Enforce permissions
sudo $lara_stacker_dir/scripts/helpers/permit.sh $PROJECTS_DIRECTORY/$escaped_project_name

# ! Currently vulnerable!
# TODO add to the others when stable
# Cypress

sudo -i -u $USERNAME bash <<EOF
cd $PROJECTS_DIRECTORY/$escaped_project_name
if $cancel_suppression; then
$BUN add --force --dev cypress 2>&1
else
$BUN add --force --dev cypress 2>&1 >/dev/null
fi
EOF

# * =======================
# * Package Configurations
# * =====================
Expand All @@ -404,6 +391,29 @@ php artisan migrate $conditional_quiet

echo -e "\nRan the migrations initially." >&3

# Laravel Dusk
php artisan dusk:install $conditional_quiet

echo -e "\nInstalled Laravel Dusk and its standalone ChromeDriver." >&3

if [ "$use_pest" == true ]; then
sed -i'' -e '/use Tests\\TestCase;/a\
use Tests\\DuskTestCase;' ./tests/Pest.php
sed -i'' -e '/uses(TestCase::class, RefreshDatabase::class)->in('\''Feature'\'');/a\
uses(DuskTestCase::class, RefreshDatabase::class)->in('\''Browser'\'');' ./tests/Pest.php
sed -i '/function something()/,/}/c\function booleanHead(array $booleanArray): bool\n{\n return filter_var(head($booleanArray), FILTER_VALIDATE_BOOLEAN);\n}' ./tests/Pest.php

if [ "$is_localized" == true ]; then
sed -i '/use Illuminate\\Foundation\\Testing\\TestCase as BaseTestCase;/a\use Mcamara\\LaravelLocalization\\LaravelLocalization;' ./tests/TestCase.php
sed -i '/use CreatesApplication;/a\
\n protected function setUp(): void\n {\n parent::setUp();\n\n $this->withoutVite();\n }\n\n protected function tearDown(): void\n {\n putenv(LaravelLocalization::ENV_ROUTE_KEY);\n\n parent::tearDown();\n }\n\n protected function identifyLocalizedRoutesForLocale(string $locale)\n {\n self::tearDown();\n\n putenv(LaravelLocalization::ENV_ROUTE_KEY . \"=\" . $locale);\n\n self::setUp();\n }' ./tests/TestCase.php
fi

rm ./tests/Browser/Pages/HomePage.php

echo -e "\nIntegrated Laravel Dusk with Pest and added a helper method!" >&3
fi

# TaliwindCSS framework
mkdir -p ./resources/css/packages

Expand All @@ -426,11 +436,6 @@ php artisan vendor:publish --provider="TailwindMerge\Laravel\TailwindMergeServic

echo -e "\nConfigured TailwindCSS framework and TailwindMerge package." >&3

# Cypress framework
php artisan cypress:boilerplate $conditional_quiet

echo -e "\nConfigured front-end testing with Cypress." >&3

# Laravel Data package
php artisan vendor:publish --provider="Spatie\LaravelData\LaravelDataServiceProvider" --tag="data-config" $conditional_quiet

Expand Down
Loading

0 comments on commit afdbc3c

Please sign in to comment.