@deot/dev-tester 2.5.3 → 2.5.4

package/dist/index.cjs

@@ -132,6 +132,12 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
     devShared.Shell.spawn(`echo ${command}`);
     return;
   }
+  const { vuePackage, reactPackage } = options;
+  const packageName = devShared.Locals.getPackageName(options.packageFolderName);
+  const isVuePackage = typeof vuePackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || vuePackage === "*" || vuePackage.split(",").includes(packageName));
+  const isReactPackage = typeof reactPackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || reactPackage === "*" || reactPackage.split(",").includes(packageName));
+  options.useVue = !!isVuePackage;
+  options.useReact = !!isReactPackage;
   let options$ = {
     environment,
     coverage: {
@@ -145,12 +151,8 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   } else if (fs.existsSync(`${cwd}/test.config.ts`)) {
     options$.config = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./test.config.ts"));
   } else {
-    const { vuePackage, reactPackage } = options;
-    const packageName = devShared.Locals.getPackageName(options.packageFolderName);
-    const isVuePackage = typeof vuePackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || vuePackage === "*" || vuePackage.split(",").includes(packageName));
-    const isReactPackage = typeof reactPackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || reactPackage === "*" || reactPackage.split(",").includes(packageName));
-    options.useVue = !!isVuePackage;
-    options.useReact = !!isReactPackage;
+    process.env.USE_VUE = isVuePackage ? "1" : "";
+    process.env.USE_REACT = isReactPackage ? "1" : "";
     options$.config = path__namespace.relative(cwd, path__namespace.resolve(dirname, "../shared.config.ts"));
   }
   process.env.NODE_ENV = NODE_ENV;

package/dist/index.es.js

@@ -109,6 +109,12 @@ const run = (options) => Utils.autoCatch(async () => {
     Shell.spawn(`echo ${command}`);
     return;
   }
+  const { vuePackage, reactPackage } = options;
+  const packageName = Locals.getPackageName(options.packageFolderName);
+  const isVuePackage = typeof vuePackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || vuePackage === "*" || vuePackage.split(",").includes(packageName));
+  const isReactPackage = typeof reactPackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || reactPackage === "*" || reactPackage.split(",").includes(packageName));
+  options.useVue = !!isVuePackage;
+  options.useReact = !!isReactPackage;
   let options$ = {
     environment,
     coverage: {
@@ -122,12 +128,8 @@ const run = (options) => Utils.autoCatch(async () => {
   } else if (fs.existsSync(`${cwd}/test.config.ts`)) {
     options$.config = path.relative(cwd, path.resolve(cwd, "./test.config.ts"));
   } else {
-    const { vuePackage, reactPackage } = options;
-    const packageName = Locals.getPackageName(options.packageFolderName);
-    const isVuePackage = typeof vuePackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || vuePackage === "*" || vuePackage.split(",").includes(packageName));
-    const isReactPackage = typeof reactPackage === "string" && (packageName === locals.packageName || packageName === `${locals.packageName}-*` || reactPackage === "*" || reactPackage.split(",").includes(packageName));
-    options.useVue = !!isVuePackage;
-    options.useReact = !!isReactPackage;
+    process.env.USE_VUE = isVuePackage ? "1" : "";
+    process.env.USE_REACT = isReactPackage ? "1" : "";
     options$.config = path.relative(cwd, path.resolve(dirname, "../shared.config.ts"));
   }
   process.env.NODE_ENV = NODE_ENV;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-tester",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "type": "module",
   "main": "dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@deot/dev-react": "^2.5.0",
     "@deot/dev-shared": "^2.5.0",
-    "@deot/dev-vue": "^2.5.0",
+    "@deot/dev-vue": "^2.5.1",
     "@vitest/coverage-istanbul": "^0.34.3",
     "cross-env": "^7.0.3",
     "inquirer": "^9.2.10",

package/shared.config.ts

@@ -15,10 +15,16 @@ let __defProp = Object.defineProperty;
 let __name = (target: any, value: any) => __defProp(target, 'name', { value, configurable: true });
 globalThis.__name = globalThis.__name || __name;
 
-const getViteConfig = (options: any) => {
-	return options.useVue 
+// 当库里同时含有vue和react，vue的jsx要含前缀vue
+const getViteConfig = () => {
+	const useVue = process.env.USE_VUE;
+	const useReact = process.env.USE_REACT;
+	if (useVue && useReact) {
+		return defineConfig({ plugins: [vue(), vueJSX({ include: /\.vue\.[jt]sx$/ }), react()] });
+	}
+	return useVue 
 		? defineConfig({ plugins: [vue(), vueJSX()] }) 
-		: options.useReact
+		: useReact
 			? defineConfig({ plugins: [react()] }) 
 			: {};
 };
@@ -32,7 +38,7 @@ let tests: string[] = [];
 let collects: string[] = [];
 
 const TEST_PATTEN = `**/*.{test,spec}.[jt]s?(x)`;
-const COLLECT_PATTEN = `**/*.[jt]s?(x)`;
+const COLLECT_PATTEN = `**/*.{[jt]s?(x),vue}`;
 
 if (workspace) {
 	let prefixDir = `${workspace}/${packageFolderName || '*'}`;
@@ -77,7 +83,7 @@ const getPackageName = (name: string) => (require$(path.resolve(cwd, workspace ?
 const replacement = (name: string, isSubpackage?: boolean) => path.resolve(cwd, `./packages/${name}`, isSubpackage ? 'index.ts' : './src');
 const name = getPackageName('index');
 
-export default mergeConfig(getViteConfig(options), defineConfig({
+export default mergeConfig(getViteConfig(), defineConfig({
 	resolve: workspace
 		? {
 			alias: [