@deot/dev-tester 2.0.1 → 2.0.3

package/dist/index.cjs.js

@@ -87,7 +87,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
     };
   }
   const { cwd, workspace, packageOptionsMap, packageDirsMap } = locals;
-  const { coverage, packageName, watch, dryRun } = options;
+  const { environment, coverage, watch, dryRun } = options;
   options.packageFolderName = devShared.Locals.getPackageFolderName(options.packageName) || options.packageFolderName;
   options.workspace = workspace;
   const packageOptions = packageOptionsMap[options.packageFolderName];
@@ -115,24 +115,21 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   process.env.NODE_ENV = process.env.NODE_ENV || "TEST";
   process.env.TEST_OPTIONS = TEST_OPTIONS;
   let options$ = {
+    environment,
     coverage: {
       enabled: !!coverage
     },
     passWithNoTests: true,
     watch: !!(watch || isDev)
   };
-  if (fs.existsSync(`${cwd}/test.config.ts`)) {
-    options$.config = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./test.config.ts"));
-  } else if (fs.existsSync(`${cwd}/z.test.config.ts`)) {
+  if (fs.existsSync(`${cwd}/z.test.config.ts`)) {
     options$.config = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./z.test.config.ts"));
+  } else if (fs.existsSync(`${cwd}/test.config.ts`)) {
+    options$.config = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./test.config.ts"));
   } else {
     options$.config = path__namespace.relative(cwd, path__namespace.resolve(dirname, "../shared.config.ts"));
   }
-  const vitest = await node.createVitest("test", options$);
-  await vitest.start();
-  if (!watch)
-    return;
-  devShared.Logger.log(packageName || "", "测试已通过");
+  await node.startVitest("test", [], options$);
 }, {
   onError: (e) => {
     if (typeof e === "number" && e === 1) {

package/dist/index.es.js

@@ -1,7 +1,7 @@
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Locals, Utils, Shell, Logger } from '@deot/dev-shared';
-import { createVitest } from 'vitest/node';
+import { startVitest } from 'vitest/node';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
 import autocomplete from 'inquirer-autocomplete-prompt';
@@ -64,7 +64,7 @@ const run = (options) => Utils.autoCatch(async () => {
     };
   }
   const { cwd, workspace, packageOptionsMap, packageDirsMap } = locals;
-  const { coverage, packageName, watch, dryRun } = options;
+  const { environment, coverage, watch, dryRun } = options;
   options.packageFolderName = Locals.getPackageFolderName(options.packageName) || options.packageFolderName;
   options.workspace = workspace;
   const packageOptions = packageOptionsMap[options.packageFolderName];
@@ -92,24 +92,21 @@ const run = (options) => Utils.autoCatch(async () => {
   process.env.NODE_ENV = process.env.NODE_ENV || "TEST";
   process.env.TEST_OPTIONS = TEST_OPTIONS;
   let options$ = {
+    environment,
     coverage: {
       enabled: !!coverage
     },
     passWithNoTests: true,
     watch: !!(watch || isDev)
   };
-  if (fs.existsSync(`${cwd}/test.config.ts`)) {
-    options$.config = path.relative(cwd, path.resolve(cwd, "./test.config.ts"));
-  } else if (fs.existsSync(`${cwd}/z.test.config.ts`)) {
+  if (fs.existsSync(`${cwd}/z.test.config.ts`)) {
     options$.config = path.relative(cwd, path.resolve(cwd, "./z.test.config.ts"));
+  } else if (fs.existsSync(`${cwd}/test.config.ts`)) {
+    options$.config = path.relative(cwd, path.resolve(cwd, "./test.config.ts"));
   } else {
     options$.config = path.relative(cwd, path.resolve(dirname, "../shared.config.ts"));
   }
-  const vitest = await createVitest("test", options$);
-  await vitest.start();
-  if (!watch)
-    return;
-  Logger.log(packageName || "", "测试已通过");
+  await startVitest("test", [], options$);
 }, {
   onError: (e) => {
     if (typeof e === "number" && e === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-tester",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -19,6 +19,7 @@
     "cross-env": "^7.0.3",
     "inquirer": "^9.2.6",
     "inquirer-autocomplete-prompt": "^3.0.0",
+    "jsdom": "^22.1.0",
     "vitest": "^0.32.0"
   }
 }