@michijs/dev-server 0.7.17 → 0.7.19

package/bin/actions/start.js

@@ -7,9 +7,7 @@ import open from "open";
 import { context } from "esbuild";
 import { getHostURL } from "../utils/getHostURL.js";
 import { getLocalURL } from "../utils/getLocalURL.js";
-import { watchPublicFolderPlugin } from "../config/plugins/watchPublicFolder.js";
 export const start = async (callback) => {
-    config.esbuildOptions.plugins?.push(watchPublicFolderPlugin);
     const buildContext = await context(config.esbuildOptions);
     const { host: esbuildHost, port: esbuildPort } = await buildContext.serve({
         servedir: config.esbuildOptions.outdir,

package/bin/config/config.js

@@ -1,14 +1,13 @@
 import fs from "fs";
 import coloredString from "../utils/coloredString.js";
-import { copy } from "../utils/copy.js";
 import { getPath } from "../utils/getPath.js";
 import { userConfig } from "./userConfig.js";
 import { resolve } from "path";
-import { jsAndTsRegex, jsonTransformer, notJsAndTsRegex, transformers, } from "../actions/start/transformers.js";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
 import { counterPlugin } from "./plugins/counter.js";
 import { getCurrentCommitSha } from "../utils/getCurrentCommitSha.js";
+import { publicFolderPlugin } from "./plugins/publicFolder.js";
 const minify = process.env.NODE_ENV === "PRODUCTION";
 const devServerListener = process.env.NODE_ENV === "DEVELOPMENT"
     ? [getPath(`${dirname(fileURLToPath(import.meta.url))}/public/client.js`)]
@@ -88,45 +87,7 @@ const config = {
         // ],
         plugins: [
             ...(userConfig.esbuildOptions?.plugins ?? []),
-            {
-                name: "michijs-dev-server",
-                setup(build) {
-                    // Clean outdir
-                    if (build.initialOptions.outdir) {
-                        if (fs.existsSync(build.initialOptions.outdir)) {
-                            fs.rmSync(build.initialOptions.outdir, { recursive: true });
-                        }
-                        fs.mkdirSync(build.initialOptions.outdir, { recursive: true });
-                    }
-                    if (config.public.manifest?.options && config.public.manifest.name) {
-                        const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.manifest.options, null, 2));
-                        fs.writeFileSync(getPath(`${build.initialOptions.outdir}/${config.public.manifest.name}`), transformedFile);
-                    }
-                    if (config.public.wellKnown) {
-                        const wellKnownDir = `${build.initialOptions.outdir}/.well-known`;
-                        if (!fs.existsSync(wellKnownDir))
-                            fs.mkdirSync(wellKnownDir);
-                        if (config.public.wellKnown.assetsLinks) {
-                            const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.wellKnown.assetsLinks));
-                            fs.writeFileSync(getPath(`${wellKnownDir}/assetlinks.json`), transformedFile);
-                        }
-                        if (config.public.wellKnown.webAppOriginAssociation) {
-                            const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.wellKnown.webAppOriginAssociation));
-                            fs.writeFileSync(getPath(`${wellKnownDir}/web-app-origin-association`), transformedFile);
-                        }
-                    }
-                    // Copy public path - Omit to copy service worker - will be transformed after
-                    if (config.public.path && build.initialOptions.outdir)
-                        copy(config.public.path, build.initialOptions.outdir, transformers, [jsAndTsRegex]);
-                    let firstLoad = true;
-                    build.onEnd(() => {
-                        // first-load sw - Omit to copy any other non-js file
-                        if (firstLoad && config.public.path && build.initialOptions.outdir)
-                            copy(config.public.path, build.initialOptions.outdir, transformers, [notJsAndTsRegex]);
-                        firstLoad = false;
-                    });
-                },
-            },
+            publicFolderPlugin,
             counterPlugin,
         ],
         define: {

package/bin/config/plugins/publicFolder.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from "esbuild";
+export declare const publicFolderPlugin: Plugin;

package/bin/config/plugins/publicFolder.js

@@ -0,0 +1,54 @@
+import { config, connections } from "../config.js";
+import { jsAndTsRegex, notJsAndTsRegex, transformers, } from "../../actions/start/transformers.js";
+import { syncDirs } from "../../utils/syncDirs.js";
+import { copy } from "../../utils/copy.js";
+import fs from "fs";
+import { jsonTransformer } from "../../actions/start/transformers.js";
+import { getPath } from "../../utils/getPath.js";
+export const publicFolderPlugin = {
+    name: "michijs-dev-server-public-folder",
+    setup(build) {
+        const outdir = build.initialOptions.outdir;
+        // Clean outdir
+        if (!outdir)
+            return;
+        if (fs.existsSync(outdir))
+            fs.rmSync(outdir, { recursive: true });
+        fs.mkdirSync(outdir, { recursive: true });
+        if (config.public.manifest?.options && config.public.manifest.name) {
+            const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.manifest.options, null, 2));
+            fs.writeFileSync(getPath(`${outdir}/${config.public.manifest.name}`), transformedFile);
+        }
+        if (config.public.wellKnown) {
+            const wellKnownDir = `${outdir}/.well-known`;
+            if (!fs.existsSync(wellKnownDir))
+                fs.mkdirSync(wellKnownDir);
+            if (config.public.wellKnown.assetsLinks) {
+                const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.wellKnown.assetsLinks));
+                fs.writeFileSync(getPath(`${wellKnownDir}/assetlinks.json`), transformedFile);
+            }
+            if (config.public.wellKnown.webAppOriginAssociation) {
+                const transformedFile = jsonTransformer.transformer(JSON.stringify(config.public.wellKnown.webAppOriginAssociation));
+                fs.writeFileSync(getPath(`${wellKnownDir}/web-app-origin-association`), transformedFile);
+            }
+        }
+        // Copy public path - Omit to copy service worker - will be transformed after
+        copy(config.public.path, outdir, transformers, [jsAndTsRegex]);
+        let firstLoad = true;
+        build.onEnd(() => {
+            // first-load sw - Omit to copy any other non-js file
+            if (firstLoad) {
+                copy(config.public.path, outdir, transformers, [notJsAndTsRegex]);
+                if (config.watch)
+                    syncDirs(config.public.path, config.esbuildOptions.outdir, transformers, undefined, undefined, (event, fileChangedPath) => {
+                        connections.forEach((x) => x.write(`event: change\ndata: ${JSON.stringify({
+                            added: [],
+                            removed: event === "remove" ? [fileChangedPath] : [],
+                            updated: event === "update" ? [fileChangedPath] : [],
+                        })}\n\n`));
+                    });
+                firstLoad = false;
+            }
+        });
+    },
+};

