@jayfong/x-server 1.26.0 → 1.26.3

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.26.3](https://github.com/jfWorks/x-server/compare/v1.26.2...v1.26.3) (2022-05-03)
+
+
+### Bug Fixes
+
+* hexoid 构建问题 ([0620d5a](https://github.com/jfWorks/x-server/commit/0620d5a3ea3ffe3d552a68aeaa51330abde70585))
+
+### [1.26.2](https://github.com/jfWorks/x-server/compare/v1.26.1...v1.26.2) (2022-05-03)
+
+
+### Bug Fixes
+
+* defineTask ([8b32f5c](https://github.com/jfWorks/x-server/commit/8b32f5c4b068ac5c03030901dffa599df4fb6cf6))
+
+### [1.26.1](https://github.com/jfWorks/x-server/compare/v1.26.0...v1.26.1) (2022-05-03)
+
+
+### Bug Fixes
+
+* defineTask ([7d5a5d2](https://github.com/jfWorks/x-server/commit/7d5a5d247a63301dc46042238a6d31f7f4cb5423))
+
 ## [1.26.0](https://github.com/jfWorks/x-server/compare/v1.25.0...v1.26.0) (2022-05-02)
 
 

package/lib/_cjs/cli/build_util.js

@@ -55,7 +55,16 @@ class BuildUtil {
         name: item,
         version: itemPkgContent.version
       };
-    })); // 构建
+    })); // fix: hexoid 构建问题
+
+    try {
+      const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
+
+      const pkg = await _fsExtra.default.readJson(hexoidPackageJsonFile);
+      delete pkg.module;
+      await _fsExtra.default.writeJson(hexoidPackageJsonFile, pkg);
+    } catch {} // 构建
+
 
     await _fsExtra.default.emptyDir(distDir);
     await esbuild.build({

package/lib/_cjs/core/define_task.js

@@ -9,9 +9,13 @@ var _bull = _interopRequireDefault(require("bull"));
 
 var _x = require("../x");
 
-async function defineTask(options) {
+function defineTask(options) {
   const queue = new _bull.default(options.name, {
-    redis: _x.x.redis.options,
+    redis: { ..._x.x.redis.options,
+      // https://github.com/OptimalBits/bull/issues/2186
+      maxRetriesPerRequest: null,
+      enableReadyCheck: false
+    },
     prefix: `${_x.x.appId}_task`
   });
   queue.process(async job => {

package/lib/cli/build_util.js

@@ -31,7 +31,16 @@ export class BuildUtil {
         name: item,
         version: itemPkgContent.version
       };
-    })); // 构建
+    })); // fix: hexoid 构建问题
+
+    try {
+      const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
+
+      const pkg = await fs.readJson(hexoidPackageJsonFile);
+      delete pkg.module;
+      await fs.writeJson(hexoidPackageJsonFile, pkg);
+    } catch {} // 构建
+
 
     await fs.emptyDir(distDir);
     await esbuild.build({

package/lib/core/define_task.d.ts

@@ -1,2 +1,2 @@
 import type { XTask } from './types';
-export declare function defineTask<T>(options: XTask.Options<T>): Promise<XTask.Task<T>>;
+export declare function defineTask<T>(options: XTask.Options<T>): XTask.Task<T>;

package/lib/core/define_task.js

@@ -1,8 +1,12 @@
 import Queue from 'bull';
 import { x } from "../x";
-export async function defineTask(options) {
+export function defineTask(options) {
   const queue = new Queue(options.name, {
-    redis: x.redis.options,
+    redis: { ...x.redis.options,
+      // https://github.com/OptimalBits/bull/issues/2186
+      maxRetriesPerRequest: null,
+      enableReadyCheck: false
+    },
     prefix: `${x.appId}_task`
   });
   queue.process(async job => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.26.0",
+  "version": "1.26.3",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",