Merge branch 'hotfix/8.10.1'

waynestate · Apr 30, 2024 · ab37a8d · ab37a8d
2 parents 929e130 + 0972b86
commit ab37a8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "base",
   "private": true,
-  "version": "8.10.0",
+  "version": "8.10.1",
   "description": "",
   "scripts": {
     "dev": "npm run development",

diff --git a/public/.htaccess b/public/.htaccess
@@ -13,10 +13,10 @@
     RewriteCond %{HTTP_HOST} ^www\.(.*)
     RewriteRule ^.*$ https://%1%{REQUEST_URI} [L,R=307]
 
-    # If HTTP and we are not on foo.local, www-dev.foo, www-dev2.foo or www2.foo
+    # If HTTP and we are not on foo.local, foo.localhost, www-dev.foo, www-dev2.foo or www2.foo
     # then force HTTPS
     RewriteCond %{HTTPS} !=on
-    RewriteCond %{HTTP_HOST} !(?:\.local|www-dev2?\..*|www2\..*)$
+    RewriteCond %{HTTP_HOST} !(?:\.local|\.localhost|www-dev2?\..*|www2\..*)$
     RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=307]
 
     # Redirect Trailing Slashes If Not A Folder...
@@ -38,7 +38,7 @@
     RewriteCond %{REQUEST_URI} \.(json)$
     RewriteRule ^ - [F]
 
-    RewriteCond %{HTTP_HOST} !(?:\.local|www-dev2?\..*|www2\..*)$
+    RewriteCond %{HTTP_HOST} !(?:\.local|\.localhost|www-dev2?\..*|www2\..*)$
     RewriteCond %{REQUEST_URI} \.(map)$
     RewriteRule ^ - [F]