diff --git a/Gemfile.lock b/Gemfile.lock index d6eb44c4..95bf704b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,7 @@ GEM dockerfile-rails (1.6.20) rails (>= 3.0.0) drb (2.2.1) - dry-cli (1.0.0) + dry-cli (1.1.0) erubi (1.13.0) factory_bot (6.4.6) activesupport (>= 5.0.0) @@ -346,13 +346,13 @@ GEM stackprof (0.2.26) stringio (3.1.1) stripe (10.14.0) - tailwindcss-rails (2.6.1-aarch64-linux) + tailwindcss-rails (2.7.7-aarch64-linux) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-arm64-darwin) + tailwindcss-rails (2.7.7-arm64-darwin) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-x86_64-darwin) + tailwindcss-rails (2.7.7-x86_64-darwin) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-x86_64-linux) + tailwindcss-rails (2.7.7-x86_64-linux) railties (>= 7.0.0) thor (1.3.2) timeout (0.4.1) @@ -364,7 +364,7 @@ GEM vite_rails (3.0.17) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.5.0) + vite_ruby (3.8.2) dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) diff --git a/Procfile.dev b/Procfile.dev index 319b4a58..3c119b44 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,3 +1,3 @@ -web: bundle exec puma -C config/puma.rb +web: PORT=3001 bundle exec puma -C config/puma.rb css: bin/rails tailwindcss:watch vite: bin/vite dev diff --git a/bin/dev b/bin/dev index 9f2c3bdc..ad72c7d5 100755 --- a/bin/dev +++ b/bin/dev @@ -5,4 +5,12 @@ if ! gem list foreman -i --silent; then gem install foreman fi -exec foreman start -f Procfile.dev "$@" -p 3001 +# Default to port 3000 if not specified +export PORT="${PORT:-3000}" + +# Let the debug gem allow remote connections, +# but avoid loading until `debugger` is called +export RUBY_DEBUG_OPEN="true" +export RUBY_DEBUG_LAZY="true" + +exec foreman start -f Procfile.dev "$@" diff --git a/config/tailwind.config.js b/config/tailwind.config.js index 05def78a..032a52eb 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -7,7 +7,8 @@ module.exports = { './app/javascript/**/*.{js,jsx,ts,tsx}', './app/views/**/*.{erb,haml,html,slim}', './node_modules/flowbite/**/*.js', // https://flowbite.com/docs/getting-started/rails/ - 'node_modules/flowbite-react/**/*.{js,jsx,ts,tsx}', // https://flowbite.com/docs/getting-started/react/ + './node_modules/flowbite-react/**/*.{js,jsx,ts,tsx}', // https://flowbite.com/docs/getting-started/react/ + flowbite.content(), ], theme: { extend: { @@ -21,7 +22,7 @@ module.exports = { require('@tailwindcss/forms'), require('@tailwindcss/aspect-ratio'), require('@tailwindcss/typography'), - // Works thanks to flowbite being imported from package.json - require('flowbite/plugin'), + require('flowbite/plugin'), // Works thanks to flowbite being imported from package.json + flowbite.plugin(), ], } diff --git a/package-lock.json b/package-lock.json index b58f9474..69a211aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,8 +43,8 @@ "eslint-plugin-react": "^7.37.0", "prettier": "2.2.1", "prettier-plugin-erb": "^0.4.0", - "vite": "^5.4.6", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.8", + "vite-plugin-ruby": "^5.1.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -7165,9 +7165,9 @@ } }, "node_modules/vite": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", - "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", + "version": "5.4.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz", + "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==", "dev": true, "dependencies": { "esbuild": "^0.21.3", @@ -7224,9 +7224,9 @@ } }, "node_modules/vite-plugin-ruby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.0.0.tgz", - "integrity": "sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-ruby/-/vite-plugin-ruby-5.1.0.tgz", + "integrity": "sha512-Dgd/dCvb/8GYxZx2NEgxygEoUpHz9vfad7itlO4fXqYwdfAEwFwwOohC630yf/+kxIGBZXI5yk+Y3WkL9VkwcA==", "dev": true, "dependencies": { "debug": "^4.3.4", diff --git a/package.json b/package.json index 2938e196..c86c7374 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "eslint-plugin-react": "^7.37.0", "prettier": "2.2.1", "prettier-plugin-erb": "^0.4.0", - "vite": "^5.4.6", - "vite-plugin-ruby": "^5.0.0" + "vite": "^5.4.8", + "vite-plugin-ruby": "^5.1.0" }, "version": "0.0.0" }