@michijs/dev-server 0.7.9 → 0.7.11

package/bin/actions/generateAssets.js

@@ -141,11 +141,11 @@ export async function generateAssets(callback, src) {
         ...assetsSizes.webp.flatMap((x) => [image, flattenImage].map((y) => y
             .resize(x, x)
             .webp()
-            .toFile(getPath(`${generatedPath}/${fileNameWithoutExtension}-${x}${y === flattenImage ? "-masked" : ""}.webp`)))),
+            .toFile(getPath(`${generatedPath}/${fileNameWithoutExtension}-${x}${y === flattenImage ? "-maskable" : ""}.webp`)))),
         ...assetsSizes.png.flatMap((x) => [image, flattenImage].map((y) => y
             .resize(x, x)
             .png()
-            .toFile(getPath(`${generatedPath}/${fileNameWithoutExtension}-${x}${y === flattenImage ? "-masked" : ""}.png`)))),
+            .toFile(getPath(`${generatedPath}/${fileNameWithoutExtension}-${x}${y === flattenImage ? "-maskable" : ""}.png`)))),
         generateFavicon(src, getPath(`${config.public.path}/favicon.ico`)),
         generateFeatureImage(src),
         generateScreenshots(),

package/bin/actions/minifyAsset.js

@@ -1,14 +1,27 @@
 import { getPath } from "../utils/getPath.js";
-import fs from "fs";
+import { readdirSync, rmSync, statSync } from "fs";
 import { basename, dirname } from "path";
+async function minifyImage(src) {
+    if (!src.endsWith("webp")) {
+        const { default: sharp } = await import("sharp");
+        const image = sharp(src);
+        const fileNameWithoutExtension = basename(src).split(".")[0];
+        const newDirname = dirname(src);
+        await image
+            .webp()
+            .toFile(getPath(`${newDirname}/${fileNameWithoutExtension}.webp`));
+        rmSync(src);
+    }
+}
 export async function minifyAsset(callback, src) {
-    const { default: sharp } = await import("sharp");
-    const image = sharp(src);
-    const fileNameWithoutExtension = basename(src).split(".")[0];
-    const newDirname = dirname(src);
-    await image
-        .webp()
-        .toFile(getPath(`${newDirname}${fileNameWithoutExtension}.webp`));
-    fs.rmdirSync(src);
+    const stat = await statSync(src);
+    if (stat.isDirectory()) {
+        await Promise.all(readdirSync(src).map(async (x) => {
+            await minifyImage(getPath(`${src}/${x}`));
+        }));
+    }
+    else {
+        await minifyImage(src);
+    }
     callback();
 }

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

@@ -5,4 +5,8 @@ export declare const jsonTransformer: {
     fileRegex: RegExp;
     transformer: (fileContent: string) => string;
 };
+export declare const cssTransformer: {
+    fileRegex: RegExp;
+    transformer: (fileContent: string) => string;
+};
 export declare const transformers: Transformer[];

package/bin/actions/start/transformers.js

@@ -1,6 +1,7 @@
 import { config } from "../../config/config.js";
 import { minifyXMLLike } from "../../utils/minify.js";
 import { serviceWorkerTransformer } from "../../utils/serviceWorkerTransformer.js";
+import { transformSync as esbuild } from "esbuild";
 export const jsAndTsRegex = /.*\.(?:ts|js)/;
 export const notJsAndTsRegex = /.*\.(?!ts|js)/;
 export const jsonTransformer = {
@@ -9,6 +10,13 @@ export const jsonTransformer = {
         ? JSON.stringify(JSON.parse(fileContent))
         : fileContent,
 };
+export const cssTransformer = {
+    fileRegex: /.*\.(?:css)/,
+    transformer: (fileContent) => esbuild(fileContent, {
+        loader: "css",
+        minify: config.public.minify,
+    }).code,
+};
 export const transformers = [
     jsonTransformer,
     {
@@ -20,4 +28,5 @@ export const transformers = [
         transformer: serviceWorkerTransformer,
         pathTransformer: (destPath) => destPath.replace(".ts", ".js"),
     },
+    cssTransformer,
 ];

package/bin/config/config.js

@@ -40,7 +40,7 @@ const config = {
     public: {
         path: "public",
         indexName: "index.html",
-        minify: minify,
+        minify,
         ...(userConfig.public ?? {}),
         assets: {
             path: "assets",

package/bin/utils/syncDirs.js

@@ -13,14 +13,17 @@ export const syncDirs = (srcDir, outDir, transformers, omit, onStartSync, onEndS
         const fileSrcDir = path.dirname(fileChangedPath);
         const fileName = path.basename(fileChangedPath);
         const fileOutDir = fileSrcDir.replace(srcDir, outDir);
+        const pathToRemove = getPath(`${fileOutDir}/${fileName}`);
         if (event === "remove")
             transformers.forEach((x) => {
                 if (x.fileRegex.test(fileChangedPath)) {
-                    fs.rmSync(getPath(`${fileOutDir}/${x.pathTransformer?.(fileName) ?? fileName}`), { force: true, recursive: true });
+                    const finalPathToRemove = x.pathTransformer?.(pathToRemove) ?? pathToRemove;
+                    fs.rmSync(finalPathToRemove, { force: true, recursive: true });
                 }
             });
-        else
+        else {
             copyFile(fileSrcDir, fileName, fileOutDir, transformers, omit);
+        }
         onEndSync?.(event, fileChangedPath);
     });
 };

package/package.json

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