Merge branch 'main' into check-links

.devcontainer/devcontainer.json

@@ -3,23 +3,48 @@
   "dockerComposeFile": [
     "../docker-compose.yml",
     "../docker/dev.yml",
-    "../docker/admin-uis.yml",
-    "../docker/vscode.yml"
+    "../docker/devcontainer.yml"
+  ],
+  "containerUser": "root",
+  "capAdd": [
+    "SYS_PTRACE"
+  ],
+  "securityOpt": [
+    "seccomp=unconfined"
   ],
   "service": "backend",
+  "runServices": [
+    "memcached",
+    "postgres",
+    "mongodb",
+    "dynamicfront",
+    "frontend",
+    "incron",
+    "minion",
+    "redis"
+  ],
   "workspaceFolder": "/opt/product-opener",
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash"
+      },
+      "extensions": [
+        "richterger.perl",
+        "d9705996.perl-toolbox",
+        "redhat.vscode-yaml",
+        "dbaeumer.vscode-eslint",
+        "stylelint.vscode-stylelint",
+        "syler.sass-indented",
+        "mrorz.language-gettext"
+      ]
+    }
   },
-  "runArgs": ["-u", "vscode", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
-  "extensions": [
-    "mortenhenriksen.perl-debug",
-    "d9705996.perl-toolbox",
-    "redhat.vscode-yaml",
-    "dbaeumer.vscode-eslint",
-    "stylelint.vscode-stylelint",
-    "syler.sass-indented",
-    "mrorz.language-gettext",
-    "eg2.vscode-npm-script"
-  ]
-}
+  "features": {
+    "ghcr.io/devcontainers/features/git:1":{},
+    "ghcr.io/devcontainers/features/github-cli:1":{},
+    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+      "packages": "libterm-readline-gnu-perl"
+    }
+  }
+}

.dockerignore

@@ -7,6 +7,11 @@ logs
 debug/
 perl-language-server.log
 
+openfoodfacts-mongodbdump.tar.gz
+openfoodfacts-products.jsonl.gz
+en.openfoodfacts.org.products.csv
+en.openfoodfacts.org.products.csv.gz
+
 html/images/misc/openfoodfacts-visual-decision-05-03-13.pdf
 html/images/misc/20130416_QUOz.pdf
 html/images/misc/assemblee-constitutive-off-v1.pdf

.env

@@ -1,7 +1,7 @@
 # docker config
 DOCKER_CLIENT_TIMEOUT=320
 COMPOSE_HTTP_TIMEOUT=320
-COMPOSE_PROJECT_NAME=po
+COMPOSE_PROJECT_NAME=po_off
 COMPOSE_PATH_SEPARATOR=;
 COMPOSE_FILE=docker-compose.yml;docker/dev.yml
 COMPOSE_PROFILES=off
@@ -19,7 +19,7 @@ TAG=latest
 
 # static lang dependent files for the website
 # we have a minimal set of files in server repo, in prod we use main repo
-WEB_LANG_PATH=./lang-default
+WEB_RESOURCES_PATH=./web-default
 
 # env vars
 PRODUCERS_PLATFORM=0
@@ -50,8 +50,9 @@ ROBOTOFF_URL=http://robotoff.openfoodfacts.localhost:5500 # connect to Robotoff
 QUERY_URL=http://query:5510
 EVENTS_URL=
 FACETS_KP_URL = https://facets-kp.openfoodfacts.org/render-to-html
-# use this to push products to openfoodfacts-search
-# in dev: searchredis:6379 (with openfoodfacts-search running in docker in same network)
+# we push updated products to Redis stream so that every service is notified
+# when a product is updated/deleted/created
+# use `redis:6379` locally if you want to enable Redis
 REDIS_URL=
 GOOGLE_CLOUD_VISION_API_KEY=
 CROWDIN_PROJECT_IDENTIFIER=

.github/dependabot.yml

@@ -5,25 +5,56 @@ updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 300
+    groups:
+      babel:
+        patterns:
+          - "@babel/*"
+          - "gulp-babel"
+      gulp:
+        patterns:
+          - "@types/gulp*"
+          - "gulp*"
+        exclude-patterns:
+          - "gulp-babel"
+      jquery:
+        patterns:
+          - "@types/jquery*"
+          - "jquery*"
+      leaflet:
+        patterns:
+          - "leaflet*"
+      lint:
+        patterns:
+          - "@typescript-eslint/*"
+          - "eslint*"
+          - "stylelint*"
+      test-dependencies:
+        patterns:
+          - "chai*"
+          - "mocha"
+      typescript:
+        patterns:
+          - "ts-node"
+          - "typescript"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-        interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 300
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
-        interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 300
   - package-ecosystem: "docker"
     directory: "/docker/frontend"
     schedule:
-        interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 300
   - package-ecosystem: "pip"
     directory: "/scripts/packager-codes/non-eu/"
     schedule:
-        interval: "daily"
+      interval: "daily"
     open-pull-requests-limit: 300