@jayfong/x-server 1.11.1 → 1.11.4

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.11.4](https://github.com/jfWorks/x-server/compare/v1.11.3...v1.11.4) (2022-04-20)
+
+
+### Bug Fixes
+
+* 下载 centos (rhel-openssl-1.0.x) 的可执行文件 ([1b5a13f](https://github.com/jfWorks/x-server/commit/1b5a13f30dd46d0cc5d76ee1697580ad07ab03cd))
+
+### [1.11.3](https://github.com/jfWorks/x-server/compare/v1.11.2...v1.11.3) (2022-04-20)
+
+
+### Bug Fixes
+
+* mainFields ([80fd62d](https://github.com/jfWorks/x-server/commit/80fd62d3973f556a83dc7bf1930e5bb06c6845ec))
+
+### [1.11.2](https://github.com/jfWorks/x-server/compare/v1.11.1...v1.11.2) (2022-04-20)
+
+
+### Bug Fixes
+
+* bin ([aa23fe9](https://github.com/jfWorks/x-server/commit/aa23fe9a6ccfef2b78f318676d4d983d24f315c4))
+
 ### [1.11.1](https://github.com/jfWorks/x-server/compare/v1.11.0...v1.11.1) (2022-04-20)
 
 

package/lib/_cjs/cli/build_util.js

@@ -15,6 +15,8 @@ var _execa = _interopRequireDefault(require("execa"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
+var _os = _interopRequireDefault(require("os"));
+
 var _nodePath = _interopRequireDefault(require("node:path"));
 
 var _vtils = require("vtils");
@@ -61,6 +63,11 @@ class BuildUtil {
       bundle: true,
       outfile: distMainFile,
       platform: 'node',
+      // https://esbuild.github.io/api/#main-fields
+      // 当 platform 是 node 时，
+      // esbuild 默认的 mainFields 是 main,module，
+      // 这会导致 treeShaking 失效
+      mainFields: ['module', 'main'],
       target: `node${process.version.slice(1)}`,
       external: external,
       minify: (_options$minify = options.minify) != null ? _options$minify : true,
@@ -104,6 +111,15 @@ class BuildUtil {
     const prismaSchemaFile = _nodePath.default.join(options.cwd, 'src/db/schema.prisma');
 
     if (await _fsExtra.default.pathExists(prismaSchemaFile)) {
+      // 下载 centos (rhel-openssl-1.0.x) 的可执行文件
+      await (0, _execa.default)('node', [require.resolve('@prisma/engines/download/index.js')], {
+        env: {
+          // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
+          // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
+          PRISMA_CLI_BINARY_TARGETS: `${_os.default.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x`
+        }
+      });
+
       const distPrismaSchemaFile = _nodePath.default.join(distDir, 'schema.prisma');
 
       await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile);

package/lib/_cjs/cli/cli.js

@@ -131,10 +131,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   type: 'boolean',
   default: false
 }), async argv => {
-  process.env.NODE_ENV = argv.production ? 'production' : 'development'; // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
-  // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-
-  process.env.PRISMA_CLI_BINARY_TARGETS = 'darwin,rhel-openssl-1.0.x';
+  process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'

package/lib/cli/build_util.js

@@ -1,7 +1,9 @@
 import * as esbuild from 'esbuild';
 import compressing from 'compressing';
 import exec from 'execa';
+import execa from 'execa';
 import fs from 'fs-extra';
+import os from 'os';
 import path from 'node:path';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
@@ -37,6 +39,11 @@ export class BuildUtil {
       bundle: true,
       outfile: distMainFile,
       platform: 'node',
+      // https://esbuild.github.io/api/#main-fields
+      // 当 platform 是 node 时，
+      // esbuild 默认的 mainFields 是 main,module，
+      // 这会导致 treeShaking 失效
+      mainFields: ['module', 'main'],
       target: `node${process.version.slice(1)}`,
       external: external,
       minify: (_options$minify = options.minify) != null ? _options$minify : true,
@@ -80,6 +87,14 @@ export class BuildUtil {
     const prismaSchemaFile = path.join(options.cwd, 'src/db/schema.prisma');
 
     if (await fs.pathExists(prismaSchemaFile)) {
+      // 下载 centos (rhel-openssl-1.0.x) 的可执行文件
+      await execa('node', [require.resolve('@prisma/engines/download/index.js')], {
+        env: {
+          // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
+          // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
+          PRISMA_CLI_BINARY_TARGETS: `${os.platform() === 'darwin' ? 'darwin' : 'windows'},rhel-openssl-1.0.x`
+        }
+      });
       const distPrismaSchemaFile = path.join(distDir, 'schema.prisma');
       await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
       await fs.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.0.x.so.node'), path.join(distDir, 'libquery_engine-rhel-openssl-1.0.x.so.node'));

package/lib/cli/cli.js

@@ -113,10 +113,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   type: 'boolean',
   default: false
 }), async argv => {
-  process.env.NODE_ENV = argv.production ? 'production' : 'development'; // https://www.prisma.io/docs/reference/api-reference/environment-variables-reference#prisma_cli_binary_targets
-  // https://www.prisma.io/docs/reference/api-reference/prisma-schema-reference#binarytargets-options
-
-  process.env.PRISMA_CLI_BINARY_TARGETS = 'darwin,rhel-openssl-1.0.x';
+  process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.11.1",
+  "version": "1.11.4",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "bin": {
-    "xs": "lib/cli/cli.js"
+    "xs": "lib/_cjs/cli/cli.js"
   },
   "files": [
     "lib"