@jayfong/x-server 1.33.9 → 1.33.10

package/lib/_cjs/cli/build_util.js

@@ -49,15 +49,22 @@ class BuildUtil {
     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');

package/lib/_cjs/cli/cli.js

@@ -103,6 +103,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   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'
@@ -123,7 +124,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   });
   await _build_util.BuildUtil.build({
     cwd: process.cwd(),
-    external: argv.external,
+    external: externals,
     inlineEnvs: envs,
     minify: argv.minify,
     noInstall: argv['no-install']

package/lib/cli/build_util.js

@@ -24,15 +24,22 @@ export class BuildUtil {
     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');

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';
@@ -85,6 +85,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   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'
@@ -105,7 +106,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   });
   await BuildUtil.build({
     cwd: process.cwd(),
-    external: argv.external,
+    external: externals,
     inlineEnvs: envs,
     minify: argv.minify,
     noInstall: argv['no-install']

package/package.json

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