WIP: Install WP directly into /public, remove the config midlayer

.env.example

@@ -17,12 +17,9 @@ DB_USER=root
 DB_PASSWORD=root
 #MYSQLI_DEFAULT_SOCKET=/var/run/mysqld/mysqld.sock # optional
 
-### Home & URL
-WP_HOME=https://local.site
-WP_SITEURL=${WP_HOME}/wp
-
 ### Network Setup
-#WP_ALLOW_MULTISITE=true # optional
+#WP_ALLOW_MULTISITE=false
+#MULTISITE=false
 #SUBDOMAIN_INSTALL=false # optional: set up multisite with sub directory or sub domain, only used if WP_ALLOW_MULTISITE=true
 
 ### Remote Images

.gitignore

@@ -1,24 +1,13 @@
 # Idea
 .DS_Store
 .idea
+.vscode
 
 # Javascript
 node_modules
 dist
 build
-
-public/.well-known/
-
-# WordPress
-wp
-public/content/upgrade
-public/content/plugins
-public/content/themes
-public/content/mu-plugins/*
-!public/content/mu-plugins/load.php
-public/content/uploads
-public/content/db.php
-public/content/object-cache.php
+public
 
 # Composer
 vendor
@@ -27,11 +16,6 @@ vendor
 plugins/*/wp-content
 plugins/*/composer.lock
 
-# Languages
-public/content/languages
-!public/content/languages/plugins
-!public/content/mu-plugins/languages
-
 # Dotenv
 .env
 .env.*

composer.json

@@ -68,15 +68,15 @@
 		"dekode/logging": "@dev"
 	},
 	"extra": {
-		"wordpress-install-dir": "public/wp",
+		"wordpress-install-dir": "public",
 		"installer-paths": {
-			"public/content/mu-plugins/{$name}/": [
+			"public/wp-content/mu-plugins/{$name}/": [
 				"type:wordpress-muplugin"
 			],
-			"public/content/plugins/{$name}/": [
+			"public/wp-content/plugins/{$name}/": [
 				"type:wordpress-plugin"
 			],
-			"public/content/themes/{$name}/": [
+			"public/wp-content/themes/{$name}/": [
 				"type:wordpress-theme"
 			]
 		},
@@ -85,13 +85,16 @@
 			"languages": [
 				"nb_NO"
 			],
-			"directory": "public/content/languages"
+			"directory": "public/wp-content/languages"
 		}
 	},
 	"scripts": {
 		"post-install-cmd": [
-			"cp public/content/plugins/spinupwp/drop-ins/object-cache.php public/content/object-cache.php",
-			"cp -r packages/translations/* public/content/languages/"
+			"cp public/wp-content/plugins/spinupwp/drop-ins/object-cache.php public/wp-content/object-cache.php",
+			"mkdir -p public/wp-content/languages/ && cp -r packages/translations/* public/wp-content/languages/",
+			"cp config/wp-config-template.php public/wp-config.php",
+			"rm -rf public/wp-content/themes/twentytwenty",
+			"rm -rf public/wp-content/themes/twentytwentyone"
 		],
 		"lint": [
 			"./vendor/bin/phpcs ."
@@ -106,7 +109,7 @@
 			"@composer install --no-dev && composer wp-translation-downloader:download"
 		],
 		"make-pot": [
-			"./vendor/bin/wp i18n make-pot . languages/project-base.pot --exclude=\".github,plugins,public/content/plugins,vendor,public/wp,node_modules,tests\" --slug=project-base"
+			"./vendor/bin/wp i18n make-pot . languages/project-base.pot --exclude=\".github,plugins,public/wp-content/plugins,vendor,public/wp,node_modules,tests\" --slug=project-base"
 		]
 	}
 }