@deot/dev-dever 2.0.1 → 2.1.0

package/dist/index.cjs.js

@@ -36,6 +36,7 @@ let target = {
   entries: [],
   html: ""
 };
+const excludes = ["tpl", "_", "dist", "node_modules", "__tests__"];
 const walk = (dir) => {
   const { cwd, workspace } = devShared.Locals.impl();
   dir = dir || ".";
@@ -47,9 +48,10 @@ const walk = (dir) => {
     const extname = path__namespace.extname(fullpath);
     if (stat.isFile() && /\.(t|j)sx?$/.test(extname) && paths.length >= 2 && paths[paths.length - 2] === "examples") {
       const basename = path__namespace.basename(file, extname);
-      const name = path__namespace.join(dir, basename);
-      target.entries.push(name.replace(/\/examples/, ""));
-    } else if (stat.isDirectory() && !["dist", "node_modules", "__tests__"].includes(file)) {
+      let name = path__namespace.join(dir, basename).split("/");
+      name.splice(name.length - 2, 1);
+      target.entries.push(name.join("/"));
+    } else if (stat.isDirectory() && !excludes.includes(file)) {
       const subdir = path__namespace.join(dir, file);
       walk(subdir);
     }
@@ -100,7 +102,11 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   }));
   if (!entries.length)
     return devShared.Shell.spawn(`echo no entry file found!`);
-  let options$ = {};
+  let options$ = {
+    server: {
+      host: true
+    }
+  };
   if (fs$1.existsSync(`${cwd}/z.dev.config.ts`)) {
     options$.configFile = path__namespace.relative(cwd, path__namespace.resolve(cwd, "./z.dev.config.ts"));
   } else if (fs$1.existsSync(`${cwd}/dev.config.ts`)) {
@@ -110,9 +116,9 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
   }
   const server = await vite.createServer(options$);
   const $server = await server.listen();
-  const $port = $server.config.server.port;
-  const $host = $server.config.server.host || "0.0.0.0";
-  entries.forEach((item) => devShared.Logger.log(`  > ${item}: ${chalk.cyan(`http://${$host}:${$port}/${item}.html`)}`));
+  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`)}`));
 });
 
 exports.run = run;

package/dist/index.es.js

@@ -12,6 +12,7 @@ let target = {
   entries: [],
   html: ""
 };
+const excludes = ["tpl", "_", "dist", "node_modules", "__tests__"];
 const walk = (dir) => {
   const { cwd, workspace } = Locals.impl();
   dir = dir || ".";
@@ -23,9 +24,10 @@ const walk = (dir) => {
     const extname = path.extname(fullpath);
     if (stat.isFile() && /\.(t|j)sx?$/.test(extname) && paths.length >= 2 && paths[paths.length - 2] === "examples") {
       const basename = path.basename(file, extname);
-      const name = path.join(dir, basename);
-      target.entries.push(name.replace(/\/examples/, ""));
-    } else if (stat.isDirectory() && !["dist", "node_modules", "__tests__"].includes(file)) {
+      let name = path.join(dir, basename).split("/");
+      name.splice(name.length - 2, 1);
+      target.entries.push(name.join("/"));
+    } else if (stat.isDirectory() && !excludes.includes(file)) {
       const subdir = path.join(dir, file);
       walk(subdir);
     }
@@ -76,7 +78,11 @@ const run = (options) => Utils.autoCatch(async () => {
   }));
   if (!entries.length)
     return Shell.spawn(`echo no entry file found!`);
-  let options$ = {};
+  let options$ = {
+    server: {
+      host: true
+    }
+  };
   if (fs$1.existsSync(`${cwd}/z.dev.config.ts`)) {
     options$.configFile = path.relative(cwd, path.resolve(cwd, "./z.dev.config.ts"));
   } else if (fs$1.existsSync(`${cwd}/dev.config.ts`)) {
@@ -86,9 +92,9 @@ const run = (options) => Utils.autoCatch(async () => {
   }
   const server = await createServer(options$);
   const $server = await server.listen();
-  const $port = $server.config.server.port;
-  const $host = $server.config.server.host || "0.0.0.0";
-  entries.forEach((item) => Logger.log(`  > ${item}: ${chalk.cyan(`http://${$host}:${$port}/${item}.html`)}`));
+  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`)}`));
 });
 
 export { run };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-dever",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -15,9 +15,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.0.0",
+    "@deot/dev-shared": "^2.1.0",
     "ejs": "^3.1.9",
-    "vite": "^4.3.9"
+    "vite": "^4.4.1"
   },
   "devDependencies": {
     "cross-env": "^7.0.3"

package/shared.config.ts

@@ -15,29 +15,34 @@ const replacement = (name: string) => path.resolve(cwd, `./packages/${name}/src`
 const { name } = createRequire(cwd)(path.resolve(cwd, workspace ? `${workspace}/index` : '', 'package.json'));
 
 const getHtmlContent = async (url: string) => {
-	let fullpath = path.join(cwd, url);
+	let fullpath = path.join(cwd, workspace, url);
+
 	if (
-		/^\/?@vite/.test(url)
-		|| (
-			fs.existsSync(fullpath) 
-			&& fs.statSync(fullpath).isFile()
-		)
+		/^\/?@vite/.test(url) 
+		|| (fs.existsSync(fullpath) && fs.statSync(fullpath).isFile())
 	) {
 		return;
 	}
 
 	if (url === '/') return html;
 
-	const [packageFolderName, htmlEntry] = url.split('/').filter(i => !!i);
+	const info = url.split('/').filter(i => !!i);
+
+	const prefix = info.slice(0, -1);
+	const entry = info.slice(-1)[0];
+
+	if (prefix[prefix.length - 1] !== 'examples') {
+		prefix.push('examples');
+	}
 
 	fullpath = path.join(
 		cwd, 
 		workspace,
-		packageFolderName,
-		'examples',
-		`${htmlEntry?.replace(/(\.html)/g, '')}.ts`
+		prefix.join('/'),
+		`${entry?.replace(/(\.html)$/, '.ts')}`
 	);
-	if (!fs.existsSync(fullpath)) return html;
+
+	if (!fs.existsSync(fullpath)) return /\.[\s\S]+$/.test(entry) ? undefined : html;
 
 	let contents = '';
 	contents += `<!DOCTYPE html>\n`;