Merge branch 'main' into add-blocks

Author: sethhorsley

.devcontainer/Dockerfile

@@ -1,3 +1,7 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=3.4.4
+ARG RUBY_VERSION=3.4.7
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
+
+# Ensure binding is always 0.0.0.0
+# Binds the server to all IP addresses of the container, so it can be accessed from outside the container.
+ENV BINDING="0.0.0.0"

.devcontainer/compose.yaml

@@ -1,4 +1,4 @@
-name: "phlexui-web"
+name: "rubyui-web"
 
 services:
   rails-app:
@@ -7,26 +7,19 @@ services:
       dockerfile: .devcontainer/Dockerfile
 
     volumes:
-    - ../..:/workspaces:cached
+    - ../../web:/workspaces/web:cached
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    networks:
-    - default
-
     # Uncomment the next line to use a non-root user for all processes.
     # user: vscode
 
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
-    ports:
-    - 45678:45678
     depends_on:
     - selenium
-
+  
   selenium:
-    image: seleniarm/standalone-chromium
+    image: selenium/standalone-chromium
     restart: unless-stopped
-    networks:
-    - default

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/ruby
 {
-  "name": "phlexui-web",
+  "name": "rubyui-web",
   "dockerComposeFile": "compose.yaml",
   "service": "rails-app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
@@ -11,6 +11,7 @@
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/rails/devcontainer/features/activestorage": {},
     "ghcr.io/devcontainers/features/node:1": { "version": 20, "pnpmVersion": "10.8.0" },
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {"moby":false},
     "ghcr.io/rails/devcontainer/features/sqlite3": {}
   },
 
@@ -30,11 +31,6 @@
         "Shopify.ruby-lsp",
         "testdouble.vscode-standard-ruby"
       ]
-    },
-    "settings": {
-      "rubyLsp.rubyVersionManager": {
-        "identifier": "rbenv"
-      }
     }
   },
 

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+<!-- Prefix your title above in brackets with one of
+("Bug Fix", "Feature", "Documentation", "Maintenance", "Hotfix", "Improvement")
+E.g. [Feature] -->
+
+## Related issue
+<!-- Include a GitHub issue number issue link. -->
+<!-- If there is no issue being resolved, please consider opening one before creating this pull request. -->
+Related to #[issue number]
+
+
+## Description
+<!-- Concisely describe what the pull request does, explaining the decision(s) you made if necessary. -->
+
+
+Before                     |  After
+:-------------------------:|:-------------------------:
+replace me with screenshot of `main` or prod (if applicable)   |  replace me with screenshot of this branch's changes
+
+
+## Testing instructions
+<!-- Give steps for the reviewer to verify that this PR fixes the problem or the feature works as expected. -->
+<!-- Consider alternatives to the happy path. -->

.github/workflows/main.yml .github/workflows/ci.yml.github/workflows/main.yml renamed to .github/workflows/ci.yml

@@ -2,20 +2,16 @@ name: CI
 
 on:
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
   push:
-    branches: "main"
+    branches: 
+      - "main"
 jobs:
   test:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -25,10 +21,11 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
+          version: 10.8.0
           run_install: false
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: ".node-version"
           cache: 'pnpm'
@@ -40,10 +37,44 @@ jobs:
         run: bundle exec standardrb
 
       - name: Run tests
-        run: |
-          bin/rails test:prepare
-          bin/rails db:test:prepare
-          bin/rails test
+        run: bin/rails db:test:prepare test
+
+  verify_components:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: ".node-version"
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: bin/rails g ruby_ui:component:all --force true
+
+      - uses: CatChen/check-git-status-action@v1
+        with:
+          fail-if-not-clean: true
+          push-if-not-clean: false
+          request-changes-if-not-clean: false
+          targets: 'app'
 
   docker-build:
     if: github.ref == 'refs/heads/main'
@@ -54,7 +85,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -69,17 +100,3 @@ jobs:
           imageName: ghcr.io/ruby-ui/web-devcontainer
           cacheFrom: ghcr.io/ruby-ui/web-devcontainer
           push: always
-        
-
-  next-deploy:
-    if: github.ref == 'refs/heads/main'
-    needs: [test, docker-build]
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-      - name: Deploy to Heroku Prod
-        run: git push https://heroku:${{ secrets.HEROKU_RUBYUI_API_KEY }}@git.heroku.com/rubyui-next.git HEAD:main

.github/workflows/deploy.yml

@@ -43,3 +43,6 @@ config/credentials/production.key
 
 # Yarn
 yarn-error.log
+
+# Pnpm
+.pnpm-store

.github/workflows/verify_components.yml

@@ -1 +1 @@
-3.4.4
+3.4.7

.gitignore

@@ -0,0 +1,2 @@
+ignore:
+  - 'db/migrate/*'