@jayfong/x-server 2.88.0 → 2.88.2

package/lib/_cjs/cli/build_util.js

@@ -178,7 +178,14 @@ class BuildUtil {
         const distMultipleSchemaDir = _nodePath.default.join(distDir, _nodePath.default.basename(multipleSchemaDir));
         await _fsExtra.default.copy(multipleSchemaDir, distMultipleSchemaDir);
       }
-      if (!options.noPrismaEngine) {
+      if (options.noPrismaEngine) {
+        const prismaEngineFiles = await (0, _globby.default)('libquery_engine-*', {
+          cwd: distDir,
+          onlyFiles: true,
+          absolute: true
+        });
+        await Promise.all(prismaEngineFiles.map(file => _fsExtra.default.remove(file)));
+      } else {
         // 复制查询引擎
         const libqueryEngineFiles = await (0, _globby.default)('libquery_engine-*', {
           cwd: _nodePath.default.join(options.cwd, 'node_modules/.prisma/client'),

package/lib/_cjs/cli/cli.js

@@ -140,11 +140,10 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
-}).positional('no-install', {
-  alias: 'n',
-  describe: '是否不本地安装外部依赖',
+}).positional('local-install', {
+  describe: '是否本地安装外部依赖',
   type: 'boolean',
-  default: false
+  default: true
 }).positional('channel', {
   alias: 'h',
   describe: '渠道',
@@ -164,10 +163,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建时排除的文件',
   type: 'string',
   array: true
-}).positional('no-prisma-engine', {
-  describe: '是否不包含 Prisma 引擎',
+})
+// 注意：不要加 no 前缀，其会自动处理
+.positional('prisma-engine', {
+  describe: '是否包含 Prisma 引擎',
   type: 'boolean',
-  default: false
+  default: true
 }), async argv => {
   await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -197,7 +198,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         external: externals,
         inlineEnvs: envMap,
         minify: argv.minify,
-        noInstall: argv['no-install'],
+        noInstall: argv['local-install'] === false,
         channel: channel,
         excludeFiles: (argv.exclude ? (0, _vtils.castArray)(argv.exclude) : []).map(item => {
           return _vtils.StringTemplate.render(item, envMap, {
@@ -207,7 +208,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
           });
         }),
         prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS,
-        noPrismaEngine: argv['no-prisma-engine']
+        noPrismaEngine: argv['prisma-engine'] === false
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/_cjs/cli/deploy_util.js

@@ -36,7 +36,7 @@ class DeployUtil {
     await ssh.putFile(appFile, remoteAppFile);
     await ssh.execCommand((0, _vtils.dedent)`
         set -ex
-        tar -zxvf ${remoteAppFile} -C ${appDir}
+        tar -zxf ${remoteAppFile} -C ${appDir}
         cd "${appDir}/${options.channel || 'dist'}"
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
         ${options.cmd || ''}

package/lib/cli/build_util.js

@@ -172,7 +172,14 @@ export class BuildUtil {
         const distMultipleSchemaDir = path.join(distDir, path.basename(multipleSchemaDir));
         await fs.copy(multipleSchemaDir, distMultipleSchemaDir);
       }
-      if (!options.noPrismaEngine) {
+      if (options.noPrismaEngine) {
+        const prismaEngineFiles = await globby('libquery_engine-*', {
+          cwd: distDir,
+          onlyFiles: true,
+          absolute: true
+        });
+        await Promise.all(prismaEngineFiles.map(file => fs.remove(file)));
+      } else {
         // 复制查询引擎
         const libqueryEngineFiles = await globby('libquery_engine-*', {
           cwd: path.join(options.cwd, 'node_modules/.prisma/client'),

package/lib/cli/cli.js

@@ -138,11 +138,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否压缩',
   type: 'boolean',
   default: true
-}).positional('no-install', {
-  alias: 'n',
-  describe: '是否不本地安装外部依赖',
+}).positional('local-install', {
+  describe: '是否本地安装外部依赖',
   type: 'boolean',
-  default: false
+  default: true
 }).positional('channel', {
   alias: 'h',
   describe: '渠道',
@@ -162,10 +161,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '构建时排除的文件',
   type: 'string',
   array: true
-}).positional('no-prisma-engine', {
-  describe: '是否不包含 Prisma 引擎',
+})
+// 注意：不要加 no 前缀，其会自动处理
+.positional('prisma-engine', {
+  describe: '是否包含 Prisma 引擎',
   type: 'boolean',
-  default: false
+  default: true
 }), async argv => {
   await EnvUtil.withChannel({
     cwd: process.cwd(),
@@ -195,7 +196,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         external: externals,
         inlineEnvs: envMap,
         minify: argv.minify,
-        noInstall: argv['no-install'],
+        noInstall: argv['local-install'] === false,
         channel: channel,
         excludeFiles: (argv.exclude ? castArray(argv.exclude) : []).map(item => {
           return StringTemplate.render(item, envMap, {
@@ -205,7 +206,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
           });
         }),
         prismaCliBinaryTargets: envMap.PRISMA_CLI_BINARY_TARGETS,
-        noPrismaEngine: argv['no-prisma-engine']
+        noPrismaEngine: argv['prisma-engine'] === false
       });
       console.log('构建成功');
       if (argv.deploy) {

package/lib/cli/deploy_util.js

@@ -31,7 +31,7 @@ export class DeployUtil {
     await ssh.putFile(appFile, remoteAppFile);
     await ssh.execCommand(dedent`
         set -ex
-        tar -zxvf ${remoteAppFile} -C ${appDir}
+        tar -zxf ${remoteAppFile} -C ${appDir}
         cd "${appDir}/${options.channel || 'dist'}"
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
         ${options.cmd || ''}

package/package.json

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