diff --git a/.gitignore b/.gitignore index 1e577d8..c314371 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ /dist /node_modules -/mix-manifest.json -/yarn.lock -/js/cp.js -/package-lock.json /vendor -/composer.lock +/js/cp.js +package-lock.json +composer.lock diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..2bd5a0a --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +22 diff --git a/composer.json b/composer.json index 9359b4c..1e90a18 100644 --- a/composer.json +++ b/composer.json @@ -9,22 +9,24 @@ } ], "require": { - "php": "^8.2", - "laravel/framework": "^10.0 || ^11.0 || ^12.0", + "php": "^8.3", "pixelfear/composer-dist-plugin": "^0.1", - "statamic/cms": "^5.0" + "statamic/cms": "^6.0" }, "require-dev": { "mockery/mockery": "^1.3.1", "nunomaduro/collision": "^8.1", - "orchestra/testbench": "^9.0 || ^10.0", + "orchestra/testbench": "^10.0", "phpunit/phpunit": "^11.0", "spatie/laravel-ray": "^1.32" }, "autoload": { "psr-4": { "TransformStudios\\Review\\": "src" - } + }, + "files": [ + "src/helpers.php" + ] }, "config": { "allow-plugins": { @@ -33,7 +35,7 @@ }, "extra": { "download-dist": { - "path": "dist", + "path": "resources/dist", "url": "https://github.com/transformstudios/statamic-review/releases/download/{$version}/dist.tar.gz" }, "laravel": { diff --git a/package.json b/package.json index 1f0b1ca..2d9b057 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,16 @@ { - "dependencies": { - "vue": "^2.6.11" - }, "scripts": { "dev": "vite", "build": "vite build", "production": "vite build" }, + "dependencies": { + "@statamic/cms": "file:./vendor/statamic/cms/resources/dist-package", + "@tailwindcss/vite": "^4.1.18", + "tailwindcss": "^4.1.18" + }, "devDependencies": { - "@vitejs/plugin-vue2": "^2.2.0", - "laravel-vite-plugin": "^0.7.2", - "vite": "^4.0.0" + "laravel-vite-plugin": "^2.0", + "vite": "^7.0" } } diff --git a/resources/css/cp.css b/resources/css/cp.css new file mode 100644 index 0000000..1249799 --- /dev/null +++ b/resources/css/cp.css @@ -0,0 +1 @@ +@import "@statamic/cms/tailwind.css"; diff --git a/resources/js/components/fieldtypes/CopyReviewUrlButton.vue b/resources/js/components/fieldtypes/CopyReviewUrlButton.vue index 88d9bd8..b142304 100644 --- a/resources/js/components/fieldtypes/CopyReviewUrlButton.vue +++ b/resources/js/components/fieldtypes/CopyReviewUrlButton.vue @@ -1,75 +1,32 @@ - diff --git a/src/Fieldtypes/Review.php b/src/Fieldtypes/Review.php index 674159b..ab7eaf8 100644 --- a/src/Fieldtypes/Review.php +++ b/src/Fieldtypes/Review.php @@ -3,7 +3,6 @@ namespace TransformStudios\Review\Fieldtypes; use Statamic\Entries\Collection; -use Statamic\Entries\Entry; use Statamic\Fields\Fieldtype; use TransformStudios\Review\Support\URL; @@ -34,6 +33,6 @@ public function preload() return []; } - return ['site_url' => URL::reviewUrl($entry)]; + return ['site_url' => review_url($entry)]; } } diff --git a/src/Http/Middleware/SetSite.php b/src/Http/Middleware/SetSite.php deleted file mode 100644 index 12de246..0000000 --- a/src/Http/Middleware/SetSite.php +++ /dev/null @@ -1,22 +0,0 @@ -id), - 404 - ); - - Site::setCurrent($entry->site()->handle()); - - return $next($request); - } -} diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 861c12c..86f52e6 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -3,22 +3,11 @@ namespace TransformStudios\Review; use Statamic\Providers\AddonServiceProvider; -use TransformStudios\Review\Actions\OpenReview; -use TransformStudios\Review\Fieldtypes\Review; class ServiceProvider extends AddonServiceProvider { - protected $actions = [ - OpenReview::class, - ]; - - protected $fieldtypes = [ - Review::class, - ]; - protected $vite = [ - 'input' => ['resources/js/cp.js'], + 'input' => ['resources/css/cp.css', 'resources/js/cp.js'], 'publicDirectory' => 'dist', - 'hotFile' => __DIR__.'/../dist/hot', ]; } diff --git a/src/Support/URL.php b/src/helpers.php similarity index 82% rename from src/Support/URL.php rename to src/helpers.php index 5b68768..892ec46 100644 --- a/src/Support/URL.php +++ b/src/helpers.php @@ -1,15 +1,12 @@ id())) { diff --git a/vite.config.js b/vite.config.js index 25c0127..7bc5b55 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,17 +1,15 @@ import { defineConfig } from 'vite'; import laravel from 'laravel-vite-plugin'; -import vue from '@vitejs/plugin-vue2'; +import statamic from '@statamic/cms/vite-plugin'; +import tailwindcss from '@tailwindcss/vite'; export default defineConfig({ plugins: [ laravel({ - input: [ - 'resources/js/cp.js' - ], - refresh: true, + input: ['resources/css/cp.css', 'resources/js/cp.js'], publicDirectory: 'dist', - hotFile: 'dist/hot', }), - vue(), + statamic(), + tailwindcss() ], });