@serenity-is/tsbuild 8.8.6 → 8.8.8

package/dist/index.d.ts

@@ -58,4 +58,5 @@ export interface TSBuildOptions {
 export const esbuildOptions: (opt: TSBuildOptions) => any;
 export const build: (opt: TSBuildOptions) => Promise<void>;
 export function importAsGlobalsPlugin(mapping: Record<string, string>): any;
-export function cleanPlugin(): any;
+export function cleanPlugin(): any;
+export function npmCopy(paths: string[], outdir?: string): void;

package/dist/index.js

@@ -3,7 +3,7 @@ import { existsSync, readdirSync, statSync, mkdirSync, writeFileSync, rmSync, re
 import { dirname, join, relative, resolve } from "path";
 import { globSync } from "glob";
 
-export const defaultEntryPointGlobs = ['Modules/**/*Page.ts', 'Modules/**/*Page.tsx', 'Modules/**/ScriptInit.ts'];
+export const defaultEntryPointGlobs = ['Modules/**/*Page.ts', 'Modules/**/*Page.tsx', 'Modules/**/ScriptInit.ts', 'Modules/**/*.mts'];
 
 export const importAsGlobalsMapping = {
     "@serenity-is/base": "Serenity",
@@ -39,8 +39,11 @@ export const esbuildOptions = (opt) => {
             var json = readFileSync('sergen.json', 'utf8').trim();
             var cfg = JSON.parse(json || {});
             globs = cfg?.TSBuild?.EntryPoints;
+            if (globs != null && globs[0] === '+') {
+                globs = [...defaultEntryPointGlobs, ...globs.slice(1)];
+            }
             if (globs === void 0 &&
-                cfg.Extends &&
+                typeof cfg.Extends == "string" &&
                 existsSync(cfg.Extends)) {
                 json = readFileSync(cfg.Extends, 'utf8').trim();
                 cfg = JSON.parse(json || {});
@@ -79,7 +82,7 @@ export const esbuildOptions = (opt) => {
                     .forEach(p => entryPoints.push(root + '/' + p)));
         }
     }
-
+   
     var splitting = opt.splitting;
     if (splitting === undefined)
         splitting = !process.argv.slice(2).some(x => x == "--nosplit");
@@ -124,6 +127,21 @@ export const esbuildOptions = (opt) => {
 }
 
 export const build = async (opt) => {
+    if (opt?.npmCopy !== false &&
+        existsSync('appsettings.bundles.json')) {
+        const bundlesJson = readFileSync('appsettings.bundles.json', 'utf8').trim();
+        const bundlesCfg = JSON.parse(bundlesJson || {});
+        const bundles = Object.values(bundlesCfg?.CssBundling?.Bundles || {}).concat(Object.values(bundlesCfg?.ScriptBundling?.Bundles || {}));
+        let paths = [];
+        Object.values(bundles).filter(x => x?.length).forEach(bundle => {
+            paths.push(...bundle.filter(f => f?.startsWith('~/npm/')).map(f => f.substring(5)));
+        });
+        paths = paths.filter((v, i, a) => a.indexOf(v) === i); // unique
+        if (paths.length) {
+            npmCopy(paths);
+        }   
+    }
+
     opt = esbuildOptions(opt);
 
     if (opt.watch) {
@@ -225,4 +243,43 @@ export function writeIfChanged() {
             });
         }
     };
+}
+
+export function npmCopy(paths) {
+    paths.forEach(path => {
+        const srcFile = join("node_modules", path);
+        const dstfile = join("wwwroot/npm", path);
+        if (!existsSync(srcFile)) {
+            console.warn(`Source file not found: ${srcFile}`);
+            return;
+        }
+
+        (function() {
+            const srcContent = readFileSync(srcFile);
+            if (existsSync(dstfile)) {
+                if (readFileSync(dstfile).equals(srcContent))
+                    return;
+            }
+            else {
+                mkdirSync(dirname(dstfile), { recursive: true });
+            }
+            console.log(`Copying ${srcFile} to ${dstfile}`);
+            writeFileSync(dstfile, srcContent);
+        })();
+
+        const js = path.endsWith(".js");
+        if ((js && !path.endsWith(".min.js")) ||
+            (path.endsWith(".css") && !path.endsWith(".min.css"))) {
+            const ext = js ? ".min.js" : ".min.css";
+            const srcMinFile = srcFile.substring(0, srcFile.length - (js ? 3 : 4)) + ext;
+            const dstMinFile = dstfile.substring(0, dstfile.length - (js ? 3 : 4)) + ext;
+            if (existsSync(srcMinFile)) {
+                const srcMinContent = readFileSync(srcMinFile);
+                if (existsSync(dstMinFile) && readFileSync(dstMinFile).equals(srcMinContent))
+                    return;
+                console.log(`Copying ${srcMinFile} to ${dstMinFile}`);
+                writeFileSync(dstMinFile, srcMinContent);
+            }
+        }
+    });
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@serenity-is/tsbuild",
-  "version": "8.8.6",
+  "version": "8.8.8",
   "author": "Serenity (https://serenity.is)",
   "bugs": "https://github.com/serenity-is/serenity/issues",
   "description": "Serenity ESBuild functions",
   "dependencies": {
-    "esbuild": "0.25.5",
-    "glob": "11.0.0"
+    "esbuild": "0.25.9",
+    "glob": "11.0.3"
   },
   "exports": {
     ".": {