Use single entrypoint for lib in web interface

In order to import a path inside packages/lib/ in the webpack shared
module environment it has to be declared as shared in both the web_ui
webpack config and the plugin's webpack config.  This is rather error
prone and easy to miss.  Move the burden of specifying which entrypoints
are valid in lib to lib itself by changing all imports in the web
interface code to import from @clusterio/lib instead sub paths.

For web code this means imports is done like this from now on:

import { libConfig, libLink } from "@clusterio/lib";

For info.js which has to be loadable by both Node.js and web code the
imports are done as follows:

const { libConfig, libLink } = require("@clusterio/lib");

While the Node.js only code can either continue to import sub paths
directly or use the info.js style.
This commit is contained in:
Hornwitser committed 2021-08-17 01:42:45 +02:00
1 parent e3b662717b
commit 8a0c1e8a4b
45 files changed
+111 -80

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
"use strict";
let libLink = require("@clusterio/lib/link");
let { libLink } = require("@clusterio/lib");
module.exports = {
name: "global_chat",
+1 -2
View File
@@ -23,8 +23,7 @@ module.exports = (env = {}) => merge(common(env), {
"./package.json": "./package.json",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"ajv": { import: false },
},
+1 -3
View File
@@ -1,7 +1,5 @@
"use strict";
const libLink = require("@clusterio/lib/link");
const libConfig = require("@clusterio/lib/config");
const libUsers = require("@clusterio/lib/users");
const { libConfig, libLink, libUsers } = require("@clusterio/lib");
class MasterConfigGroup extends libConfig.PluginConfigGroup { }
MasterConfigGroup.defaultAccess = ["master", "slave", "control"];
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useContext, useEffect, useState } from "react";
import libPlugin from "@clusterio/lib/plugin";
import { libPlugin } from "@clusterio/lib";
import { PageLayout, ControlContext } from "@clusterio/web_ui";
import info from "../info";
+1 -2
View File
@@ -24,8 +24,7 @@ module.exports = (env = {}) => merge(common(env), {
"./web": "./web/index.jsx",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"ajv": { import: false },
"antd": { import: false },
+1 -2
View File
@@ -1,6 +1,5 @@
"use strict";
let libLink = require("@clusterio/lib/link");
let libConfig = require("@clusterio/lib/config");
let { libConfig, libLink } = require("@clusterio/lib");
class MasterConfigGroup extends libConfig.PluginConfigGroup {}
+1 -1
View File
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import libPlugin from "@clusterio/lib/plugin";
import { libPlugin } from "@clusterio/lib";
import { notify, notifyErrorHandler } from "@clusterio/web_ui";
import { Button, Form, Input, Spin, Typography } from "antd";
+1 -3
View File
@@ -24,9 +24,7 @@ module.exports = (env = {}) => merge(common(env), {
"./web": "./web/index.jsx",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib/plugin": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"antd": { import: false },
"react": { import: false },
+1 -1
View File
@@ -1,5 +1,5 @@
"use strict";
const libLink = require("@clusterio/lib/link");
const { libLink } = require("@clusterio/lib");
// schema used for syncing technologies to and from the master
+1 -2
View File
@@ -23,8 +23,7 @@ module.exports = (env = {}) => merge(common(env), {
"./package.json": "./package.json",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"ajv": { import: false },
},
+1 -1
View File
@@ -1,5 +1,5 @@
"use strict";
const libConfig = require("@clusterio/lib/config");
const { libConfig } = require("@clusterio/lib");
class InstanceConfigGroup extends libConfig.PluginConfigGroup {}
InstanceConfigGroup.defaultAccess = ["master", "slave", "control"];
@@ -23,8 +23,7 @@ module.exports = (env = {}) => merge(common(env), {
"./package.json": "./package.json",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"ajv": { import: false },
},
+1 -3
View File
@@ -1,7 +1,5 @@
"use strict";
const libLink = require("@clusterio/lib/link");
const libConfig = require("@clusterio/lib/config");
const libUsers = require("@clusterio/lib/users");
const { libConfig, libLink, libUsers } = require("@clusterio/lib");
class MasterConfigGroup extends libConfig.PluginConfigGroup {}
MasterConfigGroup.defaultAccess = ["master", "slave", "control"];
+1 -1
View File
@@ -1,7 +1,7 @@
import React, { useContext, useEffect, useState } from "react";
import { Input, Table, Typography } from "antd";
import libPlugin from "@clusterio/lib/plugin";
import { libPlugin } from "@clusterio/lib";
import { notifyErrorHandler, useItemMetadata, useLocale, PageLayout, ControlContext } from "@clusterio/web_ui";
import info from "../info";
+1 -4
View File
@@ -24,10 +24,7 @@ module.exports = (env = {}) => merge(common(env), {
"./web": "./web/index.jsx",
},
shared: {
"@clusterio/lib/config": { import: false },
"@clusterio/lib/link": { import: false },
"@clusterio/lib/plugin": { import: false },
"@clusterio/lib/users": { import: false },
"@clusterio/lib": { import: false },
"@clusterio/web_ui": { import: false },
"antd": { import: false },
"react": { import: false },