Update repo local environment setup

.editorconfig

@@ -9,6 +9,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = tab
+indent_size = 4
 
 [{.babelrc,.eslintrc,.rtlcssrc,*.json,*.yml}]
 indent_style = space

.github/workflows/build-test-measure.yml

@@ -326,15 +326,15 @@ jobs:
         run: npm run build:js
 
       - name: Start Docker environment
-        run: npm run env:start
+        run: npm run env:start:ci
         env:
           COMPOSE_INTERACTIVE_NO_CLI: true
 
       - name: Run E2E tests
         run: npm run test:e2e:ci
 
       - name: Stop Docker environment
-        run: npm run env:stop
+        run: npm run env:stop:ci
         if: always()
         env:
           COMPOSE_INTERACTIVE_NO_CLI: true

.gitignore

@@ -1,22 +1,24 @@
 .DS_Store
+node_modules
+
 /vendor
 /build
-node_modules
-wiki
-amp.zip
+/wiki
+/amp.zip
 /assets/css/*
 !/assets/css/src/
-assets/js/**/*.js
-assets/js/*.asset.php
-!assets/js/amp-service-worker-runtime-precaching.js
-assets/js/*.map
-built
+/assets/js/**/*.js
+/assets/js/*.asset.php
+!/assets/js/amp-service-worker-runtime-precaching.js
+/assets/js/*.map
+/built
 /amphtml
-.env
-.idea/
+/.env
+/.idea/
 /phpcs.xml
 /phpunit.xml
 /*.sql
+/.wp-env.override.json
 
 # Generated via bin/transform-readme.php
 /readme.txt

.wp-env.json

@@ -0,0 +1,35 @@
+{
+  "env": {
+    "development": {
+      "plugins": [
+        ".",
+        "https://downloads.wordpress.org/plugin/gutenberg.zip",
+        "https://downloads.wordpress.org/plugin/pwa.zip"
+      ]
+    },
+    "tests": {
+      "config": {
+        "WP_DEBUG": true
+      },
+      "themes": [
+        "https://downloads.wordpress.org/theme/twentyten.zip",
+        "https://downloads.wordpress.org/theme/twentyeleven.zip",
+        "https://downloads.wordpress.org/theme/twentytwelve.zip",
+        "https://downloads.wordpress.org/theme/twentythirteen.zip",
+        "https://downloads.wordpress.org/theme/twentyfourteen.zip",
+        "https://downloads.wordpress.org/theme/twentyfifteen.zip",
+        "https://downloads.wordpress.org/theme/twentysixteen.zip",
+        "https://downloads.wordpress.org/theme/twentyseventeen.zip",
+        "https://downloads.wordpress.org/theme/twentynineteen.zip"
+      ],
+      "plugins": [
+        ".",
+        "https://downloads.wordpress.org/plugin/gutenberg.zip",
+        "https://downloads.wordpress.org/plugin/pwa.zip"
+      ],
+      "mappings": {
+        "../wordpress-develop": "WordPress/wordpress-develop#trunk"
+      }
+    }
+  }
+}

bin/local-env/install-node-nvm.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 NVM_VERSION=`curl -Ls -w %{url_effective} -o /dev/null https://github.com/nvm-sh/nvm/releases/latest | rev | cut -d '/' -f 1 | rev`
+NODE_REQUIRED_VERSION=v$(<.nvmrc)
 
 # Exit if any command fails
 set -e
@@ -58,7 +59,7 @@ if [ "$CI" != "true" ] && [ $NVM_VERSION != "v$(nvm --version)" ]; then
 fi
 
 # Check if the current node version is up to date.
-if [ "$CI" != "true" ] && [ "$(nvm current)" != "$(nvm version-remote --lts)" ]; then
+if [ "$CI" != "true" ] && [ $(nvm current) =~ $NODE_REQUIRED_VERSION.* ]; then
 	echo -e $(warning_message "Node version does not match the latest long term support version. Please run this command to install and use it:" )
 	echo -e $(warning_message "$(action_format "nvm install")" )
 	echo -e $(warning_message "After that, re-run the setup script to continue." )
@@ -68,7 +69,7 @@ fi
 if [ "$CI" != "true" ]; then
   # Install/update packages
   echo -e $(status_message "Installing and updating NPM packages..." )
-  npm install
+  npm ci
 
   # Make sure npm is up-to-date
   npm install npm -g
@@ -82,7 +83,7 @@ if [ "$CI" != "true" ] && ! git diff --no-ext-diff --exit-code package-lock.json
 		git checkout package-lock.json
 
 		echo -e $(status_message "Reinstalling NPM packages..." )
-		npm install
+		npm ci
 
 		# Check that it's cleaned up now.
 		if git diff --no-ext-diff --exit-code package-lock.json >/dev/null; then

includes/class-amp-http.php

@@ -350,19 +350,28 @@ public static function handle_xhr_request() {
 	 * @since 0.7.0
 	 * @since 1.0 Moved to AMP_HTTP class.
 	 * @see wp_redirect()
+	 * @see amp_get_current_url()
+	 * @see AMP_Form_Sanitizer::get_action_url()
 	 *
 	 * @param string $location The location to redirect to.
 	 */
 	public static function intercept_post_request_redirect( $location ) { // phpcs:ignore WordPressVIPMinimum.Hooks.AlwaysReturnInFilter.MissingReturnStatement -- It dies.
 
 		// Make sure relative redirects get made absolute.
+		$parsed_home_url = wp_parse_url( get_home_url() );
+		$parsed_location = wp_parse_url( $location );
+		if ( isset( $parsed_location['host'] ) ) {
+			// Make sure the home port is not accidentally applied to the redirect location URL.
+			unset( $parsed_home_url['port'] );
+		}
+
 		$parsed_location = array_merge(
+			wp_array_slice_assoc( $parsed_home_url, [ 'host', 'port' ] ),
 			[
 				'scheme' => 'https',
-				'host'   => wp_parse_url( home_url(), PHP_URL_HOST ),
 				'path'   => isset( $_SERVER['REQUEST_URI'] ) ? strtok( wp_unslash( $_SERVER['REQUEST_URI'] ), '?' ) : '/', // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 			],
-			wp_parse_url( $location )
+			$parsed_location
 		);
 
 		$absolute_location = '';

includes/sanitizers/class-amp-form-sanitizer.php

@@ -208,18 +208,30 @@ protected function is_comments_form_element( Element $form_element ) {
 	/**
 	 * Get the action URL for the form element.
 	 *
+	 * @see amp_get_current_url()
+	 * @see AMP_HTTP::intercept_post_request_redirect()
 	 * @param string $action_url Action URL.
 	 * @return string Action URL.
 	 */
 	protected function get_action_url( $action_url ) {
+		$parsed_home_url = wp_parse_url( home_url() );
+
 		/*
 		 * In HTML, the default action is just the current URL that the page is served from.
 		 * The action "specifies a server endpoint to handle the form input. The value must be an
 		 * https URL and must not be a link to a CDN".
 		 */
 		if ( ! $action_url ) {
-			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
-			return esc_url_raw( '//' . $_SERVER['HTTP_HOST'] . wp_unslash( $_SERVER['REQUEST_URI'] ) );
+			$action_url = '//' . $parsed_home_url['host'];
+			if ( isset( $parsed_home_url['port'] ) ) {
+				$action_url .= ':' . $parsed_home_url['port'];
+			}
+			if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+				// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Sanitization is done below.
+				$action_url .= wp_unslash( $_SERVER['REQUEST_URI'] );
+			}
+
+			return esc_url_raw( $action_url );
 		}
 
 		$parsed_url = wp_parse_url( $action_url );
@@ -246,8 +258,11 @@ protected function get_action_url( $action_url ) {
 		}
 
 		if ( ! isset( $parsed_url['host'] ) ) {
-			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$parsed_url['host'] = $_SERVER['HTTP_HOST'];
+			$parsed_url['host'] = $parsed_home_url['host'];
+		}
+
+		if ( ! isset( $parsed_url['port'] ) && isset( $parsed_home_url['port'] ) ) {
+			$parsed_url['port'] = $parsed_home_url['port'];
 		}
 
 		if ( ! isset( $parsed_url['path'] ) ) {