@nerest/nerest 1.7.3 → 1.8.0

package/build/configs/development.ts

@@ -1,5 +1,6 @@
 import type { InlineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import path from 'path';
 
 import type { BuildArgs } from './shared.js';
 import { viteConfigShared } from './shared.js';
@@ -15,8 +16,11 @@ export async function viteConfigDevelopmentClient(
       manifest: true,
       modulePreload: false,
       watch: {},
-      rollupOptions: {
-        input: '/node_modules/@nerest/nerest/client/index.ts',
+      rolldownOptions: {
+        input: [
+          '/node_modules/@nerest/nerest/client/index.ts',
+          ...args.appDirectories.map((dir) => path.join(dir, 'index.tsx')),
+        ],
         output: {
           dir: 'build/client/assets',
           entryFileNames: `[name].js`,

package/build/configs/production.ts

@@ -1,6 +1,7 @@
 import type { InlineConfig } from 'vite';
 import { viteExternalsPlugin } from 'vite-plugin-externals';
 import react from '@vitejs/plugin-react';
+import path from 'path';
 
 import type { BuildArgs } from './shared.js';
 import { viteConfigShared } from './shared.js';
@@ -15,8 +16,11 @@ export async function viteConfigProductionClient(
       // Manifest is needed to report used assets in SSR handles
       manifest: true,
       modulePreload: false,
-      rollupOptions: {
-        input: '/node_modules/@nerest/nerest/client/index.ts',
+      rolldownOptions: {
+        input: [
+          '/node_modules/@nerest/nerest/client/index.ts',
+          ...args.appDirectories.map((dir) => path.join(dir, 'index.tsx')),
+        ],
         output: {
           dir: 'build/client/assets',
           entryFileNames: `[name].js`,
@@ -47,7 +51,7 @@ export async function viteConfigProductionServer(
       modulePreload: false,
       // This is an important setting for producing a server build
       ssr: true,
-      rollupOptions: {
+      rolldownOptions: {
         input: '/node_modules/@nerest/nerest/server/production.ts',
         output: {
           dir: 'build',

package/build/configs/shared.ts

@@ -8,6 +8,7 @@ export type BuildArgs = {
   base: string;
   buildConfig: BuildConfiguration | undefined;
   project: Project;
+  appDirectories: string[];
 };
 
 export async function viteConfigShared({

package/build/configs/vite-logger.development.ts

@@ -17,8 +17,8 @@ export default logger;
 const ignoredErrors = [
   // Hook files are optional, but in development vite logs an error even though
   // we suppress the exception. Silence these logs manually.
-  ['cannot find entry point module', 'props.ts'],
-  ['cannot find entry point module', 'runtime.ts'],
+  ['Error when evaluating SSR module', 'props.ts'],
+  ['Error when evaluating SSR module', 'runtime.ts'],
 ];
 
 function isIgnoredError(msg: string) {

package/build/excludes/index.ts

@@ -1,5 +1,5 @@
 /**
- * Maps list of imports into a list of rollup aliases that resolve
+ * Maps list of imports into a list of rolldown aliases that resolve
  * into an empty module.
  */
 export function excludes(list: string[] | undefined) {

package/build/index.ts

@@ -5,6 +5,7 @@ import { build } from 'vite';
 
 import { loadBuildConfig } from '../server/loaders/build.js';
 import { loadApps } from '../server/loaders/apps.js';
+import { loadAppDirectories } from '../server/loaders/directories.js';
 import type { Project } from '../server/loaders/project.js';
 import { loadProject } from '../server/loaders/project.js';
 import {
@@ -22,19 +23,23 @@ export async function buildMicroFrontend() {
   // Read project meta info from package.json
   const project = await loadProject(root);
 
+  // Load app directories following the `apps/{name}` convention
+  const appDirectories = await loadAppDirectories(root);
+
   // Build client
   const clientViteConfig = await viteConfigProductionClient({
     root,
     base: staticPath,
     buildConfig,
     project,
+    appDirectories,
   });
   console.log('Producing production client build...');
   await build(clientViteConfig);
 
   // Create nerest-manifest.json that production server reads on startup
   console.log('Producing Nerest manifest file...');
-  await createNerestManifest(root, staticPath, project);
+  await createNerestManifest(root, appDirectories, staticPath, project);
 
   // Build server
   const serverViteConfig = await viteConfigProductionServer({
@@ -42,6 +47,7 @@ export async function buildMicroFrontend() {
     base: staticPath,
     buildConfig,
     project,
+    appDirectories,
   });
   console.log('Producing production server build...');
   await build(serverViteConfig);
@@ -49,10 +55,11 @@ export async function buildMicroFrontend() {
 
 async function createNerestManifest(
   root: string,
+  appDirectories: string[],
   staticPath: string,
   project: Project
 ) {
-  const apps = await loadApps(root, staticPath);
+  const apps = await loadApps(root, appDirectories, staticPath);
   await fs.writeFile(
     path.join(root, 'build/nerest-manifest.json'),
     JSON.stringify({ project, apps }),

package/dist/build/configs/development.js

@@ -1,4 +1,5 @@
 import react from '@vitejs/plugin-react';
+import path from 'path';
 import { viteConfigShared } from './shared.js';
 import logger from './vite-logger.development.js';
 export async function viteConfigDevelopmentClient(args) {
@@ -9,8 +10,11 @@ export async function viteConfigDevelopmentClient(args) {
             manifest: true,
             modulePreload: false,
             watch: {},
-            rollupOptions: {
-                input: '/node_modules/@nerest/nerest/client/index.ts',
+            rolldownOptions: {
+                input: [
+                    '/node_modules/@nerest/nerest/client/index.ts',
+                    ...args.appDirectories.map((dir) => path.join(dir, 'index.tsx')),
+                ],
                 output: {
                     dir: 'build/client/assets',
                     entryFileNames: `[name].js`,

package/dist/build/configs/production.js

@@ -1,5 +1,6 @@
 import { viteExternalsPlugin } from 'vite-plugin-externals';
 import react from '@vitejs/plugin-react';
+import path from 'path';
 import { viteConfigShared } from './shared.js';
 import { excludes } from '../excludes/index.js';
 export async function viteConfigProductionClient(args) {
@@ -9,8 +10,11 @@ export async function viteConfigProductionClient(args) {
             // Manifest is needed to report used assets in SSR handles
             manifest: true,
             modulePreload: false,
-            rollupOptions: {
-                input: '/node_modules/@nerest/nerest/client/index.ts',
+            rolldownOptions: {
+                input: [
+                    '/node_modules/@nerest/nerest/client/index.ts',
+                    ...args.appDirectories.map((dir) => path.join(dir, 'index.tsx')),
+                ],
                 output: {
                     dir: 'build/client/assets',
                     entryFileNames: `[name].js`,
@@ -38,7 +42,7 @@ export async function viteConfigProductionServer(args) {
             modulePreload: false,
             // This is an important setting for producing a server build
             ssr: true,
-            rollupOptions: {
+            rolldownOptions: {
                 input: '/node_modules/@nerest/nerest/server/production.ts',
                 output: {
                     dir: 'build',

package/dist/build/configs/shared.d.ts

@@ -6,5 +6,6 @@ export type BuildArgs = {
     base: string;
     buildConfig: BuildConfiguration | undefined;
     project: Project;
+    appDirectories: string[];
 };
 export declare function viteConfigShared({ root, base, buildConfig, project, }: BuildArgs): Promise<InlineConfig>;

package/dist/build/configs/vite-logger.development.js

@@ -13,8 +13,8 @@ export default logger;
 const ignoredErrors = [
     // Hook files are optional, but in development vite logs an error even though
     // we suppress the exception. Silence these logs manually.
-    ['cannot find entry point module', 'props.ts'],
-    ['cannot find entry point module', 'runtime.ts'],
+    ['Error when evaluating SSR module', 'props.ts'],
+    ['Error when evaluating SSR module', 'runtime.ts'],
 ];
 function isIgnoredError(msg) {
     for (const markers of ignoredErrors) {

package/dist/build/excludes/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Maps list of imports into a list of rollup aliases that resolve
+ * Maps list of imports into a list of rolldown aliases that resolve
  * into an empty module.
  */
 export declare function excludes(list: string[] | undefined): {

package/dist/build/excludes/index.js

@@ -1,5 +1,5 @@
 /**
- * Maps list of imports into a list of rollup aliases that resolve
+ * Maps list of imports into a list of rolldown aliases that resolve
  * into an empty module.
  */
 export function excludes(list) {

package/dist/build/index.js

@@ -3,6 +3,7 @@ import fs from 'fs/promises';
 import { build } from 'vite';
 import { loadBuildConfig } from '../server/loaders/build.js';
 import { loadApps } from '../server/loaders/apps.js';
+import { loadAppDirectories } from '../server/loaders/directories.js';
 import { loadProject } from '../server/loaders/project.js';
 import { viteConfigProductionClient, viteConfigProductionServer, } from './configs/production.js';
 export async function buildMicroFrontend() {
@@ -12,30 +13,34 @@ export async function buildMicroFrontend() {
     const buildConfig = await loadBuildConfig(root);
     // Read project meta info from package.json
     const project = await loadProject(root);
+    // Load app directories following the `apps/{name}` convention
+    const appDirectories = await loadAppDirectories(root);
     // Build client
     const clientViteConfig = await viteConfigProductionClient({
         root,
         base: staticPath,
         buildConfig,
         project,
+        appDirectories,
     });
     console.log('Producing production client build...');
     await build(clientViteConfig);
     // Create nerest-manifest.json that production server reads on startup
     console.log('Producing Nerest manifest file...');
-    await createNerestManifest(root, staticPath, project);
+    await createNerestManifest(root, appDirectories, staticPath, project);
     // Build server
     const serverViteConfig = await viteConfigProductionServer({
         root,
         base: staticPath,
         buildConfig,
         project,
+        appDirectories,
     });
     console.log('Producing production server build...');
     await build(serverViteConfig);
 }
-async function createNerestManifest(root, staticPath, project) {
-    const apps = await loadApps(root, staticPath);
+async function createNerestManifest(root, appDirectories, staticPath, project) {
+    const apps = await loadApps(root, appDirectories, staticPath);
     await fs.writeFile(path.join(root, 'build/nerest-manifest.json'), JSON.stringify({ project, apps }), 'utf-8');
 }
 function prepareStaticPath() {

package/dist/server/development.js

@@ -7,6 +7,7 @@ import { createServer } from './shared.js';
 import { viteConfigDevelopmentClient, viteConfigDevelopmentServer, } from '../build/configs/development.js';
 import { loadBuildConfig } from './loaders/build.js';
 import { loadApps } from './loaders/apps.js';
+import { loadAppDirectories } from './loaders/directories.js';
 import { loadProject } from './loaders/project.js';
 export async function runDevelopmentServer(port) {
     const root = process.cwd();
@@ -20,12 +21,15 @@ export async function runDevelopmentServer(port) {
     const buildConfig = await loadBuildConfig(root);
     // Load project meta details
     const project = await loadProject(root);
+    // Load app directories following the `apps/{name}` convention
+    const appDirectories = await loadAppDirectories(root);
     // Build the clientside assets and watch for changes
     await startClientBuildWatcher(await viteConfigDevelopmentClient({
         root,
         base: staticPath,
         buildConfig,
         project,
+        appDirectories,
     }));
     // Start vite server that will be rendering SSR components
     const viteSsr = await createViteServer(await viteConfigDevelopmentServer({
@@ -33,9 +37,10 @@ export async function runDevelopmentServer(port) {
         base: staticPath,
         buildConfig,
         project,
+        appDirectories,
     }));
     // Load app entries following the `apps/{name}/index.tsx` convention
-    const apps = await loadApps(root, staticPath);
+    const apps = await loadApps(root, appDirectories, staticPath);
     const app = await createServer({
         root,
         project,
@@ -71,7 +76,7 @@ async function startClientBuildWatcher(config) {
     const watcher = (await build(config));
     return new Promise((resolve) => {
         // We need to have a built manifest.json to provide assets
-        // links in SSR. We will wait for rollup to report when it
+        // links in SSR. We will wait for rolldown to report when it
         // has finished the build
         const listener = (ev) => {
             if (ev.code === 'END') {

package/dist/server/loaders/apps.d.ts

@@ -8,6 +8,6 @@ export type AppEntry = {
     examples: Record<string, unknown>;
     schema: JSONSchema | null;
 };
-export declare function loadApps(root: string, deployedStaticPath: string): Promise<{
+export declare function loadApps(root: string, appDirs: string[], deployedStaticPath: string): Promise<{
     [k: string]: AppEntry;
 }>;

package/dist/server/loaders/apps.js

@@ -1,5 +1,4 @@
 import path from 'path';
-import fg from 'fast-glob';
 import { loadAppAssets } from './assets.js';
 import { loadAppExamples } from './examples.js';
 import { loadAppSchema } from './schema.js';
@@ -7,11 +6,8 @@ import { loadViteManifest } from './manifest.js';
 // Build the record of the available apps by convention
 // apps -> /apps/{name}/index.tsx
 // examples -> /apps/{name}/examples/{example}.json
-export async function loadApps(root, deployedStaticPath) {
+export async function loadApps(root, appDirs, deployedStaticPath) {
     const manifest = await loadViteManifest(root);
-    const appBase = path.join(root, 'apps');
-    const appPattern = `${fg.convertPathToPattern(appBase)}/*`;
-    const appDirs = await fg.glob(appPattern, { onlyDirectories: true });
     const apps = [];
     for (const appDir of appDirs) {
         apps.push(await loadApp(appDir, manifest, deployedStaticPath));

package/dist/server/loaders/directories.d.ts

@@ -0,0 +1 @@
+export declare function loadAppDirectories(root: string): Promise<string[]>;

package/dist/server/loaders/directories.js

@@ -0,0 +1,8 @@
+import path from 'path';
+import fg from 'fast-glob';
+// Load app directories following the `apps/{name}` convention
+export async function loadAppDirectories(root) {
+    const appBase = path.join(root, 'apps');
+    const appPattern = `${fg.convertPathToPattern(appBase)}/*`;
+    return fg.glob(appPattern, { onlyDirectories: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerest/nerest",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "React micro frontend framework",
   "homepage": "https://github.com/nerestjs/nerest",
   "repository": {
@@ -49,39 +49,39 @@
     ]
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^15.3.1",
-    "@fastify/middie": "^9.2.0",
-    "@fastify/static": "^9.0.0",
+    "@apidevtools/json-schema-ref-parser": "^15.3.5",
+    "@fastify/middie": "^9.3.1",
+    "@fastify/static": "^9.1.0",
     "@fastify/swagger": "^9.7.0",
     "@fastify/swagger-ui": "^5.2.5",
-    "@vitejs/plugin-react": "^5.1.4",
+    "@vitejs/plugin-react": "^6.0.1",
     "ajv": "^8.18.0",
     "ajv-formats": "^3.0.1",
-    "dotenv": "^17.3.1",
+    "dotenv": "^17.4.1",
     "fast-glob": "^3.3.3",
     "fast-uri": "^3.1.0",
-    "fastify": "^5.7.4",
+    "fastify": "^5.8.4",
     "fastify-graceful-shutdown": "^5.0.0",
     "json-schema-to-typescript": "^15.0.4",
-    "vite": "^7.3.1",
+    "vite": "^8.0.7",
     "vite-plugin-externals": "^0.6.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.4.2",
-    "@commitlint/config-conventional": "^20.4.2",
-    "@playwright/test": "^1.58.2",
-    "@tinkoff/eslint-config": "^5.0.1",
-    "@tinkoff/eslint-config-react": "^5.0.1",
+    "@commitlint/cli": "^20.5.0",
+    "@commitlint/config-conventional": "^20.5.0",
+    "@playwright/test": "^1.59.1",
+    "@tinkoff/eslint-config": "^5.2.0",
+    "@tinkoff/eslint-config-react": "^5.2.0",
     "@tinkoff/prettier-config": "^5.0.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "lint-staged": "^16.3.1",
-    "react": "^19.2.4",
-    "react-dom": "^19.2.4",
+    "lint-staged": "^16.4.0",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
     "simple-git-hooks": "^2.13.1",
     "sort-package-json": "^3.6.1",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.4"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",

package/server/development.ts

@@ -2,7 +2,7 @@
 import path from 'path';
 import { build, createServer as createViteServer } from 'vite';
 import type { InlineConfig } from 'vite';
-import type { RollupWatcher, RollupWatcherEvent } from 'rollup';
+import type { RolldownWatcher, RolldownWatcherEvent } from 'rolldown';
 import fastifyStatic from '@fastify/static';
 import fastifyMiddie from '@fastify/middie';
 import { createServer } from './shared.js';
@@ -12,6 +12,7 @@ import {
 } from '../build/configs/development.js';
 import { loadBuildConfig } from './loaders/build.js';
 import { loadApps } from './loaders/apps.js';
+import { loadAppDirectories } from './loaders/directories.js';
 import { loadProject } from './loaders/project.js';
 
 export async function runDevelopmentServer(port: number) {
@@ -30,6 +31,9 @@ export async function runDevelopmentServer(port: number) {
   // Load project meta details
   const project = await loadProject(root);
 
+  // Load app directories following the `apps/{name}` convention
+  const appDirectories = await loadAppDirectories(root);
+
   // Build the clientside assets and watch for changes
   await startClientBuildWatcher(
     await viteConfigDevelopmentClient({
@@ -37,6 +41,7 @@ export async function runDevelopmentServer(port: number) {
       base: staticPath,
       buildConfig,
       project,
+      appDirectories,
     })
   );
 
@@ -47,11 +52,12 @@ export async function runDevelopmentServer(port: number) {
       base: staticPath,
       buildConfig,
       project,
+      appDirectories,
     })
   );
 
   // Load app entries following the `apps/{name}/index.tsx` convention
-  const apps = await loadApps(root, staticPath);
+  const apps = await loadApps(root, appDirectories, staticPath);
 
   const app = await createServer({
     root,
@@ -97,12 +103,12 @@ export async function runDevelopmentServer(port: number) {
 }
 
 async function startClientBuildWatcher(config: InlineConfig) {
-  const watcher = (await build(config)) as RollupWatcher;
+  const watcher = (await build(config)) as RolldownWatcher;
   return new Promise<void>((resolve) => {
     // We need to have a built manifest.json to provide assets
-    // links in SSR. We will wait for rollup to report when it
+    // links in SSR. We will wait for rolldown to report when it
     // has finished the build
-    const listener = (ev: RollupWatcherEvent) => {
+    const listener = (ev: RolldownWatcherEvent) => {
       if (ev.code === 'END') {
         watcher.off('event', listener);
         resolve();

package/server/loaders/apps.ts

@@ -1,5 +1,4 @@
 import path from 'path';
-import fg from 'fast-glob';
 import type { Manifest as ViteManifest } from 'vite';
 import type { JSONSchema } from '@apidevtools/json-schema-ref-parser';
 
@@ -21,13 +20,13 @@ export type AppEntry = {
 // Build the record of the available apps by convention
 // apps -> /apps/{name}/index.tsx
 // examples -> /apps/{name}/examples/{example}.json
-export async function loadApps(root: string, deployedStaticPath: string) {
+export async function loadApps(
+  root: string,
+  appDirs: string[],
+  deployedStaticPath: string
+) {
   const manifest = await loadViteManifest(root);
 
-  const appBase = path.join(root, 'apps');
-  const appPattern = `${fg.convertPathToPattern(appBase)}/*`;
-  const appDirs = await fg.glob(appPattern, { onlyDirectories: true });
-
   const apps: Array<[name: string, entry: AppEntry]> = [];
   for (const appDir of appDirs) {
     apps.push(await loadApp(appDir, manifest, deployedStaticPath));

package/server/loaders/directories.ts

@@ -0,0 +1,9 @@
+import path from 'path';
+import fg from 'fast-glob';
+
+// Load app directories following the `apps/{name}` convention
+export async function loadAppDirectories(root: string) {
+  const appBase = path.join(root, 'apps');
+  const appPattern = `${fg.convertPathToPattern(appBase)}/*`;
+  return fg.glob(appPattern, { onlyDirectories: true });
+}