@deot/dev-dever 2.6.2 → 2.8.0

package/dist/index.cjs

@@ -35,35 +35,37 @@ const path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 const fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
 const dirname$1 = path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))));
-let target = {
+const target = {
   entries: [],
   html: ""
 };
 const excludes = ["tpl", "_", "dist", "node_modules", "__tests__"];
-const walk = (dir) => {
+const walk = (dir, playDir) => {
   const { cwd, workspace } = devShared.Locals.impl();
-  dir = dir || ".";
   const directory = path__namespace.join(cwd, workspace, dir);
   fs__namespace.readdirSync(directory).forEach((file) => {
     const fullpath = path__namespace.join(directory, file);
     const paths = fullpath.split("/") || [];
     const stat = fs__namespace.statSync(fullpath);
     const extname = path__namespace.extname(fullpath);
-    if (stat.isFile() && /\.((t|j)sx?|vue)$/.test(extname) && paths.length >= 2 && paths[paths.length - 2] === "examples") {
+    if (stat.isFile() && /\.((t|j)sx?|vue|html)$/.test(extname) && paths.length >= 2 && playDir.includes(paths[paths.length - 2])) {
       const basename = path__namespace.basename(file, extname);
-      let name = path__namespace.join(dir, basename).split("/");
-      name.splice(name.length - 2, 1);
-      target.entries.push(name.join("/"));
+      const name = path__namespace.join(dir, basename).split("/");
+      playDir.length === 1 && name.splice(name.length - 2, 1);
+      const name$ = name.join("/");
+      if (!target.entries.includes(name$)) {
+        target.entries.push(name$);
+      }
     } else if (stat.isDirectory() && !excludes.includes(file)) {
       const subdir = path__namespace.join(dir, file);
-      walk(subdir);
+      walk(subdir, playDir);
     }
   });
 };
-const get = () => {
+const get = (playDir) => {
   if (target.html)
     return target;
-  walk();
+  walk(".", playDir.split(","));
   const tpl = fs__namespace.readFileSync(path__namespace.resolve(dirname$1, "../index.ejs"));
   target.html = ejs.render(tpl.toString(), {
     title: "demo",
@@ -98,7 +100,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   if (!options.workspace)
     delete options.workspace;
   delete options.packageName;
-  let { entries, html } = get();
+  const { entries, html } = get(options.playDir);
   if (!entries.length)
     return devShared.Shell.spawn(`echo no entry file found!`);
   let options$ = {
@@ -136,10 +138,12 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   }
   process.env.DEV_OPTIONS = encodeURIComponent(JSON.stringify(devOptions));
   const server = await vite.createServer(options$);
-  const $server = await server.listen();
-  const { local = [], network = [] } = $server.resolvedUrls || {};
-  const url = network[0] || local[0] || `http://localhost:${$server.config.server.port}`;
+  await server.listen();
+  const { local = [], network = [] } = server.resolvedUrls || {};
+  const url = network[0] || local[0] || `http://localhost:${server.config.server.port}`;
   entries.forEach((item) => devShared.Logger.log(`  > ${item}: ${chalk.cyan(`${url}${item}.html`)}`));
+  server.printUrls();
+  server.bindCLIShortcuts({ print: true });
 });
 
 exports.run = run;

package/dist/index.js

@@ -10,35 +10,37 @@ import * as fs from 'node:fs';
 import { render } from 'ejs';
 
 const dirname$1 = path.dirname(fileURLToPath(import.meta.url));
-let target = {
+const target = {
   entries: [],
   html: ""
 };
 const excludes = ["tpl", "_", "dist", "node_modules", "__tests__"];
-const walk = (dir) => {
+const walk = (dir, playDir) => {
   const { cwd, workspace } = Locals.impl();
-  dir = dir || ".";
   const directory = path.join(cwd, workspace, dir);
   fs.readdirSync(directory).forEach((file) => {
     const fullpath = path.join(directory, file);
     const paths = fullpath.split("/") || [];
     const stat = fs.statSync(fullpath);
     const extname = path.extname(fullpath);
-    if (stat.isFile() && /\.((t|j)sx?|vue)$/.test(extname) && paths.length >= 2 && paths[paths.length - 2] === "examples") {
+    if (stat.isFile() && /\.((t|j)sx?|vue|html)$/.test(extname) && paths.length >= 2 && playDir.includes(paths[paths.length - 2])) {
       const basename = path.basename(file, extname);
-      let name = path.join(dir, basename).split("/");
-      name.splice(name.length - 2, 1);
-      target.entries.push(name.join("/"));
+      const name = path.join(dir, basename).split("/");
+      playDir.length === 1 && name.splice(name.length - 2, 1);
+      const name$ = name.join("/");
+      if (!target.entries.includes(name$)) {
+        target.entries.push(name$);
+      }
     } else if (stat.isDirectory() && !excludes.includes(file)) {
       const subdir = path.join(dir, file);
-      walk(subdir);
+      walk(subdir, playDir);
     }
   });
 };
-const get = () => {
+const get = (playDir) => {
   if (target.html)
     return target;
-  walk();
+  walk(".", playDir.split(","));
   const tpl = fs.readFileSync(path.resolve(dirname$1, "../index.ejs"));
   target.html = render(tpl.toString(), {
     title: "demo",
@@ -73,7 +75,7 @@ const run = (options) => Utils.autoCatch(async () => {
   if (!options.workspace)
     delete options.workspace;
   delete options.packageName;
-  let { entries, html } = get();
+  const { entries, html } = get(options.playDir);
   if (!entries.length)
     return Shell.spawn(`echo no entry file found!`);
   let options$ = {
@@ -111,10 +113,12 @@ const run = (options) => Utils.autoCatch(async () => {
   }
   process.env.DEV_OPTIONS = encodeURIComponent(JSON.stringify(devOptions));
   const server = await createServer(options$);
-  const $server = await server.listen();
-  const { local = [], network = [] } = $server.resolvedUrls || {};
-  const url = network[0] || local[0] || `http://localhost:${$server.config.server.port}`;
+  await server.listen();
+  const { local = [], network = [] } = server.resolvedUrls || {};
+  const url = network[0] || local[0] || `http://localhost:${server.config.server.port}`;
   entries.forEach((item) => Logger.log(`  > ${item}: ${chalk.cyan(`${url}${item}.html`)}`));
+  server.printUrls();
+  server.bindCLIShortcuts({ print: true });
 });
 
 export { run };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-dever",
-  "version": "2.6.2",
+  "version": "2.8.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,14 +21,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-react": "^2.6.2",
-    "@deot/dev-shared": "^2.6.2",
-    "@deot/dev-vue": "^2.6.2",
+    "@deot/dev-react": "^2.8.0",
+    "@deot/dev-shared": "^2.8.0",
+    "@deot/dev-vue": "^2.8.0",
     "ejs": "^3.1.9",
-    "vite": "^4.5.0"
+    "vite": "^5.0.8"
   },
   "devDependencies": {
-    "@deot/dev-test": "^2.6.2",
+    "@deot/dev-test": "^2.8.0",
     "cross-env": "^7.0.3"
   }
 }

package/shared.config.ts

@@ -1,6 +1,6 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs';
-import { createRequire } from "node:module";
+import { createRequire } from 'node:module';
 import { defineConfig } from 'vitest/config';
 import type { UserConfig, ViteDevServer } from 'vite';
 
@@ -8,15 +8,15 @@ import type { UserConfig, ViteDevServer } from 'vite';
  * https://github.com/vuejs/core/issues/8303
  * to fix error: ReferenceError: __name is not defined
  */
-let __defProp = Object.defineProperty;
-let __name = (target: any, value: any) => __defProp(target, 'name', { value, configurable: true });
+const __defProp = Object.defineProperty;
+const __name = (target: any, value: any) => __defProp(target, 'name', { value, configurable: true });
 globalThis.__name = globalThis.__name || __name;
 
 const cwd = process.cwd();
 
 // devOptions
 const devOptions = JSON.parse(decodeURIComponent(process.env.DEV_OPTIONS || '{}'));
-const { workspace, html, subpackagesMap } = devOptions;
+const { playDir, workspace, html, subpackagesMap } = devOptions;
 
 const generateIndexHtml = (url: string, inject: string) => {
 	let contents = '';
@@ -45,42 +45,56 @@ const getVirtualHtml = async (url: string) => {
 	const prefix = info.slice(0, -1);
 	const entry = info.slice(-1)[0];
 
-	if (prefix[prefix.length - 1] !== 'examples') {
-		prefix.push('examples');
-	}
-
 	if (workspace && prefix[0] !== workspace) {
 		prefix.unshift(workspace);
 	}
 
-	const dir = path.join(cwd, prefix.join('/'));
 	const isExist = (ext: string) => {
-		const fullpath = path.join(dir, `${entry.replace(/(.*)(\..*)$/, '$1') + ext}`);
-		return fs.existsSync(fullpath) ? fullpath : false;
+		const getFullpath = (dir: string) => path.join(dir, `${entry.replace(/(.*)(\..*)$/, '$1') + ext}`);
+		const last = prefix[prefix.length - 1];
+		const dirs = playDir.split(',');
+
+		if (dirs.some((i: string) => i === last)) {
+			const fullpath = getFullpath(path.join(cwd, prefix.join('/')));
+			return fs.existsSync(fullpath) ? fullpath : false;
+		}
+
+		for (let i = 0; i <= dirs.length; i++) {
+			let suffix = dirs[i];
+			if (last === suffix) {
+				suffix = '';
+			}
+
+			const fullpath = getFullpath(path.join(cwd, prefix.concat([suffix]).join('/')));
+			if (fs.existsSync(fullpath)) {
+				return fullpath;
+			}
+		}
+
+		return false;
 	};
 
 	const getPreload = (fullpath: string) => {
-		let dir$ = path.dirname(fullpath);
+		let dir = path.dirname(fullpath);
 		let preload = '';
-		while (dir$.includes(cwd) && !preload) {
-			
-			let preloadFullPath = [
-				path.resolve(dir$, './z.dev.preload.ts'),
-				path.resolve(dir$, './dev.preload.ts'),
-				path.resolve(dir$, './z.preload.ts'),
-				path.resolve(dir$, './preload.ts')
+		while (dir.includes(cwd) && !preload) {
+			const preloadFullPath = [
+				path.resolve(dir, './z.dev.preload.ts'),
+				path.resolve(dir, './dev.preload.ts'),
+				path.resolve(dir, './z.preload.ts'),
+				path.resolve(dir, './preload.ts')
 			].find(i => fs.existsSync(i));
 
 			if (preloadFullPath) {
 				preload = `		import "/${path.relative(cwd, preloadFullPath)}";\n`;
 			} else {
-				dir$ = path.resolve(dir$, '..');
+				dir = path.resolve(dir, '..');
 			}
 		}
 
 		return preload;
 	};
-	
+
 	const htmlFullpath = isExist('.html');
 	if (htmlFullpath) {
 		return fs.readFileSync(htmlFullpath).toString();
@@ -118,7 +132,6 @@ const getVirtualHtml = async (url: string) => {
 	}
 };
 
-
 // alias
 const require$ = createRequire(cwd);
 const getPackageName = (name: string) => (require$(path.resolve(cwd, workspace ? `${workspace}/${name}` : '', 'package.json'))).name;
@@ -128,27 +141,27 @@ const name = getPackageName('index');
 export default defineConfig({
 	resolve: workspace
 		? {
-			alias: [
-				{
-					find: new RegExp(`^${name}$`),
-					replacement: replacement('index')
-				},
-				...Object.keys(subpackagesMap).reduce((pre, cur: string) => {
-					if (subpackagesMap[cur].length) {
-						pre.push({
-							find: new RegExp(`^${getPackageName(cur)}$`),
-							replacement: replacement(cur, true)
-						});
+				alias: [
+					{
+						find: new RegExp(`^${name}$`),
+						replacement: replacement('index')
+					},
+					...Object.keys(subpackagesMap).reduce((pre, cur: string) => {
+						if (subpackagesMap[cur].length) {
+							pre.push({
+								find: new RegExp(`^${getPackageName(cur)}$`),
+								replacement: replacement(cur, true)
+							});
+						}
+						return pre;
+					}, [] as any),
+					{
+
+						find: new RegExp(`^${name}-(.*?)$`),
+						replacement: replacement('$1')
 					}
-					return pre;
-				}, [] as any),
-				{
-
-					find: new RegExp(`^${name}-(.*?)$`),
-					replacement: replacement('$1')
-				}
-			]
-		}
+				]
+			}
 		: {},
 	plugins: [
 		{
@@ -156,13 +169,13 @@ export default defineConfig({
 			configureServer(server: ViteDevServer) {
 				server.middlewares.use(async (req, res, next) => {
 					if (res.writableEnded) {
-					    return next();
+						return next();
 					}
 					if (req.url!.includes('html-proxy&')) {
 						return next();
 					}
 
-					let url = req.url?.replace(/[?#].*$/s, '') || '';					
+					const url = req.url?.replace(/[?#].*$/s, '') || '';
 					if (url === '/') return res.end(html);
 
 					// 文件已存在，这样xxx.png可以被获取，真实路径的.ts,.html都可以被获取
@@ -172,7 +185,7 @@ export default defineConfig({
 
 					let vHtml = await getVirtualHtml(url);
 					if (
-						(url?.endsWith('.html') || vHtml) 
+						(url?.endsWith('.html') || vHtml)
 						&& req.headers['sec-fetch-dest'] !== 'script'
 					) {
 						if (!vHtml) {
@@ -191,4 +204,4 @@ export default defineConfig({
 
 	// 因为virtualHtml不需要入口，这样可以不弹出Skipping dependency pre-bundling.
 	optimizeDeps: { entries: [] }
-}) as UserConfig;
+}) as UserConfig;