0.31 backports

.decidim-version

@@ -1 +1 @@
-0.31.4
+0.31.6

.devcontainer/Dockerfile

@@ -1,8 +1,11 @@
-FROM decidim/decidim:0.22.0-dev
+ARG RUBY_VERSION=3.3.4
+FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
 
-RUN apt-get update && apt-get install -y \
-  vim
+RUN wget -q -O /tmp/google-chrome-key.pub https://dl-ssl.google.com/linux/linux_signing_key.pub \
+    && sudo gpg --dearmor -o /usr/share/keyrings/google-chrome-keyring.gpg /tmp/google-chrome-key.pub \
+    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list \
+    && sudo apt-get update \
+    && sudo apt-get install -y google-chrome-stable libicu-dev imagemagick \
+    && sudo rm -rf /var/lib/apt/lists/* /tmp/google-chrome-key.pub
 
-ENV EDITOR=vim
-
-RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.1.1/zsh-in-docker.sh)"
+ENV BINDING="0.0.0.0"

.devcontainer/compose.yaml

@@ -0,0 +1,40 @@
+name: "decidim"
+
+services:
+  rails-app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    volumes:
+    - ../:/workspaces/decidim:cached
+    ports:
+      - "${DEVCONTAINER_APP_PORT:-3000}:3000"
+    env_file:
+      - path: ../.env
+        required: false
+    command: sleep infinity
+    depends_on:
+      - redis
+      - postgres
+
+  redis:
+    image: redis:7.2
+    restart: unless-stopped
+    volumes:
+    - redis-data:/data
+
+  postgres:
+    image: postgres:16.1
+    restart: unless-stopped
+    networks:
+      - default
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+
+volumes:
+  redis-data:
+  postgres-data:
+

.devcontainer/devcontainer.json

@@ -1,21 +1,34 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/ruby-rails
 {
-	"name": "Ruby on Rails",
-	"workspaceFolder": "/workspace",
-	"service": "rails",
-	"dockerComposeFile": [
-		"docker-compose.yml"
-	],
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/zsh"
-	},
-	"extensions": [
-		"rebornix.Ruby",
-		"wingrunr21.vscode-ruby",
-		"misogi.ruby-rubocop"
-	],
-	"forwardPorts": [
-		3000
-	],
-}
+  "name": "decidim",
+  "dockerComposeFile": "compose.yaml",
+  "service": "rails-app",
+  "workspaceFolder": "/workspaces/decidim",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    // Do not use bundler cache, to not generate conflicts with develop bundler cache
+    // "ghcr.io/rails/devcontainer/features/bundler-cache:1.0.1": {},
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+      "moby": false
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "22.14.0"
+    },
+    "ghcr.io/rails/devcontainer/features/activestorage": {},
+    "ghcr.io/rails/devcontainer/features/postgres-client": {}
+  },
+  "containerEnv": {
+    "REDIS_URL": "redis://redis:6379/1",
+    "DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL": "redis://redis:6379/2",
+    "DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL": "redis://redis:6379/3",
+    "DATABASE_HOST": "postgres",
+    "DATABASE_USERNAME": "postgres",
+    "DATABASE_PASSWORD": "postgres"
+  },
+  "appPort": ["3000:3000"],
+  "forwardPorts": [
+    3000,
+    5432,
+    6379
+  ],
+  "postCreateCommand": "bin/setup --skip-server"
+}

.eslintrc.json

@@ -1,3 +1,45 @@
 {
-  "extends": "@decidim"
+  "extends": "@decidim",
+  "settings": {
+    "react": {
+      "version": "detect"
+    },
+    "import/resolver": {
+      "node": {
+        "extensions": [".js"],
+        "moduleDirectory": [
+          "decidim-accountability/app/packs/",
+          "decidim-admin/app/packs/",
+          "decidim-ai/app/packs/",
+          "decidim-api/app/packs/",
+          "decidim-assemblies/app/packs/",
+          "decidim-blogs/app/packs/",
+          "decidim-budgets/app/packs/",
+          "decidim-collaborative_texts/app/packs/",
+          "decidim-comments/app/packs/",
+          "decidim-conferences/app/packs/",
+          "decidim-core/app/packs/",
+          "decidim-debates/app/packs/",
+          "decidim-demographics/app/packs/",
+          "decidim-design/app/packs/",
+          "decidim-dev/app/packs/",
+          "decidim-elections/app/packs/",
+          "decidim-forms/app/packs/",
+          "decidim-initiatives/app/packs/",
+          "decidim-meetings/app/packs/",
+          "decidim-pages/app/packs/",
+          "decidim-participatory_processes/app/packs/",
+          "decidim-proposals/app/packs/",
+          "decidim-surveys/app/packs/",
+	  "decidim-sortitions/app/packs/",
+          "decidim-system/app/packs/",
+          "decidim-templates/app/packs/",
+          "decidim-verifications/app/packs/",
+          "packages/core/node_modules/",
+          "packages/webpacker/node_modules/",
+          "node_modules/"
+        ]
+      }
+    }
+  }
 }