@jayfong/x-server 2.39.0 → 2.39.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -156,14 +156,20 @@ class BuildUtil {
156
156
  };
157
157
  await _fsExtra.default.writeJSON(distPkgFile, distPkgContent);
158
158
 
159
+ // Node 版本
160
+ const nodeVersionFile = _nodePath.default.join(options.cwd, '.nvmrc');
161
+ const nodeVersion = (await _fsExtra.default.pathExists(nodeVersionFile)) ? (await _fsExtra.default.readFile(nodeVersionFile, 'utf-8')).trim() : '';
162
+
159
163
  // 写入 pm2 配置
160
164
  await _fsExtra.default.writeFile(distPm2File, (0, _vtils.dedent)`
161
165
  module.exports = {
162
166
  apps: [
163
167
  {
164
168
  name: ${JSON.stringify(pkgContent.name)},
165
- interpreter: 'fnm',
166
- interpreter_args: ['exec'],
169
+ ...(${JSON.stringify(nodeVersion ? {
170
+ interpreter: 'fnm',
171
+ interpreter_args: ['exec', '--using', nodeVersion, 'node']
172
+ } : {})}),
167
173
  script: './main.js',
168
174
  ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
169
175
  },
@@ -150,14 +150,20 @@ export class BuildUtil {
150
150
  };
151
151
  await fs.writeJSON(distPkgFile, distPkgContent);
152
152
 
153
+ // Node 版本
154
+ const nodeVersionFile = path.join(options.cwd, '.nvmrc');
155
+ const nodeVersion = (await fs.pathExists(nodeVersionFile)) ? (await fs.readFile(nodeVersionFile, 'utf-8')).trim() : '';
156
+
153
157
  // 写入 pm2 配置
154
158
  await fs.writeFile(distPm2File, dedent`
155
159
  module.exports = {
156
160
  apps: [
157
161
  {
158
162
  name: ${JSON.stringify(pkgContent.name)},
159
- interpreter: 'fnm',
160
- interpreter_args: ['exec'],
163
+ ...(${JSON.stringify(nodeVersion ? {
164
+ interpreter: 'fnm',
165
+ interpreter_args: ['exec', '--using', nodeVersion, 'node']
166
+ } : {})}),
161
167
  script: './main.js',
162
168
  ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
163
169
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jayfong/x-server",
3
- "version": "2.39.0",
3
+ "version": "2.39.2",
4
4
  "license": "ISC",
5
5
  "sideEffects": false,
6
6
  "main": "lib/_cjs/index.js",
@@ -9,7 +9,9 @@
9
9
  "bin": {
10
10
  "xs": "lib/_cjs/cli/cli.js"
11
11
  },
12
- "files": ["lib"],
12
+ "files": [
13
+ "lib"
14
+ ],
13
15
  "scripts": {
14
16
  "build": "haoma compile",
15
17
  "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -54,7 +56,7 @@
54
56
  "lru-cache": "^10.0.0",
55
57
  "lz-string": "^1.4.4",
56
58
  "mini-svg-data-uri": "^1.4.4",
57
- "node-ssh": "^12.0.4",
59
+ "node-ssh": "^13.1.0",
58
60
  "nodemailer": "^6.7.3",
59
61
  "pino-pretty": "^10.0.1",
60
62
  "pirates": "^4.0.6",