From e17c66f7ef47caf624ad8136d1f5983f7bda5cd6 Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Mon, 28 Oct 2024 15:08:21 +0000 Subject: [PATCH] Fix release workflow --- .github/workflows/release.yml | 2 +- composer.json | 2 +- {resources/dist => dist}/.gitignore | 2 +- src/ServiceProvider.php | 2 +- vite.config.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename {resources/dist => dist}/.gitignore (52%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2a96be..5ca9810 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: run: npm run build - name: Create zip - run: tar -czvf dist.tar.gz resources/dist + run: tar -czvf dist.tar.gz dist - name: Get Changelog id: changelog diff --git a/composer.json b/composer.json index 20c5f10..6bdad67 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ }, "download-dist": { "url": "https://github.com/statamic/importer/releases/download/{$version}/dist.tar.gz", - "path": "resources/dist" + "path": "dist" } }, "minimum-stability": "dev", diff --git a/resources/dist/.gitignore b/dist/.gitignore similarity index 52% rename from resources/dist/.gitignore rename to dist/.gitignore index d6b7ef3..c1aefd2 100644 --- a/resources/dist/.gitignore +++ b/dist/.gitignore @@ -1,2 +1,2 @@ -* +.gitignore !.gitignore diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 91c6ae9..12de984 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -19,7 +19,7 @@ class ServiceProvider extends AddonServiceProvider ]; protected $vite = [ - 'publicDirectory' => 'resources/dist', + 'publicDirectory' => 'dist', 'hotFile' => 'vendor/importer/hot', 'input' => [ 'resources/js/cp.js', diff --git a/vite.config.js b/vite.config.js index 2b7af76..ba68a70 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,8 +5,8 @@ import vue2 from '@vitejs/plugin-vue2' export default defineConfig({ plugins: [ laravel({ - hotFile: 'resources/dist/hot', - publicDirectory: 'resources/dist', + hotFile: 'dist/hot', + publicDirectory: 'dist', input: ['resources/js/cp.js'], }), vue2(),