mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 07:33:12 +09:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77f4aa6296 | ||
|
|
86a9084d56 | ||
|
|
43def44136 | ||
|
|
8c1be7210e |
No files matched your search
@@ -20,7 +20,7 @@ jobs:
|
|||||||
node-version: 22.x
|
node-version: 22.x
|
||||||
registry-url: https://registry.npmjs.org
|
registry-url: https://registry.npmjs.org
|
||||||
- run: pnpm install --no-frozen-lockfile
|
- run: pnpm install --no-frozen-lockfile
|
||||||
- run: pnpm -r --filter='./{plugins,packages}/*' publish
|
- run: pnpm -r --filter='./{plugins,packages}/*' publish --no-git-checks
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: $${{ secrets.NPM_TOKEN }}
|
NODE_AUTH_TOKEN: $${{ secrets.NPM_TOKEN }}
|
||||||
- uses: softprops/action-gh-release@v2
|
- uses: softprops/action-gh-release@v2
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ Many thanks to the following for contributing to this release:
|
|||||||
- Fixed "rendered more hooks" error when refreshing hosts page. [#769](https://github.com/clusterio/clusterio/issues/769)
|
- Fixed "rendered more hooks" error when refreshing hosts page. [#769](https://github.com/clusterio/clusterio/issues/769)
|
||||||
- Fixed inventory combinator time signal not always updating [#610](https://github.com/clusterio/clusterio/issues/610)
|
- Fixed inventory combinator time signal not always updating [#610](https://github.com/clusterio/clusterio/issues/610)
|
||||||
- Renamed templates for `.gitignore` and `.npmignore` that caused `create --plugin-template` to fail. [#800](https://github.com/clusterio/clusterio/pull/800)
|
- Renamed templates for `.gitignore` and `.npmignore` that caused `create --plugin-template` to fail. [#800](https://github.com/clusterio/clusterio/pull/800)
|
||||||
|
- Fixed npm update button failing to apply update and restart.
|
||||||
|
|
||||||
### Breaking changes
|
### Breaking changes
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Implementation of Clusterio controller",
|
"description": "Implementation of Clusterio controller",
|
||||||
"author": "Hornwitser",
|
"author": "Hornwitser",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "2.0.0-alpha.22",
|
"version": "2.0.0-alpha.22b",
|
||||||
"main": "dist/node/index.js",
|
"main": "dist/node/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prepare": "tsc --build && webpack-cli --mode production",
|
"prepare": "tsc --build && webpack-cli --mode production",
|
||||||
|
|||||||
@@ -1188,7 +1188,7 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
if (!this._controller.config.get("controller.allow_remote_updates")) {
|
if (!this._controller.config.get("controller.allow_remote_updates")) {
|
||||||
throw new lib.RequestError("Remote updates are disabled on this machine");
|
throw new lib.RequestError("Remote updates are disabled on this machine");
|
||||||
}
|
}
|
||||||
return lib.updatePackage("@clusterio/controller");
|
return await lib.updatePackage("@clusterio/controller");
|
||||||
}
|
}
|
||||||
|
|
||||||
async handlePluginUpdateRequest(request: lib.PluginUpdateRequest) {
|
async handlePluginUpdateRequest(request: lib.PluginUpdateRequest) {
|
||||||
|
|||||||
@@ -570,7 +570,8 @@ export default class Controller {
|
|||||||
try {
|
try {
|
||||||
// First check the clusterio version
|
// First check the clusterio version
|
||||||
const runningVersion = this.config.get("controller.version");
|
const runningVersion = this.config.get("controller.version");
|
||||||
const packageJson = await fs.readJSON(path.join(__dirname, "..", "package.json"));
|
const packageJsonPath = require.resolve("@clusterio/controller/package.json");
|
||||||
|
const packageJson = await fs.readJSON(packageJsonPath);
|
||||||
if (runningVersion !== packageJson.version) {
|
if (runningVersion !== packageJson.version) {
|
||||||
this.config.restartRequired = true;
|
this.config.restartRequired = true;
|
||||||
return true;
|
return true;
|
||||||
@@ -586,7 +587,8 @@ export default class Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
packageName = pluginInfo.npmPackage ?? pluginInfo.name;
|
packageName = pluginInfo.npmPackage ?? pluginInfo.name;
|
||||||
const pluginPackageJson = await fs.readJSON(path.join(pluginInfo.requirePath, "package.json"));
|
const pluginPackageJsonPath = require.resolve(path.posix.join(pluginInfo.requirePath, "package.json"));
|
||||||
|
const pluginPackageJson = await fs.readJSON(pluginPackageJsonPath);
|
||||||
if (pluginInfo.version !== pluginPackageJson.version) {
|
if (pluginInfo.version !== pluginPackageJson.version) {
|
||||||
this.config.restartRequired = true;
|
this.config.restartRequired = true;
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Implementation of Clusterio host server",
|
"description": "Implementation of Clusterio host server",
|
||||||
"author": "Hornwitser",
|
"author": "Hornwitser",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "2.0.0-alpha.22",
|
"version": "2.0.0-alpha.22b",
|
||||||
"main": "dist/node/index.js",
|
"main": "dist/node/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prepare": "tsc --build",
|
"prepare": "tsc --build",
|
||||||
|
|||||||
@@ -819,7 +819,8 @@ export default class Host extends lib.Link {
|
|||||||
try {
|
try {
|
||||||
// First check the clusterio version
|
// First check the clusterio version
|
||||||
const runningVersion = this.config.get("host.version");
|
const runningVersion = this.config.get("host.version");
|
||||||
const packageJson = await fs.readJSON(path.join(__dirname, "..", "package.json"));
|
const packageJsonPath = require.resolve("@clusterio/host/package.json");
|
||||||
|
const packageJson = await fs.readJSON(packageJsonPath);
|
||||||
if (runningVersion !== packageJson.version) {
|
if (runningVersion !== packageJson.version) {
|
||||||
this.config.restartRequired = true;
|
this.config.restartRequired = true;
|
||||||
return true;
|
return true;
|
||||||
@@ -835,7 +836,8 @@ export default class Host extends lib.Link {
|
|||||||
}
|
}
|
||||||
|
|
||||||
packageName = pluginInfo.npmPackage ?? pluginInfo.name;
|
packageName = pluginInfo.npmPackage ?? pluginInfo.name;
|
||||||
const pluginPackageJson = await fs.readJSON(path.join(pluginInfo.requirePath, "package.json"));
|
const pluginPackageJsonPath = require.resolve(path.posix.join(pluginInfo.requirePath, "package.json"));
|
||||||
|
const pluginPackageJson = await fs.readJSON(pluginPackageJsonPath);
|
||||||
if (pluginInfo.version !== pluginPackageJson.version) {
|
if (pluginInfo.version !== pluginPackageJson.version) {
|
||||||
this.config.restartRequired = true;
|
this.config.restartRequired = true;
|
||||||
return true;
|
return true;
|
||||||
@@ -1094,7 +1096,7 @@ export default class Host extends lib.Link {
|
|||||||
if (!this.config.get("host.allow_remote_updates")) {
|
if (!this.config.get("host.allow_remote_updates")) {
|
||||||
throw new lib.RequestError("Remote updates are disabled on this machine");
|
throw new lib.RequestError("Remote updates are disabled on this machine");
|
||||||
}
|
}
|
||||||
return lib.updatePackage("@clusterio/host");
|
return await lib.updatePackage("@clusterio/host");
|
||||||
}
|
}
|
||||||
|
|
||||||
async handlePluginUpdateRequest(request: lib.PluginUpdateRequest) {
|
async handlePluginUpdateRequest(request: lib.PluginUpdateRequest) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@clusterio/lib",
|
"name": "@clusterio/lib",
|
||||||
"description": "Shared library for Clusterio",
|
"description": "Shared library for Clusterio",
|
||||||
"version": "2.0.0-alpha.22",
|
"version": "2.0.0-alpha.22b",
|
||||||
"repository": "https://github.com/clusterio/clusterio",
|
"repository": "https://github.com/clusterio/clusterio",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { RequestError } from "./errors";
|
|||||||
import { PluginNodeEnvInfo } from "./plugin";
|
import { PluginNodeEnvInfo } from "./plugin";
|
||||||
const execAsync = util.promisify(exec);
|
const execAsync = util.promisify(exec);
|
||||||
|
|
||||||
async function isDev() {
|
function isDev() {
|
||||||
// dev: <devRoot>/packages/lib/dist/src/rce_ops.js
|
// dev: <devRoot>/packages/lib/dist/src/rce_ops.js
|
||||||
// prod: <prodRoot>/node_modules/@clusterio/lib/dist/src/rce_ops.js
|
// prod: <prodRoot>/node_modules/@clusterio/lib/dist/src/rce_ops.js
|
||||||
return __dirname.split(path.sep).at(-5) === "packages"; // opposed to "@clusterio"
|
return __dirname.split(path.sep).at(-5) === "packages"; // opposed to "@clusterio"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Clusterio web interface implementation",
|
"description": "Clusterio web interface implementation",
|
||||||
"author": "Hornwitser",
|
"author": "Hornwitser",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "2.0.0-alpha.22",
|
"version": "2.0.0-alpha.22b",
|
||||||
"browser": "src/index.ts",
|
"browser": "src/index.ts",
|
||||||
"main": "dist/browser/src/index.js",
|
"main": "dist/browser/src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ export function NpmButton(props: { target: lib.AddressShorthand, canRestart?: bo
|
|||||||
{
|
{
|
||||||
formAction !== undefined
|
formAction !== undefined
|
||||||
&& account.hasPermission(`core.${props.target === "controller" ? "controller" : "host"}.restart`)
|
&& account.hasPermission(`core.${props.target === "controller" ? "controller" : "host"}.restart`)
|
||||||
&& <Form.Item label="Restart on completion" name="restart">
|
&& <Form.Item label="Restart on completion" name="restart" valuePropName="checked">
|
||||||
<Checkbox disabled={props.canRestart === false}/>
|
<Checkbox disabled={props.canRestart === false}/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user