@jayfong/x-server 2.76.0 → 2.76.2

package/lib/_cjs/cli/build_util.js

@@ -84,7 +84,7 @@ class BuildUtil {
       },
       plugins: [{
         name: 'extract-assets',
-        setup(build) {
+        async setup(build) {
           build.onLoad({
             filter: /\/svg-captcha\/lib\/option-manager\.js$/
           }, async args => {
@@ -133,7 +133,7 @@ class BuildUtil {
             filter: /@dev[\/\.]/
           }, async () => {
             return {
-              contents: 'export {}',
+              contents: 'module.exports = {}',
               loader: 'js'
             };
           });
@@ -146,7 +146,8 @@ class BuildUtil {
             }, async args => {
               if (excludeRegExps.some(re => re.test(args.path))) {
                 return {
-                  contents: 'export {}',
+                  // 不用 export {} 避免 esbuild 检测报错
+                  contents: 'module.exports = {}',
                   loader: 'js'
                 };
               }

package/lib/_cjs/cli/cli.js

@@ -185,11 +185,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         minify: argv.minify,
         noInstall: argv['no-install'],
         channel: channel,
-        excludeFiles: argv.exclude?.map(item => {
-          return (0, _vtils.escapeRegExp)(_vtils.StringTemplate.render(item, envMap, {
+        excludeFiles: (argv.exclude ? (0, _vtils.castArray)(argv.exclude) : []).map(item => {
+          return _vtils.StringTemplate.render(item, envMap, {
             code: true,
-            onlyCode: true
-          }));
+            onlyCode: true,
+            beforeReplace: v => (0, _vtils.escapeRegExp)(v)
+          });
         })
       });
       console.log('构建成功');

package/lib/cli/build_util.js

@@ -78,7 +78,7 @@ export class BuildUtil {
       },
       plugins: [{
         name: 'extract-assets',
-        setup(build) {
+        async setup(build) {
           build.onLoad({
             filter: /\/svg-captcha\/lib\/option-manager\.js$/
           }, async args => {
@@ -127,7 +127,7 @@ export class BuildUtil {
             filter: /@dev[\/\.]/
           }, async () => {
             return {
-              contents: 'export {}',
+              contents: 'module.exports = {}',
               loader: 'js'
             };
           });
@@ -140,7 +140,8 @@ export class BuildUtil {
             }, async args => {
               if (excludeRegExps.some(re => re.test(args.path))) {
                 return {
-                  contents: 'export {}',
+                  // 不用 export {} 避免 esbuild 检测报错
+                  contents: 'module.exports = {}',
                   loader: 'js'
                 };
               }

package/lib/cli/cli.js

@@ -183,11 +183,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         minify: argv.minify,
         noInstall: argv['no-install'],
         channel: channel,
-        excludeFiles: argv.exclude?.map(item => {
-          return escapeRegExp(StringTemplate.render(item, envMap, {
+        excludeFiles: (argv.exclude ? castArray(argv.exclude) : []).map(item => {
+          return StringTemplate.render(item, envMap, {
             code: true,
-            onlyCode: true
-          }));
+            onlyCode: true,
+            beforeReplace: v => escapeRegExp(v)
+          });
         })
       });
       console.log('构建成功');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.76.0",
+  "version": "2.76.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,9 +9,7 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": [
-    "lib"
-  ],
+  "files": ["lib"],
   "scripts": {
     "build": "haoma compile",
     "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",
@@ -71,7 +69,7 @@
     "unplugin-macros": "^0.16.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.128.0",
+    "vtils": "^4.130.1",
     "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },