Skip to content

Commit

Permalink
Tailwind v4 / Vite v6 / Starter Kit package structure (#404)
Browse files Browse the repository at this point in the history
* First pass

* Update p leading

* Style and build assets

* Simplify @source config

* Kids being cool doesn't make them right

* Kids being cool don't make them right

* Merge main

* Move to new starter kit structure

* Remove statamic/statamic tailwind.config.js file

* Move Github files

* Move Tailwind Peak config file

* Update CHANGELOG

* Update CHANGELOG

* Update Alpnie

* Add changelog and switch up npm install logic
  • Loading branch information
robdekort authored Dec 6, 2024
1 parent 6259e09 commit 7f72482
Show file tree
Hide file tree
Showing 203 changed files with 1,270 additions and 1,943 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v20.0.0 (2024-12-06)

### What's new
- Tailwind v4.0, Vite v6 and new Statamic Starter Kit package structure. #404 by @andjsch and @robdekort

## v19.17.3 (2024-11-22)

### What's fixed
Expand Down
8 changes: 7 additions & 1 deletion StarterKitPostInstall.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public function handle($console): void
$this->excludeFormsFolderFromGit();
$this->setupComposerUpdateWorkflow();
$this->installNodeDependencies();
$this->installPuppeteerAndBrowsershot();
$this->installTranslations();
$this->setLocale();
$this->setTimezone();
Expand Down Expand Up @@ -107,6 +106,8 @@ protected function installNodeDependencies(): void
processingMessage: 'Installing npm dependencies...',
successMessage: 'npm dependencies installed.',
);

$this->installPuppeteerAndBrowsershot();
}

protected function installPuppeteerAndBrowsershot(): void
Expand Down Expand Up @@ -195,14 +196,19 @@ protected function runPeakClearSite(): void

protected function writeFiles(): void
{
$changelog = app('files')->get(__DIR__.'/CHANGELOG.md');

app('files')->put(base_path('.env'), $this->env);
app('files')->put(base_path('CHANGELOG.md'), $changelog);
app('files')->put(base_path('README.md'), $this->readme);
app('files')->put(base_path('config/app.php'), $this->app);
app('files')->put(base_path('resources/sites.yaml'), $this->sites);
}

protected function cleanUp(): void
{
app('files')->exists(base_path('tailwind.config.js')) && app('files')->delete(base_path('tailwind.config.js'));

$this->withSpinner(
fn () => $this->cleanUpComposerPackages(),
'Cleaning up composer packages...',
Expand Down
41 changes: 0 additions & 41 deletions app/Console/Kernel.php

This file was deleted.

17 changes: 0 additions & 17 deletions app/Http/Middleware/VerifyCsrfToken.php

This file was deleted.

43 changes: 0 additions & 43 deletions app/Providers/EventServiceProvider.php

This file was deleted.

87 changes: 87 additions & 0 deletions export/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
APP_NAME="Statamic Peak"
APP_ENV=local
APP_KEY=
APP_DEBUG=true
DEBUGBAR_ENABLED=true
APP_TIMEZONE="UTC"
APP_URL=

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US

APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=file

BCRYPT_ROUNDS=12

LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug

DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=laravel
# DB_USERNAME=root
# DB_PASSWORD=

SESSION_DRIVER=file
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync

CACHE_STORE=file
CACHE_PREFIX=

MEMCACHED_HOST=127.0.0.1

REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=localhost
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="[email protected]"
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false

VITE_APP_NAME="${APP_NAME}"

STATAMIC_LICENSE_KEY=
STATAMIC_THEME=business
STATAMIC_PRO_ENABLED=false
STATAMIC_STACHE_WATCHER=auto
STATAMIC_STATIC_CACHING_STRATEGY=null
STATAMIC_CACHE_TAGS_ENABLED=false
STATAMIC_REVISIONS_ENABLED=false
STATAMIC_GRAPHQL_ENABLED=false
STATAMIC_API_ENABLED=false
STATAMIC_GIT_ENABLED=false
STATAMIC_GIT_PUSH=false
STATAMIC_GIT_DISPATCH_DELAY=5

#IMAGE_MANIPULATION_DRIVER=imagick

#STATAMIC_CUSTOM_CMS_NAME=
#STATAMIC_CUSTOM_LOGO_NAV_URL=
#STATAMIC_CUSTOM_DARK_LOGO_URL=
STATAMIC_CUSTOM_LOGO_OUTSIDE_URL="/visuals/statamic-peak-logo.svg"
#STATAMIC_CUSTOM_FAVICON_URL=
#STATAMIC_CUSTOM_CSS_URL=
19 changes: 19 additions & 0 deletions export/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/node_modules
/public/hot
/public/storage
/public/vendor/statamic
/public/vendor/statamic-peak-tools
/public/img/
/public/static/
/storage/*.key
/vendor
.env
.env.backup
/.phpunit.cache
.antlers.json
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log

/.phpunit.cache
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 7f72482

Please sign in to comment.