Move static dir

Author: emteknetnz

.gitignore

@@ -5,8 +5,5 @@
 /public/_resources/
 /.graphql-generated/
 /public/_graphql/
-/data/cache
-/data/packages
-/data/versionmap.json
-/static/[0-9]
+/data/
 .phpunit.result.cache

.htaccess

@@ -1,8 +1,13 @@
 RewriteEngine On
 
-# If requested file is in the static folder, serve it
-RewriteCond %{DOCUMENT_ROOT}/static/%{REQUEST_URI} -f
-RewriteRule ^(.*)$ static/$1 [L]
+# If requested file is in the public/static folder, serve it
+# This file detection + redirect done here rather than public/.htaccess as redirect to public/$1 will mean
+# that %{REQUEST_URI} will change from something like /5/index.html to /public/5/index.html, which means
+# that we can no longer use %{REQUEST_URI} to check that a static file exists using -f because the file
+# is /public/static/5/index.html not /public/5/index.html
+
+RewriteCond %{DOCUMENT_ROOT}/public/static/%{REQUEST_URI} -f
+RewriteRule ^(.*)$ public/static/$1 [L]
 
 # Default
 RewriteRule ^(.*)$ public/$1

.platform.yml

@@ -6,7 +6,7 @@ php_settings:
 shared_dirs:
   mysite:
     # persist the following directories between deployments
-    data: {}
+    # the static dir lives in the public dir, though do not need to specify "public/static" here
     static: {}
 crons:
   queuedjobs_task:

data/commited-file.txt

@@ -9,7 +9,7 @@
         "3": "3.x"
     },
     "paths": {
-        "www": "static",
+        "www": "public/static",
         "cache": "data/cache",
         "packages": "data/packages",
         "versionmap": "data/versionmap.json"

doctum-conf/doctum.json

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!.htaccess

public/static/.gitignore

@@ -0,0 +1,2 @@
+# This file needs to be here in order for the redirect from the root .htaccess to work
+RewriteEngine On