@nocobase/test 2.1.0-beta.15 → 2.1.0-beta.17

package/lib/server/mock-isolated-cluster.js

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -26,21 +24,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mock_isolated_cluster_exports = {};
 __export(mock_isolated_cluster_exports, {
   MockIsolatedCluster: () => MockIsolatedCluster
 });
 module.exports = __toCommonJS(mock_isolated_cluster_exports);
-var import_node_path = __toESM(require("node:path"));
 var import_node_child_process = require("node:child_process");
 var import_portfinder = require("portfinder");
 var import_utils = require("@nocobase/utils");
@@ -69,8 +58,8 @@ const _MockIsolatedCluster = class _MockIsolatedCluster {
           ...this.options.env,
           APP_PORT: `${port}`,
           APPEND_PRESET_BUILT_IN_PLUGINS: (this.options.plugins ?? []).join(","),
-          SOCKET_PATH: `storage/tests/gateway-cluster-${(0, import_utils.uid)()}.sock`,
-          PM2_HOME: import_node_path.default.resolve(process.cwd(), `storage/tests/.pm2-${(0, import_utils.uid)()}`)
+          SOCKET_PATH: (0, import_utils.storagePathJoin)("tests", `gateway-cluster-${(0, import_utils.uid)()}.sock`),
+          PM2_HOME: (0, import_utils.storagePathJoin)("tests", `.pm2-${(0, import_utils.uid)()}`)
         }
       });
       await new Promise((resolve, reject) => {

package/lib/server/mock-server.js

@@ -53,8 +53,6 @@ var import_qs = __toESM(require("qs"));
 var import_supertest = __toESM(require("supertest"));
 var import_memory_pub_sub_adapter = require("./memory-pub-sub-adapter");
 var import_mock_data_source = require("./mock-data-source");
-var import_path = __toESM(require("path"));
-var import_node_process = __toESM(require("node:process"));
 var import_fs = require("fs");
 const _MockServer = class _MockServer extends import_server.Application {
   registerMockDataSource() {
@@ -264,7 +262,7 @@ async function createMockCluster({
 }
 __name(createMockCluster, "createMockCluster");
 async function createMockServer(options = {}) {
-  const cachePath = import_path.default.join(import_node_process.default.cwd(), "storage", "cache");
+  const cachePath = (0, import_utils.storagePathJoin)("cache");
   try {
     await import_fs.promises.rm(cachePath, { recursive: true, force: true });
     await import_fs.promises.mkdir(cachePath, { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "2.1.0-beta.15",
+  "version": "2.1.0-beta.17",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,8 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "2.1.0-beta.15",
+    "@nocobase/server": "2.1.0-beta.17",
+    "@nocobase/utils": "2.1.0-beta.17",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -76,5 +77,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370"
+  "gitHead": "227d625e47174ab7b3a90170e7c6c67bbdf36e23"
 }

package/perf/scenarios/import/init.ts

@@ -1,5 +1,6 @@
 import { createMockServer } from '@nocobase/test';
 import { CollectionRepository } from '@nocobase/plugin-data-source-main';
+import { storagePathJoin } from '@nocobase/utils';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
@@ -7,7 +8,7 @@ import ExcelJS from 'exceljs';
 import { faker } from '@faker-js/faker';
 import request from 'superagent';
 
-const storagePath = path.resolve(process.cwd(), 'storage', 'perf', 'importDataTest');
+const storagePath = storagePathJoin('perf', 'importDataTest');
 
 export default async function main() {
   const app = await createMockServer({

package/setup/server.ts

@@ -1,4 +1,4 @@
-import { initEnv } from '@nocobase/cli';
+import { initEnv } from '@nocobase/cli-v1';
 
 process.env.APP_ENV_PATH = process.env.APP_ENV_PATH || '.env.test';
 

package/vitest.mjs

@@ -181,6 +181,10 @@ export const getFilterInclude = (isServer, isCoverage) => {
     return false;
   });
 
+  if (argv[0] === 'run' || argv[0] === 'watch') {
+    argv = argv.slice(1);
+  }
+
   let filterFileOrDir = argv[0];
 
   if (!filterFileOrDir) return {};