proteum 2.1.9 → 2.2.0

package/cli/compiler/artifacts/manifest.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import app from '../../app';
 import cli from '../..';
 import { inspectProteumEnv } from '../../../common/env/proteumEnv';
-import { reservedRouteSetupKeys, routeSetupOptionKeys } from '../../../common/router/pageSetup';
+import { reservedRouteOptionKeys, routeOptionKeys } from '../../../common/router/pageData';
 import { getProjectInstructionGitignoreEntries } from '../../utils/agents';
 import {
     TProteumManifest,
@@ -303,7 +303,7 @@ export const writeCurrentProteumManifest = ({
         });
 
     const manifest: TProteumManifest = {
-        version: 9,
+        version: 10,
         app: {
             root: normalizeAbsolutePath(app.paths.root),
             coreRoot: normalizeAbsolutePath(cli.paths.core.root),
@@ -338,8 +338,8 @@ export const writeCurrentProteumManifest = ({
             },
         },
         conventions: {
-            routeSetupOptionKeys: [...routeSetupOptionKeys],
-            reservedRouteSetupKeys: [...reservedRouteSetupKeys],
+            routeOptionKeys: [...routeOptionKeys],
+            reservedRouteOptionKeys: [...reservedRouteOptionKeys],
         },
         env: {
             source: 'process.env',

package/cli/compiler/artifacts/routing.ts

@@ -59,7 +59,7 @@ const buildClientRouteManifestEntry = (filepath: string): TProteumManifestRoute
         invalidOptionKeys: definition.invalidOptionKeys,
         reservedOptionKeys: definition.reservedOptionKeys,
         optionsRaw: definition.optionsRaw,
-        hasSetup: definition.hasSetup,
+        hasData: definition.hasData,
         chunkId: pageChunk.chunkId,
         chunkFilepath: normalizePath(pageChunk.filepath),
         scope: 'app',
@@ -83,7 +83,7 @@ const buildServerRouteManifestEntries = (filepath: string) =>
         invalidOptionKeys: definition.invalidOptionKeys,
         reservedOptionKeys: definition.reservedOptionKeys,
         optionsRaw: definition.optionsRaw,
-        hasSetup: definition.hasSetup,
+        hasData: definition.hasData,
         scope: 'app',
     }));
 

package/cli/compiler/artifacts/services.ts

@@ -791,15 +791,24 @@ import type ${appClassIdentifier}Client from '@/client/index';
 export type ClientContext = ${appClassIdentifier}Client["Router"]["context"];
 
 type GlobalClientContextStore = typeof globalThis & {
-    __proteumClientContexts?: Record<string, React.Context<ClientContext>>;
+    __proteumClientContexts?: Record<string, React.Context<ClientContext | undefined>>;
 };
 
 const globalClientContextStore = globalThis as GlobalClientContextStore;
 const clientContexts = (globalClientContextStore.__proteumClientContexts ??= {});
 
 export const ReactClientContext =
-    clientContexts['${appClassIdentifier}'] ?? (clientContexts['${appClassIdentifier}'] = React.createContext<ClientContext>({} as ClientContext));
-export default (): ClientContext => React.useContext<ClientContext>(ReactClientContext);`,
+    clientContexts['${appClassIdentifier}'] ?? (clientContexts['${appClassIdentifier}'] = React.createContext<ClientContext | undefined>(undefined));
+export default (): ClientContext => {
+    const context = React.useContext<ClientContext | undefined>(ReactClientContext);
+    if (context) return context;
+
+    throw new Error(
+        'Proteum router context hook was called outside the App provider. This is a framework contract failure. ' +
+            'Likely fix: move the hook back under Router.page render ownership or pass the required values explicitly. ' +
+            'Re-check both SSR and client navigation after the fix.',
+    );
+};`,
     );
 
     writeIfChanged(

package/cli/compiler/client/index.ts

@@ -21,23 +21,40 @@ import type { App } from '../../app';
 
 const debug = false;
 const ssrScriptPattern = /\.ssr\.(ts|tsx)$/;
-const normalizedCoreRoot = cli.paths.framework.activeRoot.replace(/\\/g, '/');
-const hmrClientEntry = path.join(cli.paths.core.root, 'client', 'dev', 'hmr.ts');
-
 const normalizeModulePath = (value?: string) => (value || '').replace(/\\/g, '/');
-const resolveFromAppOrCore = (_app: App, request: string) => cli.paths.resolveRequest(request);
-const rewriteFrameworkAliasTargets = (app: App, aliases: Record<string, string | string[]>) => {
+const getFrameworkSourceRoot = () => {
     const installedCoreRoot = cli.paths.framework.installedRoot
         ? normalizeModulePath(cli.paths.framework.installedRoot)
         : undefined;
     const activeCoreRoot = normalizeModulePath(cli.paths.framework.activeRoot);
 
-    if (!installedCoreRoot || installedCoreRoot === activeCoreRoot) return aliases;
+    if (installedCoreRoot && activeCoreRoot.includes('/node_modules/')) {
+        return installedCoreRoot;
+    }
+
+    return activeCoreRoot;
+};
+
+const resolveFromAppOrCore = (_app: App, request: string) => cli.paths.resolveRequest(request);
+const rewriteFrameworkAliasTargets = (aliases: Record<string, string | string[]>) => {
+    const visibleFrameworkRoots = [
+        ...cli.paths.getVisiblePackageInstallRoots('proteum'),
+        cli.paths.framework.installedRoot,
+        cli.paths.framework.activeRoot,
+    ]
+        .filter((rootPath): rootPath is string => typeof rootPath === 'string' && rootPath !== '')
+        .map((rootPath) => normalizeModulePath(rootPath))
+        .filter((rootPath, index, list) => list.indexOf(rootPath) === index);
+    const frameworkSourceRoot = getFrameworkSourceRoot();
 
     const rewriteCandidate = (candidate: string) =>
-        normalizeModulePath(candidate).startsWith(installedCoreRoot + '/')
-            ? activeCoreRoot + normalizeModulePath(candidate).substring(installedCoreRoot.length)
-            : candidate;
+        visibleFrameworkRoots.reduce((nextCandidate, rootPath) => {
+                const normalizedCandidate = normalizeModulePath(nextCandidate);
+
+                return normalizedCandidate.startsWith(rootPath + '/')
+                    ? frameworkSourceRoot + normalizedCandidate.substring(rootPath.length)
+                    : nextCandidate;
+            }, candidate);
 
     return Object.fromEntries(
         Object.entries(aliases).map(([alias, value]) => [
@@ -62,8 +79,29 @@ const isExternalVendorModule = (module: Module) => {
 
 const isCoreSourceModule = (module: Module) => {
     const modulePath = getModulePath(module);
+    const frameworkSourceRoot = getFrameworkSourceRoot();
+
+    return modulePath.startsWith(frameworkSourceRoot + '/') || modulePath.includes('/node_modules/proteum/');
+};
+const resolveLightningCssTargets = (app: App) => {
+    const browserslistConfig = app.packageJson.browserslist;
+
+    if (typeof browserslistConfig === 'string') return browserslistConfig;
+
+    if (Array.isArray(browserslistConfig) && browserslistConfig.every((target) => typeof target === 'string'))
+        return browserslistConfig;
+
+    if (!browserslistConfig || typeof browserslistConfig !== 'object') return undefined;
 
-    return modulePath.startsWith(normalizedCoreRoot + '/') || modulePath.includes('/node_modules/proteum/');
+    for (const env of ['production', 'defaults']) {
+        const targets = browserslistConfig[env];
+
+        if (typeof targets === 'string') return targets;
+
+        if (Array.isArray(targets) && targets.every((target) => typeof target === 'string')) return targets;
+    }
+
+    return undefined;
 };
 
 /*----------------------------------
@@ -77,8 +115,13 @@ export default function createCompiler(
     logVerbose(`Creating compiler for client (${mode}).`);
     const dev = mode === 'dev';
     const outputPath = app.outputPath(outputTarget);
-    const frameworkRoots = cli.paths.getFrameworkRoots();
+    const frameworkSourceRoot = getFrameworkSourceRoot();
+    const frameworkRoots = [frameworkSourceRoot, ...cli.paths.getFrameworkRoots()].filter(
+        (rootPath, index, list) => list.indexOf(rootPath) === index,
+    );
     const transpileModuleDirectories = app.transpileModuleDirectories;
+    const lightningCssTargets = resolveLightningCssTargets(app);
+    const hmrClientEntry = path.join(frameworkSourceRoot, 'client', 'dev', 'hmr.ts');
 
     const commonConfig = createCommonConfig(app, 'client', mode, outputTarget);
 
@@ -94,13 +137,14 @@ export default function createCompiler(
 
     // Convert tsconfig paths into bundler aliases.
     const { aliases } = app.aliases.client.forWebpack({ modulesPath: cli.paths.framework.appNodeModulesRoot });
-    const resolvedAliases = rewriteFrameworkAliasTargets(app, aliases);
+    const resolvedAliases = rewriteFrameworkAliasTargets(aliases);
 
     // We're not supposed in any case to import server libs from client
     delete resolvedAliases['@server'];
     delete resolvedAliases['@/server'];
     const rspackAliases = toRspackAliases(resolvedAliases);
-    rspackAliases['@/client/router$'] = cli.paths.core.root + '/client/router.ts';
+    rspackAliases['proteum'] = frameworkSourceRoot;
+    rspackAliases['@/client/router$'] = frameworkSourceRoot + '/client/router.ts';
     rspackAliases['preact/jsx-runtime$'] = resolveFromAppOrCore(app, 'preact/jsx-runtime');
     rspackAliases['react/jsx-runtime$'] = resolveFromAppOrCore(app, 'preact/jsx-runtime');
     rspackAliases['react/jsx-dev-runtime$'] = resolveFromAppOrCore(app, 'preact/jsx-dev-runtime');
@@ -113,8 +157,8 @@ export default function createCompiler(
         target: 'web',
         entry: {
             client: dev
-                ? [hmrClientEntry, cli.paths.core.root + '/client/index.ts']
-                : [cli.paths.core.root + '/client/index.ts'],
+                ? [hmrClientEntry, frameworkSourceRoot + '/client/index.ts']
+                : [frameworkSourceRoot + '/client/index.ts'],
         },
 
         output: {
@@ -168,7 +212,7 @@ export default function createCompiler(
                         ...transpileModuleDirectories,
                     ],
                     loader: path.join(
-                        cli.paths.core.root,
+                        frameworkSourceRoot,
                         'cli',
                         'compiler',
                         'common',
@@ -229,11 +273,11 @@ export default function createCompiler(
                 : [
                       new rspack.NormalModuleReplacementPlugin(
                           /^@client\/dev\/profiler$/,
-                          cli.paths.core.root + '/client/dev/profiler/noop.tsx',
+                          frameworkSourceRoot + '/client/dev/profiler/noop.tsx',
                       ),
                       new rspack.NormalModuleReplacementPlugin(
                           /^@client\/dev\/profiler\/runtime$/,
-                          cli.paths.core.root + '/client/dev/profiler/runtime.noop.ts',
+                          frameworkSourceRoot + '/client/dev/profiler/runtime.noop.ts',
                       ),
                   ]),
 
@@ -297,7 +341,9 @@ export default function createCompiler(
                       removeAvailableModules: true,
                       minimizer: [
                           new rspack.SwcJsMinimizerRspackPlugin({}),
-                          new rspack.LightningCssMinimizerRspackPlugin({}),
+                          new rspack.LightningCssMinimizerRspackPlugin({
+                              ...(lightningCssTargets ? { minimizerOptions: { targets: lightningCssTargets } } : {}),
+                          }),
                       ],
                       nodeEnv: 'production',
                       sideEffects: true,

package/cli/compiler/common/files/style.ts

@@ -2,7 +2,7 @@ import path from 'path';
 
 // Plugons
 import { rspack } from '@rspack/core';
-import type { Root } from 'postcss';
+import type { Declaration, Root } from 'postcss';
 
 import type { App } from '../../../app';
 
@@ -11,6 +11,17 @@ const normalizePath = (value: string) => path.resolve(value).replace(/\\/g, '/')
 const isPathInsideDirectory = (filepath: string, directory: string) =>
     filepath === directory || filepath.startsWith(directory + '/');
 
+const VENDOR_PROPERTY_PREFIXES = ['-webkit-', '-moz-', '-ms-', '-o-'] as const;
+const getVendorlessProperty = (property: string) => {
+    for (const prefix of VENDOR_PROPERTY_PREFIXES) {
+        if (property.startsWith(prefix)) return property.slice(prefix.length);
+    }
+
+    return property;
+};
+const isVendorPrefixedProperty = (property: string) =>
+    VENDOR_PROPERTY_PREFIXES.some((prefix) => property.startsWith(prefix));
+
 const createTailwindTranspileSourcesPlugin = (app: App) => {
     const appRoot = normalizePath(app.paths.root);
     const transpileSourceDirectories = Array.from(
@@ -50,9 +61,42 @@ const createTailwindTranspileSourcesPlugin = (app: App) => {
     };
 };
 
+const createVendorPropertyOrderPlugin = () => {
+    return {
+        postcssPlugin: 'proteum-normalize-vendor-property-order',
+        Once(root: Root) {
+            root.walkRules((rule) => {
+                const declarations = (rule.nodes || []).filter((node): node is Declaration => node.type === 'decl');
+
+                for (const declaration of declarations) {
+                    if (isVendorPrefixedProperty(declaration.prop)) continue;
+
+                    const property = declaration.prop;
+                    let nextNode = declaration.next();
+
+                    // LightningCSS canonicalizes property aliases based on source order.
+                    // Keep prefixed declarations before the standard property so target-aware
+                    // minification preserves the right output for both old and modern browsers.
+                    while (nextNode && nextNode.type === 'decl' && getVendorlessProperty(nextNode.prop) === property) {
+                        const currentNextNode = nextNode;
+                        nextNode = currentNextNode.next();
+
+                        if (!isVendorPrefixedProperty(currentNextNode.prop)) continue;
+
+                        const reorderedDeclaration = currentNextNode.clone();
+                        currentNextNode.remove();
+                        rule.insertBefore(declaration, reorderedDeclaration);
+                    }
+                }
+            });
+        },
+    };
+};
+
 module.exports = (app: App, dev: boolean, _client: boolean) => {
     const enableSourceMaps = dev;
     const tailwindTranspileSourcesPlugin = createTailwindTranspileSourcesPlugin(app);
+    const vendorPropertyOrderPlugin = createVendorPropertyOrderPlugin();
 
     return [
         // Keep CSS delivery identical in dev and prod: extract files so SSR links stylesheets in both modes.
@@ -86,9 +130,10 @@ module.exports = (app: App, dev: boolean, _client: boolean) => {
                             // process is launched from another working directory (e.g. Docker).
                             base: app.paths.root,
 
-                            // Avoid double-minifying: Webpack already runs CssMinimizerPlugin in prod.
+                            // Avoid double-minifying: Rspack already runs LightningCssMinimizerRspackPlugin in prod.
                             optimize: false,
                         }),
+                        vendorPropertyOrderPlugin,
                         ///* Tailwind V3 */require('tailwindcss'),
                         require('autoprefixer'),
                     ],

package/cli/compiler/common/generatedRouteModules.ts

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import ts from 'typescript';
 
-import { getRouteSetupOptionKey } from '../../../common/router/pageSetup';
+import { getRouteOptionKey } from '../../../common/router/pageData';
 import writeIfChanged from '../writeIfChanged';
 
 type TRouteSide = 'client' | 'server';
@@ -33,7 +33,7 @@ export type TIndexedRouteDefinition = {
     invalidOptionKeys: string[];
     reservedOptionKeys: string[];
     optionsRaw?: string;
-    hasSetup: boolean;
+    hasData: boolean;
 };
 
 type TGeneratedClientRouteModuleOptions = { chunkId: string };
@@ -206,7 +206,7 @@ const getRouteOptionMetadata = (node: ts.ObjectLiteralExpression | undefined) =>
 
     for (const optionKey of optionKeys) {
         try {
-            const normalizedOptionKey = getRouteSetupOptionKey(optionKey);
+            const normalizedOptionKey = getRouteOptionKey(optionKey);
 
             if (normalizedOptionKey) {
                 normalizedOptionKeys.push(normalizedOptionKey);
@@ -438,29 +438,33 @@ const buildDestructuring = (importedServices: TImportedService[]) => {
 const getClientRouteSignature = (sourceFile: ts.SourceFile, definition: TRouteDefinition) => {
     const [, ...routeArgs] = [...definition.args];
 
-    if (routeArgs.length === 1) {
-        return { hasSetup: false, renderArg: routeArgs[0] };
-    }
-
-    if (routeArgs.length === 2) {
-        if (ts.isObjectLiteralExpression(routeArgs[0])) {
-            return { hasSetup: false, optionsArg: routeArgs[0], renderArg: routeArgs[1] };
+    if (definition.methodName === 'error') {
+        if (routeArgs.length === 2) {
+            return {
+                hasData: false,
+                optionsExpression: routeArgs[0],
+                optionsArg: ts.isObjectLiteralExpression(routeArgs[0]) ? routeArgs[0] : undefined,
+                renderArg: routeArgs[1],
+            };
         }
 
-        return { hasSetup: true, setupArg: routeArgs[0], renderArg: routeArgs[1] };
+        throw new Error(
+            `Unsupported client error route signature in ${sourceFile.fileName}. Expected Router.error(code, options, render).`,
+        );
     }
 
-    if (routeArgs.length === 3 && ts.isObjectLiteralExpression(routeArgs[0])) {
+    if (routeArgs.length === 3) {
         return {
-            hasSetup: true,
-            optionsArg: routeArgs[0],
-            setupArg: routeArgs[1],
+            hasData: routeArgs[1].kind !== ts.SyntaxKind.NullKeyword,
+            optionsExpression: routeArgs[0],
+            optionsArg: ts.isObjectLiteralExpression(routeArgs[0]) ? routeArgs[0] : undefined,
+            dataArg: routeArgs[1],
             renderArg: routeArgs[2],
         };
     }
 
     throw new Error(
-        `Unsupported client route signature in ${sourceFile.fileName}. Expected Router.page/error with 2-4 arguments.`,
+        `Unsupported client page route signature in ${sourceFile.fileName}. Expected Router.page(path, options, data, render).`,
     );
 };
 
@@ -469,30 +473,23 @@ const buildClientRegisterArgs = (
     definition: TRouteDefinition,
     clientRoute: TGeneratedClientRouteModuleOptions,
 ) => {
-    const { optionsArg, setupArg, renderArg } = getClientRouteSignature(sourceFile, definition);
+    const { optionsExpression, renderArg } = getClientRouteSignature(sourceFile, definition);
     const sourceLocation = getNodeLocation(sourceFile, definition.callExpression);
     const injectedOptions = buildInjectedRouteMetadata(sourceFile.fileName, sourceLocation, [
         `id: ${JSON.stringify(clientRoute.chunkId)}`,
     ]);
 
-    if (!optionsArg && !setupArg) {
-        return [injectedOptions, getNodeText(sourceFile, renderArg)];
-    }
-
-    if (optionsArg && !setupArg) {
+    if (definition.methodName === 'error') {
         return [
-            `{ ...(${getNodeText(sourceFile, optionsArg)}), ...${injectedOptions} }`,
+            `{ ...(${getNodeText(sourceFile, optionsExpression)}), ...${injectedOptions} }`,
             getNodeText(sourceFile, renderArg),
         ];
     }
 
-    if (!optionsArg && setupArg) {
-        return [injectedOptions, getNodeText(sourceFile, setupArg), getNodeText(sourceFile, renderArg)];
-    }
-
+    const { dataArg } = getClientRouteSignature(sourceFile, definition);
     return [
-        `{ ...(${getNodeText(sourceFile, optionsArg!)}), ...${injectedOptions} }`,
-        getNodeText(sourceFile, setupArg!),
+        `{ ...(${getNodeText(sourceFile, optionsExpression)}), ...${injectedOptions} }`,
+        getNodeText(sourceFile, dataArg!),
         getNodeText(sourceFile, renderArg),
     ];
 };
@@ -604,10 +601,8 @@ export const indexRouteDefinitions = ({ side, sourceFilepath }: { side: TRouteSi
                       normalizedOptionKeys: optionMetadata.normalizedOptionKeys,
                       invalidOptionKeys: optionMetadata.invalidOptionKeys,
                       reservedOptionKeys: optionMetadata.reservedOptionKeys,
-                      optionsRaw: clientSignature.optionsArg
-                          ? getNodeText(sourceFile, clientSignature.optionsArg)
-                          : undefined,
-                      hasSetup: clientSignature.hasSetup,
+                      optionsRaw: getNodeText(sourceFile, clientSignature.optionsExpression),
+                      hasData: false,
                   }
                 : {
                       methodName: definition.methodName,
@@ -627,10 +622,8 @@ export const indexRouteDefinitions = ({ side, sourceFilepath }: { side: TRouteSi
                       normalizedOptionKeys: optionMetadata.normalizedOptionKeys,
                       invalidOptionKeys: optionMetadata.invalidOptionKeys,
                       reservedOptionKeys: optionMetadata.reservedOptionKeys,
-                      optionsRaw: clientSignature.optionsArg
-                          ? getNodeText(sourceFile, clientSignature.optionsArg)
-                          : undefined,
-                      hasSetup: clientSignature.hasSetup,
+                      optionsRaw: getNodeText(sourceFile, clientSignature.optionsExpression),
+                      hasData: clientSignature.hasData,
                   };
         }
 
@@ -659,7 +652,7 @@ export const indexRouteDefinitions = ({ side, sourceFilepath }: { side: TRouteSi
             invalidOptionKeys: optionMetadata.invalidOptionKeys,
             reservedOptionKeys: optionMetadata.reservedOptionKeys,
             optionsRaw: optionsArg ? getNodeText(sourceFile, optionsArg) : undefined,
-            hasSetup: false,
+            hasData: false,
         };
     });
 };

package/cli/compiler/common/index.ts

@@ -45,7 +45,17 @@ export default function createCommonConfig(
 ): Configuration {
     const dev = mode === 'dev';
     const enableFilesystemCache = dev ? cli.args.cache !== false : cli.args.cache === true;
+    const frameworkPackageRoots = [cli.paths.framework.installedRoot, cli.paths.framework.activeRoot].filter(
+        (rootPath, index, list): rootPath is string => typeof rootPath === 'string' && list.indexOf(rootPath) === index,
+    );
+    const visibleNodeModulesRoots = [
+        ...cli.paths.getVisibleNodeModulesRootsForPath(app.paths.root),
+        ...frameworkPackageRoots.flatMap((rootPath) => cli.paths.getVisibleNodeModulesRootsForPath(rootPath)),
+        ...cli.paths.getVisibleNodeModulesRootsForPath(cli.paths.core.cli),
+    ].filter((moduleRoot, index, list) => list.indexOf(moduleRoot) === index);
     const loaderModuleRoots = [
+        ...visibleNodeModulesRoots,
+        ...frameworkPackageRoots.map((rootPath) => path.join(rootPath, 'node_modules')),
         cli.paths.framework.appNodeModulesRoot,
         cli.paths.framework.frameworkNodeModulesRoot,
         path.join(cli.paths.core.cli, 'node_modules'),

package/cli/compiler/common/proteumManifest.ts

@@ -7,6 +7,7 @@ import type { TProteumManifest } from '@common/dev/proteumManifest';
 export type {
     TProteumManifest,
     TProteumManifestCommand,
+    TProteumManifestConnectedProject,
     TProteumManifestController,
     TProteumManifestDiagnostic,
     TProteumManifestDiagnosticLevel,

package/cli/compiler/server/index.ts

@@ -3,6 +3,7 @@
 ----------------------------------*/
 
 // Npm
+import path from 'path';
 import { type Configuration } from '@rspack/core';
 
 // Core
@@ -50,18 +51,38 @@ const getDevGeneratedRuntimeEntries = (app: App) => ({
     __proteum_dev_controllers: [app.paths.server.generated + '/controllers.ts'],
 });
 const normalizeModulePath = (value?: string) => (value || '').replace(/\\/g, '/');
-const rewriteFrameworkAliasTargets = (app: App, aliases: Record<string, string | string[]>) => {
+const getFrameworkSourceRoot = () => {
     const installedCoreRoot = cli.paths.framework.installedRoot
         ? normalizeModulePath(cli.paths.framework.installedRoot)
         : undefined;
     const activeCoreRoot = normalizeModulePath(cli.paths.framework.activeRoot);
 
-    if (!installedCoreRoot || installedCoreRoot === activeCoreRoot) return aliases;
+    if (installedCoreRoot && activeCoreRoot.includes('/node_modules/')) {
+        return installedCoreRoot;
+    }
+
+    return activeCoreRoot;
+};
+
+const rewriteFrameworkAliasTargets = (aliases: Record<string, string | string[]>) => {
+    const visibleFrameworkRoots = [
+        ...cli.paths.getVisiblePackageInstallRoots('proteum'),
+        cli.paths.framework.installedRoot,
+        cli.paths.framework.activeRoot,
+    ]
+        .filter((rootPath): rootPath is string => typeof rootPath === 'string' && rootPath !== '')
+        .map((rootPath) => normalizeModulePath(rootPath))
+        .filter((rootPath, index, list) => list.indexOf(rootPath) === index);
+    const frameworkSourceRoot = getFrameworkSourceRoot();
 
     const rewriteCandidate = (candidate: string) =>
-        normalizeModulePath(candidate).startsWith(installedCoreRoot + '/')
-            ? activeCoreRoot + normalizeModulePath(candidate).substring(installedCoreRoot.length)
-            : candidate;
+        visibleFrameworkRoots.reduce((nextCandidate, rootPath) => {
+                const normalizedCandidate = normalizeModulePath(nextCandidate);
+
+                return normalizedCandidate.startsWith(rootPath + '/')
+                    ? frameworkSourceRoot + normalizedCandidate.substring(rootPath.length)
+                    : nextCandidate;
+            }, candidate);
 
     return Object.fromEntries(
         Object.entries(aliases).map(([alias, value]) => [
@@ -82,18 +103,22 @@ export default function createCompiler(
     debug && console.info(`Creating compiler for server (${mode}).`);
     const dev = mode === 'dev';
     const outputPath = app.outputPath(outputTarget);
-    const frameworkRoots = cli.paths.getFrameworkRoots();
+    const frameworkSourceRoot = getFrameworkSourceRoot();
+    const frameworkRoots = [frameworkSourceRoot, ...cli.paths.getFrameworkRoots()].filter(
+        (rootPath, index, list) => list.indexOf(rootPath) === index,
+    );
     const transpileModuleDirectories = app.transpileModuleDirectories;
 
     const commonConfig = createCommonConfig(app, 'server', mode, outputTarget);
     const { aliases } = app.aliases.server.forWebpack({ modulesPath: cli.paths.framework.appNodeModulesRoot });
-    const resolvedAliases = rewriteFrameworkAliasTargets(app, aliases);
+    const resolvedAliases = rewriteFrameworkAliasTargets(aliases);
 
     // We're not supposed in any case to import client services from server
     delete resolvedAliases['@client/services'];
     delete resolvedAliases['@/client/services'];
     const rspackAliases = toRspackAliases(resolvedAliases);
-    rspackAliases['@/client/router$'] = cli.paths.core.root + '/client/router.ts';
+    rspackAliases['proteum'] = frameworkSourceRoot;
+    rspackAliases['@/client/router$'] = frameworkSourceRoot + '/client/router.ts';
 
     debug &&
         console.log(
@@ -108,7 +133,7 @@ export default function createCompiler(
         name: 'server',
         target: 'node',
         entry: {
-            server: [cli.paths.coreRoot + '/server/index.ts'],
+            server: [path.join(frameworkSourceRoot, 'server', 'index.ts')],
             ...(dev ? getDevGeneratedRuntimeEntries(app) : {}),
         },
 

package/cli/context.ts

@@ -24,7 +24,12 @@ export class CLIContext {
     }
 
     public setArgs(args: TArgsObject = {}) {
-        this.args = { workdir: process.cwd(), ...args };
+        const workdir =
+            typeof args.workdir === 'string' && args.workdir.trim().length > 0 ? args.workdir.trim() : process.cwd();
+
+        this.args = { ...args, workdir };
+        this.paths = new Paths(workdir, this.paths.core.root);
+        this.paths.applyAliases();
         this.verbose = this.args.verbose === true;
         this.debug = this.verbose;
     }

package/cli/index.ts

@@ -12,6 +12,8 @@ import { createCli, registeredCommands } from './runtime/commands';
 
 const formatInvocation = (argv: string[]) => ['proteum', ...argv].join(' ').trim();
 
+const sharedWelcomeBannerCommands = new Set(['build', 'dev']);
+
 const shouldRenderSharedWelcomeBanner = ({
     argv,
     helpRequestKind,
@@ -19,15 +21,12 @@ const shouldRenderSharedWelcomeBanner = ({
     argv: string[];
     helpRequestKind: 'none' | 'overview' | 'command';
 }) => {
-    if (helpRequestKind !== 'none') return true;
-    if (argv[0] !== 'dev') return true;
-
-    if (argv.length === 1) return false;
-
-    const action = argv[1];
-    if (action.startsWith('-')) return false;
+    if (helpRequestKind !== 'none') return false;
+    if (argv.length !== 1) return false;
 
-    return action === 'list' || action === 'stop';
+    const command = argv[0];
+    if (!command || !sharedWelcomeBannerCommands.has(command)) return false;
+    return true;
 };
 
 export const runCli = async (argv: string[] = process.argv.slice(2)) => {