@jayfong/x-server 2.9.9 → 2.10.0

package/lib/_cjs/cli/build_util.js

@@ -126,6 +126,23 @@ class BuildUtil {
               loader: 'js'
             };
           });
+          build.onLoad({
+            filter: /\/vm2\/lib\/vm\.js$/
+          }, async args => {
+            let js = await _fsExtra.default.readFile(args.path, 'utf-8');
+
+            const jsDir = _nodePath.default.dirname(args.path);
+
+            const assetsDir = _nodePath.default.join(distDir, 'assets/vm2');
+
+            await _fsExtra.default.ensureDir(assetsDir);
+            js = js.replace(/__dirname/g, '"./assets/vm2"');
+            await Promise.all([_fsExtra.default.copyFile(_nodePath.default.join(jsDir, 'bridge.js'), _nodePath.default.join(assetsDir, 'bridge.js')), _fsExtra.default.copyFile(_nodePath.default.join(jsDir, 'setup-sandbox.js'), _nodePath.default.join(assetsDir, 'setup-sandbox.js'))]);
+            return {
+              contents: js,
+              loader: 'js'
+            };
+          });
         }
 
       }]
@@ -183,6 +200,7 @@ class BuildUtil {
         await (0, _execa.default)('tyn', {
           cwd: distDir,
           stdio: 'inherit',
+          // @ts-ignore
           env: {
             // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
             // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check

package/lib/cli/build_util.js

@@ -99,6 +99,20 @@ export class BuildUtil {
               loader: 'js'
             };
           });
+          build.onLoad({
+            filter: /\/vm2\/lib\/vm\.js$/
+          }, async args => {
+            let js = await fs.readFile(args.path, 'utf-8');
+            const jsDir = path.dirname(args.path);
+            const assetsDir = path.join(distDir, 'assets/vm2');
+            await fs.ensureDir(assetsDir);
+            js = js.replace(/__dirname/g, '"./assets/vm2"');
+            await Promise.all([fs.copyFile(path.join(jsDir, 'bridge.js'), path.join(assetsDir, 'bridge.js')), fs.copyFile(path.join(jsDir, 'setup-sandbox.js'), path.join(assetsDir, 'setup-sandbox.js'))]);
+            return {
+              contents: js,
+              loader: 'js'
+            };
+          });
         }
 
       }]
@@ -155,6 +169,7 @@ export class BuildUtil {
         await exec('tyn', {
           cwd: distDir,
           stdio: 'inherit',
+          // @ts-ignore
           env: {
             // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
             // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.9.9",
+  "version": "2.10.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -18,7 +18,8 @@
     "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",
     "dev": "rm -rf lib && tsc -w -p ./tsconfig.build.json",
     "release": "source proxy-use-trojan.sh && tyn test && standard-version -a && tyn build && npm publish && haoma run ./scripts/publish_client_helper_package.ts && git push --follow-tags origin master",
-    "test": "tsc --noEmit -p ./tsconfig.build.json && jest",
+    "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
+    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
     "updeps": "tnpx npm-check-updates --target minor --upgrade"
   },
   "husky": {
@@ -73,7 +74,7 @@
     "ts-morph": "^12.2.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.84.0",
+    "vtils": "^4.85.2",
     "yargs": "^17.4.1"
   },
   "devDependencies": {