Merge branch 'release/0.18.0'

.dockerignore

@@ -1,18 +1,39 @@
-fly.toml
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
 
-.git
-tmp
-!tmp/pids/.keep
-log
-public/assets
-public/packs
-.bundle
+# Ignore git directory.
+/.git/
 
-db/*.sqlite3
-db/*.sqlite3-*
+# Ignore bundler config.
+/.bundle
 
-storage
-config/master.key
-config/credentials/*.key
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
 
-node_modules
+# Ignore all environment files.
+/.env*
+!/.env.example
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets

.env.example

@@ -1,7 +1,7 @@
 # Application Configurations
 
 # You can change app base url according to your requirement
-APP_BASE_URL="localhost:3000"
+APP_BASE_URL="http://localhost:3000"
 
 # Mailer Configuration
 EMAIL_DELIVERY_METHOD='letter_opener'

.eslint-rules/imports/enforced.js

@@ -27,6 +27,7 @@ module.exports = {
           mp3: "always",
           svg: "always",
           mapper: "always",
+          css: "always",
         },
       },
     ],

.eslintrc

@@ -34,7 +34,7 @@
     },
     "import/resolver": {
       "node": {
-        "extensions": [".js", ".jsx", ".ts", ".tsx", ".svg", ".json", ".mp3"]
+        "extensions": [".js", ".jsx", ".ts", ".tsx", ".svg", ".json", ".mp3", ".css"]
       }
     },
     "react": {

.gitignore

@@ -54,13 +54,6 @@ yarn-debug.log*
 
 .idea
 
-# Ignore cypress screenshots and videos
-cypress/artifacts/screenshots
-cypress/artifacts/videos
-cypress/screenshots
-cypress/videos
-cypress/downloads
-
 .DS_Store
 
 /config/credentials/development.key

.node-version

@@ -1 +1 @@
-18.14.2
+18.14.2

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.2