From 78ce6fc3827d0e8099363ee594048e1a2e60a40f Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Thu, 11 Mar 2021 13:49:15 +0100
Subject: [PATCH] Move /plugin/name/ to /plugins/name/

The web files for plugins were hosted at /plugin/plugin_name/ while the
view page for a plugin is hosted at /plugins/plugin_name/view.  Reduce
confusion by making both urls use the plural version.
---
 packages/master/master.js                     | 2 +-
 packages/web_ui/src/bootstrap.jsx             | 2 +-
 plugins/global_chat/webpack.config.js         | 2 +-
 plugins/research_sync/webpack.config.js       | 2 +-
 plugins/statistics_exporter/webpack.config.js | 2 +-
 plugins/subspace_storage/webpack.config.js    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/master/master.js b/packages/master/master.js
index a5044424..6b80e181 100755
--- a/packages/master/master.js
+++ b/packages/master/master.js
@@ -2049,7 +2049,7 @@ async function startServer(args) {
 
 		let pluginPackagePath = require.resolve(path.posix.join(pluginInfo.requirePath, "package.json"));
 		let webPath = path.join(path.dirname(pluginPackagePath), "dist", "web");
-		app.use(`/plugin/${pluginInfo.name}`, express.static(webPath));
+		app.use(`/plugins/${pluginInfo.name}`, express.static(webPath));
 	}
 
 	// Load plugins
diff --git a/packages/web_ui/src/bootstrap.jsx b/packages/web_ui/src/bootstrap.jsx
index 0db610cb..ee217769 100644
--- a/packages/web_ui/src/bootstrap.jsx
+++ b/packages/web_ui/src/bootstrap.jsx
@@ -42,7 +42,7 @@ async function loadPlugins() {
 	await __webpack_init_sharing__("default");
 	for (let meta of pluginList) {
 		try {
-			await loadScript(`${basename}/plugin/${meta.name}/remoteEntry.js`);
+			await loadScript(`${basename}/plugins/${meta.name}/remoteEntry.js`);
 			let container = window[`plugin_${meta.name}`];
 			if (!container) {
 				throw new Error(`Plugin did not expose its container via plugin_${meta.name}`);
diff --git a/plugins/global_chat/webpack.config.js b/plugins/global_chat/webpack.config.js
index 87890343..ccb9b636 100644
--- a/plugins/global_chat/webpack.config.js
+++ b/plugins/global_chat/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = (env = {}) => merge(common(env), {
 	context: __dirname,
 	entry: "./web/index.jsx",
 	output: {
-		publicPath: "/plugin/global_chat/",
+		publicPath: "/plugins/global_chat/",
 		filename: "bundle.js",
 		path: path.resolve(__dirname, "dist", "web"),
 	},
diff --git a/plugins/research_sync/webpack.config.js b/plugins/research_sync/webpack.config.js
index 69ef00de..b34f7439 100644
--- a/plugins/research_sync/webpack.config.js
+++ b/plugins/research_sync/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = (env = {}) => merge(common(env), {
 	context: __dirname,
 	entry: "./web/index.jsx",
 	output: {
-		publicPath: "/plugin/research_sync/",
+		publicPath: "/plugins/research_sync/",
 		filename: "bundle.js",
 		path: path.resolve(__dirname, "dist", "web"),
 	},
diff --git a/plugins/statistics_exporter/webpack.config.js b/plugins/statistics_exporter/webpack.config.js
index 3f1ee548..a42b5c65 100644
--- a/plugins/statistics_exporter/webpack.config.js
+++ b/plugins/statistics_exporter/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = (env = {}) => merge(common(env), {
 	context: __dirname,
 	entry: "./web/index.jsx",
 	output: {
-		publicPath: "/plugin/statistics_exporter/",
+		publicPath: "/plugins/statistics_exporter/",
 		filename: "bundle.js",
 		path: path.resolve(__dirname, "dist", "web"),
 	},
diff --git a/plugins/subspace_storage/webpack.config.js b/plugins/subspace_storage/webpack.config.js
index cefb283b..1de46598 100644
--- a/plugins/subspace_storage/webpack.config.js
+++ b/plugins/subspace_storage/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = (env = {}) => merge(common(env), {
 	context: __dirname,
 	entry: "./web/index.jsx",
 	output: {
-		publicPath: "/plugin/subspace_storage/",
+		publicPath: "/plugins/subspace_storage/",
 		filename: "bundle.js",
 		path: path.resolve(__dirname, "dist", "web"),
 	},