From 690e566556b7ee1d38a3513fd073f7c8445420ac Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 28 Oct 2020 18:09:49 +0100 Subject: [PATCH] Move web interface to its own package Create clusterio/web_ui package and move all of the web interface files to it in order to be able to share the interface components with plugins. --- packages/master/package.json | 6 +--- packages/master/web/index.jsx | 2 +- packages/master/webpack.config.js | 3 +- packages/web_ui/package.json | 30 +++++++++++++++++++ .../{master/web => web_ui/src}/basename.jsx | 0 .../{master/web => web_ui/src}/bootstrap.jsx | 0 .../web => web_ui/src}/components/App.jsx | 0 .../src}/components/data-table.jsx | 0 packages/{master/web => web_ui/src}/index.css | 0 .../web => web_ui/src}/layout/index.jsx | 0 .../web => web_ui/src}/pages/dashboard.jsx | 0 .../src}/pages/instances/instance.jsx | 0 .../src}/pages/instances/instancesTable.jsx | 0 .../pages/permissions/permissionsTable.jsx | 0 .../web => web_ui/src}/pages/roles/role.jsx | 0 .../src}/pages/roles/rolesTable.jsx | 0 .../src}/pages/settings/settings.jsx | 0 .../src}/pages/slaves/slavesTable.jsx | 0 .../web => web_ui/src}/pages/users/user.jsx | 0 .../src}/pages/users/usersTable.jsx | 0 .../web => web_ui/src}/util/notify.jsx | 0 .../web => web_ui/src}/util/websocket.jsx | 0 .../web => web_ui/src}/util/wslink.jsx | 0 packages/{master => web_ui}/webpack.common.js | 0 plugins/global_chat/package.json | 5 +--- plugins/global_chat/webpack.config.js | 3 +- plugins/research_sync/package.json | 5 +--- plugins/research_sync/webpack.config.js | 3 +- plugins/statistics_exporter/package.json | 5 +--- plugins/statistics_exporter/webpack.config.js | 3 +- plugins/subspace_storage/package.json | 5 +--- plugins/subspace_storage/webpack.config.js | 3 +- 32 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 packages/web_ui/package.json rename packages/{master/web => web_ui/src}/basename.jsx (100%) rename packages/{master/web => web_ui/src}/bootstrap.jsx (100%) rename packages/{master/web => web_ui/src}/components/App.jsx (100%) rename packages/{master/web => web_ui/src}/components/data-table.jsx (100%) rename packages/{master/web => web_ui/src}/index.css (100%) rename packages/{master/web => web_ui/src}/layout/index.jsx (100%) rename packages/{master/web => web_ui/src}/pages/dashboard.jsx (100%) rename packages/{master/web => web_ui/src}/pages/instances/instance.jsx (100%) rename packages/{master/web => web_ui/src}/pages/instances/instancesTable.jsx (100%) rename packages/{master/web => web_ui/src}/pages/permissions/permissionsTable.jsx (100%) rename packages/{master/web => web_ui/src}/pages/roles/role.jsx (100%) rename packages/{master/web => web_ui/src}/pages/roles/rolesTable.jsx (100%) rename packages/{master/web => web_ui/src}/pages/settings/settings.jsx (100%) rename packages/{master/web => web_ui/src}/pages/slaves/slavesTable.jsx (100%) rename packages/{master/web => web_ui/src}/pages/users/user.jsx (100%) rename packages/{master/web => web_ui/src}/pages/users/usersTable.jsx (100%) rename packages/{master/web => web_ui/src}/util/notify.jsx (100%) rename packages/{master/web => web_ui/src}/util/websocket.jsx (100%) rename packages/{master/web => web_ui/src}/util/wslink.jsx (100%) rename packages/{master => web_ui}/webpack.common.js (100%) diff --git a/packages/master/package.json b/packages/master/package.json index 98bf25e4..3f9dbc7f 100644 --- a/packages/master/package.json +++ b/packages/master/package.json @@ -35,17 +35,13 @@ "yargs": "^14.2.0" }, "devDependencies": { - "@ant-design/icons": "^4.2.2", "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "antd": "^4.6.5", + "@clusterio/web_ui": "^2.0.0-alpha.1", "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", "css-loader": "^4.3.0", - "events": "^3.2.0", "fast-deep-equal": "^3.1.3", "null-loader": "^4.0.0", - "path-browserify": "^1.0.1", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", diff --git a/packages/master/web/index.jsx b/packages/master/web/index.jsx index 50599f7a..30fdbf62 100644 --- a/packages/master/web/index.jsx +++ b/packages/master/web/index.jsx @@ -1 +1 @@ -import("./bootstrap"); +import("@clusterio/web_ui/src/bootstrap"); diff --git a/packages/master/webpack.config.js b/packages/master/webpack.config.js index 6ed48d69..01ebb289 100644 --- a/packages/master/webpack.config.js +++ b/packages/master/webpack.config.js @@ -3,7 +3,7 @@ const path = require("path"); const webpack = require("webpack"); const { merge } = require("webpack-merge"); -const common = require("./webpack.common"); +const common = require("@clusterio/web_ui/webpack.common"); module.exports = (env = {}) => merge(common(env), { entry: "./web/index.jsx", @@ -19,6 +19,7 @@ module.exports = (env = {}) => merge(common(env), { name: "master", shared: { "@clusterio/lib": { singleton: true }, + "@clusterio/web_ui": { singleton: true }, "ajv": {}, "antd": { singleton: true }, "react": { singleton: true }, diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json new file mode 100644 index 00000000..47b10086 --- /dev/null +++ b/packages/web_ui/package.json @@ -0,0 +1,30 @@ +{ + "name": "@clusterio/web_ui", + "description": "Clusterio web interface implementation", + "author": "Hornwitser", + "license": "MIT", + "version": "2.0.0-alpha.1", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [ + "clusterio" + ], + "engines": { + "node": ">=10.16 <11 || >= 12" + }, + "dependencies": { + "@ant-design/icons": "^4.2.2", + "@clusterio/lib": "^2.0.0-alpha.1", + "antd": "^4.6.5", + "clean-webpack-plugin": "^3.0.0", + "events": "^3.2.0", + "path-browserify": "^1.0.1", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-router-dom": "^5.2.0" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/packages/master/web/basename.jsx b/packages/web_ui/src/basename.jsx similarity index 100% rename from packages/master/web/basename.jsx rename to packages/web_ui/src/basename.jsx diff --git a/packages/master/web/bootstrap.jsx b/packages/web_ui/src/bootstrap.jsx similarity index 100% rename from packages/master/web/bootstrap.jsx rename to packages/web_ui/src/bootstrap.jsx diff --git a/packages/master/web/components/App.jsx b/packages/web_ui/src/components/App.jsx similarity index 100% rename from packages/master/web/components/App.jsx rename to packages/web_ui/src/components/App.jsx diff --git a/packages/master/web/components/data-table.jsx b/packages/web_ui/src/components/data-table.jsx similarity index 100% rename from packages/master/web/components/data-table.jsx rename to packages/web_ui/src/components/data-table.jsx diff --git a/packages/master/web/index.css b/packages/web_ui/src/index.css similarity index 100% rename from packages/master/web/index.css rename to packages/web_ui/src/index.css diff --git a/packages/master/web/layout/index.jsx b/packages/web_ui/src/layout/index.jsx similarity index 100% rename from packages/master/web/layout/index.jsx rename to packages/web_ui/src/layout/index.jsx diff --git a/packages/master/web/pages/dashboard.jsx b/packages/web_ui/src/pages/dashboard.jsx similarity index 100% rename from packages/master/web/pages/dashboard.jsx rename to packages/web_ui/src/pages/dashboard.jsx diff --git a/packages/master/web/pages/instances/instance.jsx b/packages/web_ui/src/pages/instances/instance.jsx similarity index 100% rename from packages/master/web/pages/instances/instance.jsx rename to packages/web_ui/src/pages/instances/instance.jsx diff --git a/packages/master/web/pages/instances/instancesTable.jsx b/packages/web_ui/src/pages/instances/instancesTable.jsx similarity index 100% rename from packages/master/web/pages/instances/instancesTable.jsx rename to packages/web_ui/src/pages/instances/instancesTable.jsx diff --git a/packages/master/web/pages/permissions/permissionsTable.jsx b/packages/web_ui/src/pages/permissions/permissionsTable.jsx similarity index 100% rename from packages/master/web/pages/permissions/permissionsTable.jsx rename to packages/web_ui/src/pages/permissions/permissionsTable.jsx diff --git a/packages/master/web/pages/roles/role.jsx b/packages/web_ui/src/pages/roles/role.jsx similarity index 100% rename from packages/master/web/pages/roles/role.jsx rename to packages/web_ui/src/pages/roles/role.jsx diff --git a/packages/master/web/pages/roles/rolesTable.jsx b/packages/web_ui/src/pages/roles/rolesTable.jsx similarity index 100% rename from packages/master/web/pages/roles/rolesTable.jsx rename to packages/web_ui/src/pages/roles/rolesTable.jsx diff --git a/packages/master/web/pages/settings/settings.jsx b/packages/web_ui/src/pages/settings/settings.jsx similarity index 100% rename from packages/master/web/pages/settings/settings.jsx rename to packages/web_ui/src/pages/settings/settings.jsx diff --git a/packages/master/web/pages/slaves/slavesTable.jsx b/packages/web_ui/src/pages/slaves/slavesTable.jsx similarity index 100% rename from packages/master/web/pages/slaves/slavesTable.jsx rename to packages/web_ui/src/pages/slaves/slavesTable.jsx diff --git a/packages/master/web/pages/users/user.jsx b/packages/web_ui/src/pages/users/user.jsx similarity index 100% rename from packages/master/web/pages/users/user.jsx rename to packages/web_ui/src/pages/users/user.jsx diff --git a/packages/master/web/pages/users/usersTable.jsx b/packages/web_ui/src/pages/users/usersTable.jsx similarity index 100% rename from packages/master/web/pages/users/usersTable.jsx rename to packages/web_ui/src/pages/users/usersTable.jsx diff --git a/packages/master/web/util/notify.jsx b/packages/web_ui/src/util/notify.jsx similarity index 100% rename from packages/master/web/util/notify.jsx rename to packages/web_ui/src/util/notify.jsx diff --git a/packages/master/web/util/websocket.jsx b/packages/web_ui/src/util/websocket.jsx similarity index 100% rename from packages/master/web/util/websocket.jsx rename to packages/web_ui/src/util/websocket.jsx diff --git a/packages/master/web/util/wslink.jsx b/packages/web_ui/src/util/wslink.jsx similarity index 100% rename from packages/master/web/util/wslink.jsx rename to packages/web_ui/src/util/wslink.jsx diff --git a/packages/master/webpack.common.js b/packages/web_ui/webpack.common.js similarity index 100% rename from packages/master/webpack.common.js rename to packages/web_ui/webpack.common.js diff --git a/plugins/global_chat/package.json b/plugins/global_chat/package.json index 49fec954..21e3955c 100644 --- a/plugins/global_chat/package.json +++ b/plugins/global_chat/package.json @@ -19,12 +19,9 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "@clusterio/master": "^2.0.0-alpha.1", + "@clusterio/web_ui": "^2.0.0-alpha.1", "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", - "events": "^3.2.0", "null-loader": "^4.0.0", - "path-browserify": "^1.0.1", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/global_chat/webpack.config.js b/plugins/global_chat/webpack.config.js index f338be0e..c036c0a2 100644 --- a/plugins/global_chat/webpack.config.js +++ b/plugins/global_chat/webpack.config.js @@ -3,7 +3,7 @@ const path = require("path"); const webpack = require("webpack"); const { merge } = require("webpack-merge"); -const common = require("@clusterio/master/webpack.common"); +const common = require("@clusterio/web_ui/webpack.common"); module.exports = (env = {}) => merge(common(env), { entry: "./web/index.jsx", @@ -21,6 +21,7 @@ module.exports = (env = {}) => merge(common(env), { }, shared: { "@clusterio/lib": { import: false }, + "@clusterio/web_ui": { import: false }, "ajv": { import: false }, }, }), diff --git a/plugins/research_sync/package.json b/plugins/research_sync/package.json index 8c7a4e59..8933c81c 100644 --- a/plugins/research_sync/package.json +++ b/plugins/research_sync/package.json @@ -22,12 +22,9 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "@clusterio/master": "^2.0.0-alpha.1", + "@clusterio/web_ui": "^2.0.0-alpha.1", "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", - "events": "^3.2.0", "null-loader": "^4.0.0", - "path-browserify": "^1.0.1", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/research_sync/webpack.config.js b/plugins/research_sync/webpack.config.js index a3151f33..f4de2479 100644 --- a/plugins/research_sync/webpack.config.js +++ b/plugins/research_sync/webpack.config.js @@ -3,7 +3,7 @@ const path = require("path"); const webpack = require("webpack"); const { merge } = require("webpack-merge"); -const common = require("@clusterio/master/webpack.common"); +const common = require("@clusterio/web_ui/webpack.common"); module.exports = (env = {}) => merge(common(env), { entry: "./web/index.jsx", @@ -21,6 +21,7 @@ module.exports = (env = {}) => merge(common(env), { }, shared: { "@clusterio/lib": { import: false }, + "@clusterio/web_ui": { import: false }, "ajv": { import: false }, }, }), diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json index f1945a65..0083efcd 100644 --- a/plugins/statistics_exporter/package.json +++ b/plugins/statistics_exporter/package.json @@ -19,12 +19,9 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "@clusterio/master": "^2.0.0-alpha.1", + "@clusterio/web_ui": "^2.0.0-alpha.1", "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", - "events": "^3.2.0", "null-loader": "^4.0.0", - "path-browserify": "^1.0.1", "webpack-cli": "^3.3.12", "webpack-merge": "^5.2.0" }, diff --git a/plugins/statistics_exporter/webpack.config.js b/plugins/statistics_exporter/webpack.config.js index 129dcf0f..4f231c84 100644 --- a/plugins/statistics_exporter/webpack.config.js +++ b/plugins/statistics_exporter/webpack.config.js @@ -3,7 +3,7 @@ const path = require("path"); const webpack = require("webpack"); const { merge } = require("webpack-merge"); -const common = require("@clusterio/master/webpack.common"); +const common = require("@clusterio/web_ui/webpack.common"); module.exports = (env = {}) => merge(common(env), { entry: "./web/index.jsx", @@ -21,6 +21,7 @@ module.exports = (env = {}) => merge(common(env), { }, shared: { "@clusterio/lib": { import: false }, + "@clusterio/web_ui": { import: false }, "ajv": { import: false }, }, }), diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json index bbacb929..540db0b0 100644 --- a/plugins/subspace_storage/package.json +++ b/plugins/subspace_storage/package.json @@ -22,13 +22,10 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "@clusterio/master": "^2.0.0-alpha.1", + "@clusterio/web_ui": "^2.0.0-alpha.1", "antd": "^4.6.5", "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", - "events": "^3.2.0", "null-loader": "^4.0.0", - "path-browserify": "^1.0.1", "react": "^16.13.1", "react-dom": "^16.13.1", "webpack-cli": "^3.3.12", diff --git a/plugins/subspace_storage/webpack.config.js b/plugins/subspace_storage/webpack.config.js index 05814382..cc88fe4e 100644 --- a/plugins/subspace_storage/webpack.config.js +++ b/plugins/subspace_storage/webpack.config.js @@ -3,7 +3,7 @@ const path = require("path"); const webpack = require("webpack"); const { merge } = require("webpack-merge"); -const common = require("@clusterio/master/webpack.common"); +const common = require("@clusterio/web_ui/webpack.common"); module.exports = (env = {}) => merge(common(env), { entry: "./web/index.jsx", @@ -21,6 +21,7 @@ module.exports = (env = {}) => merge(common(env), { }, shared: { "@clusterio/lib": { import: false }, + "@clusterio/web_ui": { import: false }, "ajv": { import: false }, "antd": { import: false }, "react": { import: false },