package/bin/utils/syncDirs.js

@@ -3,6 +3,7 @@ import path from "path";
 import { copyFile } from "../utils/copy.js";
 import watch from "node-watch";
 import { getPath } from "../utils/getPath.js";
+import coloredString from "./coloredString.js";
 export const syncDirs = (srcDir, outDir, transformers, omit, onStartSync, onEndSync) => {
     watch.default(srcDir, {
         encoding: "utf-8",
@@ -14,6 +15,7 @@ export const syncDirs = (srcDir, outDir, transformers, omit, onStartSync, onEndS
         const fileName = path.basename(fileChangedPath);
         const fileOutDir = fileSrcDir.replace(srcDir, outDir);
         const pathToRemove = getPath(`${fileOutDir}/${fileName}`);
+        console.log(`  ${coloredString(`File ${fileChangedPath} ${event}.`)}`);
         if (event === "remove")
             transformers.forEach((x) => {
                 if (x.fileRegex.test(fileChangedPath)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@michijs/dev-server",
   "license": "MIT",
-  "version": "0.7.17",
+  "version": "0.7.19",
   "repository": {
     "type": "git",
     "url": "https://github.com/michijs/dev-server.git"
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@michijs/tsconfig": "0.0.4",
-    "@types/node": "22.6.0",
+    "@types/node": "22.7.4",
     "@types/yargs": "17.0.33",
     "typescript": "5.6.2"
   },

package/bin/config/plugins/watchPublicFolder.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from "esbuild";
-export declare const watchPublicFolderPlugin: Plugin;

package/bin/config/plugins/watchPublicFolder.js

@@ -1,16 +0,0 @@
-import { config, connections } from "../../config/config.js";
-import { transformers } from "../../actions/start/transformers.js";
-import { syncDirs } from "../../utils/syncDirs.js";
-export const watchPublicFolderPlugin = {
-    name: "michijs-dev-server-watch-public-folder",
-    setup() {
-        if (config.public.path && config.watch)
-            syncDirs(config.public.path, config.esbuildOptions.outdir, transformers, undefined, undefined, (event, fileChangedPath) => {
-                connections.forEach((x) => x.write(`event: change\ndata: ${JSON.stringify({
-                    added: [],
-                    removed: event === "remove" ? [fileChangedPath] : [],
-                    updated: event === "update" ? [fileChangedPath] : [],
-                })}\n\n`));
-            });
-    },
-};