PHP Compat Revamp

.gitignore

@@ -203,6 +203,7 @@ assets/js/*.js
 assets/js/*.map
 coverage.clover
 /plugin/scripts/*-min.js
+/plugin/build/
 wpe-php-compat.zip
 .phpunit.result.cache
 
@@ -222,3 +223,7 @@ Docker/debug
 # Build files
 /build/
 clover.xml
+
+.vscode/*.log
+
+.wp-env.override.json

.jshintignore

@@ -1,5 +1,6 @@
 gulpfile.js
 **/*-min.js
+plugin/build/
 wordpress/
 node_modules/
 vendor/

Docker/Dockerfile-node

@@ -1,4 +1,4 @@
-FROM node:lts
+FROM node:14
 ARG UID=1000
 ARG GID=1000
 

Makefile

@@ -12,10 +12,11 @@ END_HIGHLIGHT                          :=\033[0m # No Color
 build: build-docker build-assets
 
 .PHONY: build-assets
-build-assets: | build-docker-node install-npm
+build-assets: | build-docker-node install-npm install-composer
 	@echo "Building plugin assets"
 	rm -f plugin/languages/*.pot plugin/scripts/*-min.js
-	$(DOCKER_RUN) $(NODE_IMAGE) ./node_modules/gulp-cli/bin/gulp.js
+	$(DOCKER_RUN) $(NODE_IMAGE) npm run build
+	$(DOCKER_RUN) $(COMPOSER_BASE_CONTAINER) run-script makepot
 
 .PHONY: build-docker
 build-docker: build-docker-node build-docker-php
@@ -160,6 +161,10 @@ update-composer: lando-stop
 update-npm: | build-docker-node
 	$(DOCKER_RUN) $(NODE_IMAGE) npm update
 
+.PHONY: watch
+watch: | build-docker-node install-npm
+	$(DOCKER_RUN) $(NODE_IMAGE) npm run start
+
 wpe-php-compat.zip:
 	@echo "Building release file: wpe-php-compat.zip"
 	rm -f wpe-php-compat.zip

README.md

@@ -26,9 +26,7 @@ __URL:__ _http://localhost:8888/wp-admin_
 
 __Admin User:__ _admin_
 
-__Admin Password:__ _password
-
-After you have logged in, go to http://localhost:8888/wp-admin/admin.php?page=fakerpress and generate some dummy content for the block to render.
+__Admin Password:__ _password_
 
 If anything goes wrong and you suspect your local is frozen, you can always `make choose-violence` to rebuild the local environment and containers. Hopefully you never have to choose violence. :)
 

composer.json

@@ -5,7 +5,17 @@
     "phpunit/phpunit": "^9.5.4",
     "brain/monkey": "^2.6.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^v0.7.1",
+    "wp-cli/wp-cli-bundle": "*",
     "wpengine/wpengine-coding-standards": "^1.0.0",
     "johnpbloch/wordpress": "*"
+  },
+  "config": {
+    "allow-plugins": {
+      "johnpbloch/wordpress-core-installer": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
+  },
+  "scripts": {
+    "makepot": "./vendor/bin/wp i18n make-pot plugin --slug=wpe-php-compat"
   }
 }