Merge branch 'release/2.6.1' into devmode-vite

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,15 @@
 # nystudio107/devmode Change Log
 
+## 2.6.1 - 2022.04.13
+### Added
+* Added Craft CMS 4 db dump
+* Added `config/custom.php` for custom config settings
+
+### Changed
+* Added compressed `.gz` db dump support
+* Set `enableLogging` and `enableProfiling` in `config/db.php`
+* Use `"eslint": "^7.0.0"` to avoid package version conflicts with `vite-plugin-eslint`
+
 ## 2.6.0 - 2022.04.08
 ### Changed
 * Switched over to Craft CMS 4.0.0-beta.4

buildchain/package-lock.json

@@ -44,7 +44,7 @@
     "@typescript-eslint/parser": "^5.0.0",
     "@vitejs/plugin-legacy": "^1.3.3",
     "autoprefixer": "^10.4.0",
-    "eslint": "^8.0.0",
+    "eslint": "^7.0.0",
     "eslint-plugin-vue": "^8.0.0",
     "postcss": "^8.0.0",
     "rollup-plugin-critical": "^1.0.4",

buildchain/package.json

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Custom Configuration
+ *
+ * You can now set your own config settings—as opposed to those Craft supports—from config/custom.php.
+ * Any of your custom config settings will be accessible via Craft::$app->config->{mycustomsetting}.
+ *
+ * @see https://craftcms.com/docs/4.x/upgrade.html#configuration
+ */
+
+return [
+];

cms/composer.lock

@@ -20,4 +20,6 @@
     'password' => App::env('DB_PASSWORD'),
     'schema' => App::env('DB_SCHEMA'),
     'tablePrefix' => App::env('DB_TABLE_PREFIX'),
+    'enableLogging' => false,
+    'enableProfiling' => (bool)App::env('DEV_MODE'),
 ];

cms/config/custom.php

@@ -15,7 +15,15 @@ do
     echo "GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB TO $POSTGRES_DB ;" | "${pgsql[@]}"
     # Add the database name to the command
     pgsql+=( "$POSTGRES_DB" )
-    echo "### Seeding database \`$POSTGRES_DB\`"
-    cat "/docker-entrypoint-initdb.d/$POSTGRES_DB_SEED_DIR/$POSTGRES_DB.sql" | "${pgsql[@]}" >/dev/null
-    echo "### \`$POSTGRES_DB\` database seeded"
+    DB_SEED_PATH="/docker-entrypoint-initdb.d/$POSTGRES_DB_SEED_DIR/$POSTGRES_DB"
+    if [ -f "$DB_SEED_PATH.sql" ]; then
+        echo "### Seeding database with \`$DB_SEED_PATH.sql\`"
+        cat "$DB_SEED_PATH.sql" | "${pgsql[@]}" >/dev/null
+        echo "### \`$POSTGRES_DB\` database seeded"
+    fi
+    if [ -f "$DB_SEED_PATH.sql.gz" ]; then
+        echo "### Seeding database with \`$DB_SEED_PATH.sql.gz\`"
+        zcat "$DB_SEED_PATH.sql.gz" | "${pgsql[@]}" >/dev/null
+        echo "### \`$POSTGRES_DB\` database seeded"
+    fi
 done