@jayfong/x-server 1.33.8 → 1.33.10

package/lib/_cjs/cli/build_util.js

@@ -41,21 +41,30 @@ class BuildUtil {
 
     const distPm2File = _nodePath.default.join(distDir, 'pm2.config.js');
 
+    const distNoInstallFile = _nodePath.default.join(distDir, 'no_install.lock');
+
     const distBundleFile = _nodePath.default.join(tempDir, `app.${pkgContent.version}.tgz`);
 
     await _fsExtra.default.ensureDir(distDir);
     await _fsExtra.default.ensureDir(tempDir); // 处理 external
 
     const external = (0, _vtils.uniq)(options.external || []);
-    const externalWithVersions = await Promise.all(external.map(async item => {
-      const itemPkgFile = require.resolve(`${item}/package.json`);
-
-      const itemPkgContent = await _fsExtra.default.readJson(itemPkgFile);
-      return {
-        name: item,
-        version: itemPkgContent.version
-      };
-    })); // fix: hexoid 构建问题
+    const externalWithVersions = (await Promise.all(external.map(async item => {
+      try {
+        const itemPkgFile = require.resolve(`${item}/package.json`);
+
+        const itemPkgContent = await _fsExtra.default.readJson(itemPkgFile);
+        return {
+          name: item,
+          version: itemPkgContent.version
+        };
+      } catch {
+        return {
+          name: item,
+          version: ''
+        };
+      }
+    }))).filter(item => !!item.version); // fix: hexoid 构建问题
 
     try {
       const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
@@ -160,17 +169,25 @@ class BuildUtil {
             },
           ],
         }
-      `); // 安装 external 依赖
-
-    await (0, _execa.default)('tyn', {
-      cwd: distDir,
-      stdio: 'inherit',
-      env: {
-        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
-        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
-        yarn_disable_self_update_check: 'true'
+      `);
+
+    if (externalWithVersions.length) {
+      if (options.noInstall) {
+        await _fsExtra.default.writeFile(distNoInstallFile, '');
+      } else {
+        // 安装 external 依赖
+        await (0, _execa.default)('tyn', {
+          cwd: distDir,
+          stdio: 'inherit',
+          env: {
+            // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+            // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+            yarn_disable_self_update_check: 'true'
+          }
+        });
       }
-    }); // 打包为 tgz
+    } // 打包为 tgz
+
 
     await _compressing.default.tgz.compressDir(distDir, distBundleFile);
   }

package/lib/_cjs/cli/cli.js

@@ -96,8 +96,14 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
+}).positional('no-install', {
+  alias: 'n',
+  describe: '是否不本地安装外部依赖',
+  type: 'boolean',
+  default: false
 }), async argv => {
   process.env.NODE_ENV = 'production';
+  const externals = (0, _vtils.castArray)(argv.external || []).map(item => item.split(',')).flat().filter(Boolean);
   const envs = await _env_util.EnvUtil.parseFile({
     cwd: process.cwd(),
     file: '.env'
@@ -118,9 +124,10 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   });
   await _build_util.BuildUtil.build({
     cwd: process.cwd(),
-    external: argv.external,
+    external: externals,
     inlineEnvs: envs,
-    minify: argv.minify
+    minify: argv.minify,
+    noInstall: argv['no-install']
   });
   console.log('构建成功');
 }).command('api', '生成 API', async () => {

package/lib/_cjs/cli/deploy_util.js

@@ -47,6 +47,7 @@ class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/lib/cli/build_util.d.ts

@@ -4,6 +4,7 @@ export interface BuildOptions {
     external?: string[];
     inlineEnvs?: ParsedEnv[];
     minify?: boolean;
+    noInstall?: boolean;
 }
 export declare class BuildUtil {
     static build(options: BuildOptions): Promise<void>;

package/lib/cli/build_util.js

@@ -18,20 +18,28 @@ export class BuildUtil {
     const distMainFile = path.join(distDir, 'main.js');
     const distPkgFile = path.join(distDir, 'package.json');
     const distPm2File = path.join(distDir, 'pm2.config.js');
+    const distNoInstallFile = path.join(distDir, 'no_install.lock');
     const distBundleFile = path.join(tempDir, `app.${pkgContent.version}.tgz`);
     await fs.ensureDir(distDir);
     await fs.ensureDir(tempDir); // 处理 external
 
     const external = uniq(options.external || []);
-    const externalWithVersions = await Promise.all(external.map(async item => {
-      const itemPkgFile = require.resolve(`${item}/package.json`);
-
-      const itemPkgContent = await fs.readJson(itemPkgFile);
-      return {
-        name: item,
-        version: itemPkgContent.version
-      };
-    })); // fix: hexoid 构建问题
+    const externalWithVersions = (await Promise.all(external.map(async item => {
+      try {
+        const itemPkgFile = require.resolve(`${item}/package.json`);
+
+        const itemPkgContent = await fs.readJson(itemPkgFile);
+        return {
+          name: item,
+          version: itemPkgContent.version
+        };
+      } catch {
+        return {
+          name: item,
+          version: ''
+        };
+      }
+    }))).filter(item => !!item.version); // fix: hexoid 构建问题
 
     try {
       const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
@@ -134,17 +142,25 @@ export class BuildUtil {
             },
           ],
         }
-      `); // 安装 external 依赖
-
-    await exec('tyn', {
-      cwd: distDir,
-      stdio: 'inherit',
-      env: {
-        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
-        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
-        yarn_disable_self_update_check: 'true'
+      `);
+
+    if (externalWithVersions.length) {
+      if (options.noInstall) {
+        await fs.writeFile(distNoInstallFile, '');
+      } else {
+        // 安装 external 依赖
+        await exec('tyn', {
+          cwd: distDir,
+          stdio: 'inherit',
+          env: {
+            // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+            // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+            yarn_disable_self_update_check: 'true'
+          }
+        });
       }
-    }); // 打包为 tgz
+    } // 打包为 tgz
+
 
     await compressing.tgz.compressDir(distDir, distBundleFile);
   }

package/lib/cli/cli.js

@@ -4,7 +4,7 @@ import execa from 'execa';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
-import { debounce } from 'vtils';
+import { castArray, debounce } from 'vtils';
 import { DeployUtil } from "./deploy_util";
 import { EnvUtil } from "./env_util";
 import { generateManyIndex } from 'vscode-generate-index-standalone';
@@ -78,8 +78,14 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
+}).positional('no-install', {
+  alias: 'n',
+  describe: '是否不本地安装外部依赖',
+  type: 'boolean',
+  default: false
 }), async argv => {
   process.env.NODE_ENV = 'production';
+  const externals = castArray(argv.external || []).map(item => item.split(',')).flat().filter(Boolean);
   const envs = await EnvUtil.parseFile({
     cwd: process.cwd(),
     file: '.env'
@@ -100,9 +106,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   });
   await BuildUtil.build({
     cwd: process.cwd(),
-    external: argv.external,
+    external: externals,
     inlineEnvs: envs,
-    minify: argv.minify
+    minify: argv.minify,
+    noInstall: argv['no-install']
   });
   console.log('构建成功');
 }).command('api', '生成 API', async () => {

package/lib/cli/deploy_util.js

@@ -35,6 +35,7 @@ export class DeployUtil {
         set -ex
         tar -zxvf ${remoteAppFile} -C ${appDir}
         cd ${appDir}/dist
+        [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn 
         pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,

package/package.json

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