@jayfong/x-server 2.46.0 → 2.47.1

package/lib/_cjs/cli/build_util.js

@@ -159,7 +159,8 @@ class BuildUtil {
 
     // .nvmrc
     const nvmrcFile = _nodePath.default.join(options.cwd, '.nvmrc');
-    if (await _fsExtra.default.pathExists(nvmrcFile)) {
+    const hasNvmrc = await _fsExtra.default.pathExists(nvmrcFile);
+    if (hasNvmrc) {
       await _fsExtra.default.writeFile(distNvmrcFile, await _fsExtra.default.readFile(nvmrcFile));
     }
 
@@ -170,6 +171,10 @@ class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(${JSON.stringify(hasNvmrc ? {
+      interpreter: 'fnm',
+      interpreter_args: 'exec node'
+    } : {})}),
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],

package/lib/_cjs/cli/deploy_util.js

@@ -38,7 +38,6 @@ class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
-        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/_cjs/plugins/file_parser.js

@@ -1,9 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
-exports.FileParserPlugin = void 0;
-var _multipart = _interopRequireDefault(require("@fastify/multipart"));
+exports.MultipartFile = exports.FileParserPlugin = void 0;
+var _multipart = _interopRequireWildcard(require("@fastify/multipart"));
+exports.MultipartFile = _multipart.MultipartFile;
 var _vtils = require("vtils");
 /**
  * file 解析器插件

package/lib/cli/build_util.js

@@ -153,7 +153,8 @@ export class BuildUtil {
 
     // .nvmrc
     const nvmrcFile = path.join(options.cwd, '.nvmrc');
-    if (await fs.pathExists(nvmrcFile)) {
+    const hasNvmrc = await fs.pathExists(nvmrcFile);
+    if (hasNvmrc) {
       await fs.writeFile(distNvmrcFile, await fs.readFile(nvmrcFile));
     }
 
@@ -164,6 +165,10 @@ export class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(${JSON.stringify(hasNvmrc ? {
+      interpreter: 'fnm',
+      interpreter_args: 'exec node'
+    } : {})}),
               ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],

package/lib/cli/deploy_util.js

@@ -33,7 +33,6 @@ export class DeployUtil {
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
-        [ -f .nvmrc ] && eval "$(fnm env)"
         ${options.cmd || ''}
         ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {

package/lib/plugins/file_parser.d.ts

@@ -1,6 +1,7 @@
 import { FastifyMultipartOptions } from '@fastify/multipart';
-import { BasePlugin } from './base';
 import { FastifyInstance } from 'fastify';
+import { BasePlugin } from './base';
+export { MultipartFile } from '@fastify/multipart';
 export interface FileParserPluginOptions extends FastifyMultipartOptions {
 }
 /**

package/lib/plugins/file_parser.js

@@ -1,5 +1,6 @@
 import FastifyMultipart from '@fastify/multipart';
 import { bytes } from 'vtils';
+export { MultipartFile } from '@fastify/multipart';
 /**
  * file 解析器插件
  *

package/package.json

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