Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the /plugin-proxy -> /plugin-proxy.php rewrite #712

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Remove the /plugin-proxy -> /plugin-proxy.php rewrite #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0782e06
Remove the /plugin-proxy -> /plugin-proxy.php rewrite
adamziel Oct 19, 2023
10ea726
Adjust the build pipeline
adamziel Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions packages/docs/site/docs/11-architecture/18-host-your-own-playground.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ You can deploy the content of the folder to your server using SSH, such as `scp`

It is a static site, except for these dynamic aspects.

- Apache server directive `.htaccess` file - the result of combining `.htaccess` from the packages `remote` and `website`
- Plugin download proxy, `plugin-proxy.php`
- Apache server directive `.htaccess` file from the package `remote`

For these to work, you need a server environment with Apache and PHP installed.

Expand All @@ -99,7 +98,6 @@ As an alternative to Apache, here is an example of using NGINX to serve the Play
This example may go out of date. It is recommended to refer to the source files.

- [packages/playground/remote/public/.htaccess](https://github.com/WordPress/wordpress-playground/blob/trunk/packages/playground/remote/public/.htaccess)
- [packages/playground/website/public/.htaccess](https://github.com/WordPress/wordpress-playground/blob/trunk/packages/playground/website/public/.htaccess)

:::

Expand All @@ -108,9 +106,6 @@ The combined Apache `.htaccess` file looks like this.
```htaccess
AddType application/wasm .wasm
AddType application/octet-stream .data

RewriteEngine on
RewriteRule ^plugin-proxy$ plugin-proxy.php [NC]
```

An equivalent in NGINX.
Expand All @@ -128,12 +123,6 @@ location ~* .data$ {
}
}

location /plugin-proxy {
try_files plugin-proxy.php /plugin-proxy.php$is_args$args;
include fastcgi_params;
fastcgi_pass php;
}

location /scope:.* {
rewrite ^scope:.*?/(.*)$ $1 last;
}
Expand Down
1 change: 1 addition & 0 deletions packages/php-wasm/web/public/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
AddType application/wasm .wasm
AddType application/octet-stream .data
2 changes: 1 addition & 1 deletion packages/playground/website/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"cp -r ./blueprints/blueprint-schema.json ./wasm-wordpress-net/",
"cp -r ./remote/* ./wasm-wordpress-net/",
"cp -r ./website/* ./wasm-wordpress-net/",
"cat ./remote/.htaccess ./website/.htaccess > ./wasm-wordpress-net/.htaccess"
"cat ./remote/.htaccess > ./wasm-wordpress-net/.htaccess"
],
"cwd": "dist/packages/playground",
"parallel": false
Expand Down
2 changes: 0 additions & 2 deletions packages/playground/website/public/.htaccess
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/playground/website/public/gutenberg.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
}

// Verify that the PR exists and that GitHub CI finished building it
const zipArtifactUrl = `/plugin-proxy?org=WordPress&repo=gutenberg&workflow=Build%20Gutenberg%20Plugin%20Zip&artifact=gutenberg-plugin&pr=${prNumber}`;
const zipArtifactUrl = `/plugin-proxy.php?org=WordPress&repo=gutenberg&workflow=Build%20Gutenberg%20Plugin%20Zip&artifact=gutenberg-plugin&pr=${prNumber}`;
// Send the HEAD request to zipArtifactUrl to confirm the PR and the artifact both exist
const response = await fetch(zipArtifactUrl, { method: 'HEAD' });
if (response.status !== 200) {
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/website/public/wordpress.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
}

// Verify that the PR exists and that GitHub CI finished building it
const zipArtifactUrl = `/plugin-proxy?org=WordPress&repo=wordpress-develop&workflow=Build%20WordPress&artifact=wordpress-build-${prNumber}&pr=${prNumber}`;
const zipArtifactUrl = `/plugin-proxy.php?org=WordPress&repo=wordpress-develop&workflow=Build%20WordPress&artifact=wordpress-build-${prNumber}&pr=${prNumber}`;
// Send the HEAD request to zipArtifactUrl to confirm the PR and the artifact both exist
const response = await fetch(zipArtifactUrl, { method: 'HEAD' });
if (response.status !== 200) {
Expand Down
Loading