@michijs/dev-server 0.8.2 → 0.8.3

package/bin/actions/start/transformers.d.ts

@@ -1,6 +1,5 @@
 import type { Transformer } from "../../utils/copy.js";
 export declare const jsAndTsRegex: RegExp;
-export declare const notJsAndTsRegex: RegExp;
 export declare const jsonTransformer: {
     fileRegex: RegExp;
     transformer: (fileContent: string) => string;

package/bin/actions/start/transformers.js

@@ -3,7 +3,6 @@ import { minifyXMLLike } from "../../utils/minify.js";
 import { workerTransformer } from "../../utils/workerTransformer.js";
 import { transformSync as esbuild } from "esbuild";
 export const jsAndTsRegex = /.*\.(?:ts|js)/;
-export const notJsAndTsRegex = /.*\.(?!ts|js)/;
 export const jsonTransformer = {
     fileRegex: /.*\.(?:json)/,
     transformer: (fileContent) => config.public.minify

package/bin/config/plugins/publicFolder.js

@@ -1,5 +1,5 @@
 import { config, connections } from "../config.js";
-import { jsAndTsRegex, notJsAndTsRegex, transformers, } from "../../actions/start/transformers.js";
+import { transformers } from "../../actions/start/transformers.js";
 import { syncDirs } from "../../utils/syncDirs.js";
 import { copy } from "../../utils/copy.js";
 import fs from "fs";
@@ -34,13 +34,11 @@ export const publicFolderPlugin = {
                 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]);
+        copy(config.public.path, outdir, transformers);
         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]);
+                copy(config.public.path, outdir, transformers);
                 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/copy.js

@@ -2,30 +2,25 @@ import fs from "fs";
 import { getPath } from "./getPath.js";
 export function copyFile(src, fileName, dest, transformers, omit) {
     const srcPath = getPath(`${src}/${fileName}`);
-    if (!omit?.find((x) => x.test(srcPath))) {
-        const destPath = getPath(`${dest}/${fileName}`);
-        if (fs.lstatSync(srcPath).isDirectory()) {
-            copy(srcPath, destPath, transformers, omit);
+    const destPath = getPath(`${dest}/${fileName}`);
+    if (fs.lstatSync(srcPath).isDirectory())
+        return copy(srcPath, destPath, transformers, omit);
+    if (omit?.find((x) => x.test(srcPath)))
+        return;
+    const fileTransformer = transformers?.filter((x) => x.fileRegex.test(fileName));
+    if (fileTransformer.length === 0)
+        return fs.copyFileSync(srcPath, destPath, fs.constants.COPYFILE_FICLONE);
+    fileTransformer.forEach(async (x) => {
+        const srcFileContent = fs.readFileSync(srcPath, {
+            encoding: "utf-8",
+        });
+        const finalDestPath = x.pathTransformer?.(destPath) ?? destPath;
+        try {
+            const transformedFile = x.transformer(srcFileContent, srcPath);
+            fs.writeFileSync(finalDestPath, transformedFile);
         }
-        else {
-            const fileTransformer = transformers?.filter((x) => x.fileRegex.test(fileName));
-            if (fileTransformer.length > 0) {
-                fileTransformer.forEach(async (x) => {
-                    const srcFileContent = fs.readFileSync(srcPath, {
-                        encoding: "utf-8",
-                    });
-                    const finalDestPath = x.pathTransformer?.(destPath) ?? destPath;
-                    try {
-                        const transformedFile = x.transformer(srcFileContent, srcPath);
-                        fs.writeFileSync(finalDestPath, transformedFile);
-                    }
-                    catch { }
-                });
-            }
-            else
-                fs.copyFileSync(srcPath, destPath, fs.constants.COPYFILE_FICLONE);
-        }
-    }
+        catch { }
+    });
 }
 export function copy(src, dest, transformers, omit) {
     const srcDir = fs.readdirSync(src);

package/package.json

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