@jayfong/x-server 1.26.2 → 1.26.5

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.5](https://github.com/jfWorks/x-server/compare/v1.26.4...v1.26.5) (2022-05-06)
+
+
+### Bug Fixes
+
+* export MailServiceSendOptions type ([7c47c23](https://github.com/jfWorks/x-server/commit/7c47c23a0d2f4d9a08f49e66a0155e282518257f))
+
+### [1.26.4](https://github.com/jfWorks/x-server/compare/v1.26.3...v1.26.4) (2022-05-03)
+
+
+### Bug Fixes
+
+* bull ([5c92fc2](https://github.com/jfWorks/x-server/commit/5c92fc2f54c6e7ddcc237553d840b72af27d8630))
+
+### [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)
 
 

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({
@@ -99,7 +108,7 @@ class BuildUtil {
             filter: /\/bull\/lib\/commands\/index\.js$/
           }, async args => {
             let js = await _fsExtra.default.readFile(args.path, 'utf-8');
-            js = js.replace('loadScripts(__dirname)', 'loadScripts("./assets/bull/commands")');
+            js = js.replace(/__dirname/g, '"./assets/bull/commands"');
             await _fsExtra.default.copy(_nodePath.default.dirname(require.resolve('bull/lib/commands/index.js')), _nodePath.default.join(distDir, 'assets/bull/commands'));
             return {
               contents: js,

package/lib/_cjs/services/mail.js

@@ -16,7 +16,7 @@ class MailService {
     this.transporter = void 0;
   }
 
-  async send(data) {
+  async send(options) {
     if (!this.transporter) {
       this.transporter = _nodemailer.default.createTransport({
         host: this.options.host,
@@ -32,7 +32,7 @@ class MailService {
       _x.x.dispose.add(() => this.transporter.close());
     }
 
-    return this.transporter.sendMail(data);
+    return this.transporter.sendMail(options);
   }
 
 }

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({
@@ -75,7 +84,7 @@ export class BuildUtil {
             filter: /\/bull\/lib\/commands\/index\.js$/
           }, async args => {
             let js = await fs.readFile(args.path, 'utf-8');
-            js = js.replace('loadScripts(__dirname)', 'loadScripts("./assets/bull/commands")');
+            js = js.replace(/__dirname/g, '"./assets/bull/commands"');
             await fs.copy(path.dirname(require.resolve('bull/lib/commands/index.js')), path.join(distDir, 'assets/bull/commands'));
             return {
               contents: js,

package/lib/services/mail.d.ts

@@ -7,12 +7,14 @@ export interface MailServiceOptions {
     user: string;
     pass: string;
 }
+export interface MailServiceSendOptions extends nodemailer.SendMailOptions {
+}
 export declare class MailService implements BaseService {
     private options;
     serviceName: string;
     private transporter;
     constructor(options: MailServiceOptions);
-    send(data: nodemailer.SendMailOptions): Promise<any>;
+    send(options: MailServiceSendOptions): Promise<any>;
 }
 declare module '../x' {
     interface X {

package/lib/services/mail.js

@@ -7,7 +7,7 @@ export class MailService {
     this.transporter = void 0;
   }
 
-  async send(data) {
+  async send(options) {
     if (!this.transporter) {
       this.transporter = nodemailer.createTransport({
         host: this.options.host,
@@ -22,7 +22,7 @@ export class MailService {
       x.dispose.add(() => this.transporter.close());
     }
 
-    return this.transporter.sendMail(data);
+    return this.transporter.sendMail(options);
   }
 
 }

package/package.json

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