@michijs/dev-server 0.7.18 → 0.7.20

package/bin/config/config.js

@@ -3,7 +3,6 @@ import coloredString from "../utils/coloredString.js";
 import { getPath } from "../utils/getPath.js";
 import { userConfig } from "./userConfig.js";
 import { resolve } from "path";
-import { jsonTransformer } from "../actions/start/transformers.js";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
 import { counterPlugin } from "./plugins/counter.js";
@@ -89,35 +88,6 @@ const config = {
         plugins: [
             ...(userConfig.esbuildOptions?.plugins ?? []),
             publicFolderPlugin,
-            {
-                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);
-                        }
-                    }
-                },
-            },
             counterPlugin,
         ],
         define: {

package/bin/config/plugins/publicFolder.js

@@ -2,21 +2,43 @@ 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
-        if (build.initialOptions.outdir)
-            copy(config.public.path, build.initialOptions.outdir, transformers, [
-                jsAndTsRegex,
-            ]);
+        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 && build.initialOptions.outdir) {
-                copy(config.public.path, build.initialOptions.outdir, transformers, [
-                    notJsAndTsRegex,
-                ]);
+            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({

package/bin/utils/syncDirs.js

@@ -13,16 +13,22 @@ export const syncDirs = (srcDir, outDir, transformers, omit, onStartSync, onEndS
         onStartSync?.();
         const fileSrcDir = path.dirname(fileChangedPath);
         const fileName = path.basename(fileChangedPath);
-        const fileOutDir = fileSrcDir.replace(srcDir, outDir);
-        const pathToRemove = getPath(`${fileOutDir}/${fileName}`);
+        const fileOutDir = fileSrcDir.replace(path.normalize(srcDir), outDir);
         console.log(`  ${coloredString(`File ${fileChangedPath} ${event}.`)}`);
-        if (event === "remove")
-            transformers.forEach((x) => {
-                if (x.fileRegex.test(fileChangedPath)) {
-                    const finalPathToRemove = x.pathTransformer?.(pathToRemove) ?? pathToRemove;
-                    fs.rmSync(finalPathToRemove, { force: true, recursive: true });
-                }
-            });
+        if (event === "remove") {
+            const pathToRemove = getPath(`${fileOutDir}/${fileName}`);
+            const fileTransformer = transformers?.filter((x) => x.fileRegex.test(fileName));
+            if (fileTransformer.length > 0) {
+                fileTransformer.forEach(async (x) => {
+                    if (x.fileRegex.test(fileChangedPath)) {
+                        const finalPathToRemove = x.pathTransformer?.(pathToRemove) ?? pathToRemove;
+                        fs.rmSync(finalPathToRemove, { force: true, recursive: true });
+                    }
+                });
+            }
+            else
+                fs.rmSync(pathToRemove, { force: true, recursive: true });
+        }
         else {
             copyFile(fileSrcDir, fileName, fileOutDir, transformers, omit);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@michijs/dev-server",
   "license": "MIT",
-  "version": "0.7.18",
+  "version": "0.7.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/michijs/dev-server.git"