Skip to content

fix(vite): resolve workspace css specs to /@fs before ?inline transform #11474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 2 commits into from
Sep 29, 2026
Merged

fix(vite): resolve workspace css specs to /@fs before ?inline transform #11474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eaf4c5
fix(vite): resolve workspace css specs to /@fs before ?inline transform
aleclarson Sep 28, 2026
18ca85f
refactor(vite): share /@fs spec anchoring between css and module routes
NathanWalker Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion packages/vite/hmr/server/websocket-ns-m-request.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mkdtempSync, mkdirSync, realpathSync, rmSync, writeFileSync } from 'nod
import { tmpdir } from 'node:os';
import { join } from 'node:path';

import { createNsMRequestContext, resolveNsMTransformedModule } from './websocket-ns-m-request.js';
import { createNsMRequestContext, resolveFsAnchoredSpec, resolveNsMTransformedModule } from './websocket-ns-m-request.js';

describe('createNsMRequestContext', () => {
it('normalizes decorated HMR request paths into canonical module specs', () => {
Expand Down Expand Up @@ -113,3 +113,20 @@ describe('resolveNsMTransformedModule', () => {
expect(transformedCalls).toContain(expectedFsId);
});
});

describe('resolveFsAnchoredSpec', () => {
it('anchors a workspace css file outside the app root to its /@fs id', () => {
const wsRoot = realpathSync(mkdtempSync(join(tmpdir(), 'ns-hmr-ns-m-fs-anchor-')));
try {
const appRoot = join(wsRoot, 'apps/native');
mkdirSync(appRoot, { recursive: true });
mkdirSync(join(wsRoot, 'packages/ui/src/theme'), { recursive: true });
writeFileSync(join(wsRoot, 'packages/ui/src/theme/tokens.css'), '.a { color: red; }');

expect(resolveFsAnchoredSpec('/packages/ui/src/theme/tokens.css', appRoot, wsRoot)).toBe(`/@fs${wsRoot}/packages/ui/src/theme/tokens.css`);
expect(resolveFsAnchoredSpec('/packages/ui/src/theme/missing.css', appRoot, wsRoot)).toBeNull();
} finally {
rmSync(wsRoot, { recursive: true, force: true });
}
});
});
36 changes: 23 additions & 13 deletions packages/vite/hmr/server/websocket-ns-m-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,24 @@ function getLoadedCode(loadResult: string | { code?: string } | TransformResult
return typeof loadResult.code === 'string' ? loadResult.code : null;
}

/**
* Anchors a root-relative spec to the `/@fs/<abs>` id of the file it names,
* probing the project root, then the monorepo workspace root. Vite only
* resolves root-relative URLs under its configured `root`, so workspace files
* outside it need the absolute form.
*/
export function resolveFsAnchoredSpec(spec: string, serverRoot: string, workspaceRoot?: string | null): string | null {
const roots = [serverRoot, ...(workspaceRoot && path.resolve(workspaceRoot) !== path.resolve(serverRoot) ? [workspaceRoot] : [])];
for (const root of roots) {
const rootPosix = root.replace(/\\/g, '/').replace(/\/$/, '');
const fsId = `/@fs${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
if (resolveCandidateFilePath(fsId, serverRoot, workspaceRoot)) {
return fsId;
}
}
return null;
}

export async function resolveNsMTransformedModule(options: ResolveNsMTransformedModuleOptions): Promise<NsMResolvedTransform> {
const { context, transformRequest, resolveId, loadVirtualId, timeoutMs = 120000 } = options;
const { spec, serverRoot, workspaceRoot, transformCandidates } = context;
Expand Down Expand Up @@ -224,19 +242,11 @@ export async function resolveNsMTransformedModule(options: ResolveNsMTransformed
}
}

const buildFsCandidate = (root: string): string => {
const rootPosix = root.replace(/\\/g, '/').replace(/\/$/, '');
const absolutePosixPath = `${rootPosix}${spec.startsWith('/') ? '' : '/'}${spec}`;
return `/@fs${absolutePosixPath}`;
};
const fsRootsToTry = [serverRoot, ...(workspaceRoot && path.resolve(workspaceRoot) !== path.resolve(serverRoot) ? [workspaceRoot] : [])];
for (const root of fsRootsToTry) {
const fsId = buildFsCandidate(root);
if (resolveCandidateFilePath(fsId, serverRoot, workspaceRoot)) {
transformed = await tryTransformRequest(transformRequest, fsId, timeoutMs);
if (transformed?.code) {
return { transformed, resolvedCandidate: fsId };
}
const fsId = resolveFsAnchoredSpec(spec, serverRoot, workspaceRoot);
if (fsId) {
transformed = await tryTransformRequest(transformRequest, fsId, timeoutMs);
if (transformed?.code) {
return { transformed, resolvedCandidate: fsId };
}
}

Expand Down
8 changes: 6 additions & 2 deletions packages/vite/hmr/server/websocket-ns-m.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getMonorepoWorkspaceRoot } from '../../helpers/project.js';
import { isRuntimeGraphExcludedPath } from './runtime-graph-filter.js';
import { buildPiniaVendorShim, buildVueVendorShim } from './vendor-bare-module-shims.js';
import { collapseLegacyNsMTags } from './websocket-ns-m-paths.js';
import { createNsMRequestContext, resolveNsMTransformedModule } from './websocket-ns-m-request.js';
import { createNsMRequestContext, resolveFsAnchoredSpec, resolveNsMTransformedModule } from './websocket-ns-m-request.js';
import { setDeviceModuleHeaders } from './route-helpers.js';
import { CSS_MODULE_RE, buildCssRegisterSnippetFromVar, normalizeCssForDevice } from './css-device-module.js';
import { assertNoOptimizedArtifacts, buildBootProgressSnippet, canonicalizeRtImports, dedupeRtNamedImportsAgainstDestructures, deduplicateLinkerImports, ensureDestructureCoreImports, ensureGuardPlainDynamicImports, ensureVariableDynamicImportHelper, expandStarExports, hoistTopLevelStaticImports, MODULE_IMPORT_ANALYSIS_PLUGINS, wrapCommonJsModuleForDevice, ensureWorkerEntryGlobalsImport, classifyServedRequest } from './websocket-served-module-helpers.js';
Expand Down Expand Up @@ -200,7 +200,11 @@ export function registerNsModuleServerRoute(server: ViteDevServer, options: Regi
// string for `import css from './x.css'`. `app.css` has its own path.
if (CSS_MODULE_RE.test(spec)) {
try {
const inlineRes = await sharedTransformRequest(`${spec}?inline`);
// Workspace css outside the vite root must be anchored to /@fs or
// `?inline` is denied and the DOM css module (__vite__updateStyle)
// is served instead.
const inlineSpec = resolveFsAnchoredSpec(spec, serverRoot, monorepoWorkspaceRoot) || spec;
const inlineRes = await sharedTransformRequest(`${inlineSpec}?inline`);
const inlineCode = inlineRes?.code || '';
// `?inline` output is `export default "<compiled css>"`.
const m = inlineCode.match(/export\s+default\s+("(?:[^"\\]|\\.)*")\s*;?/s);
Expand Down
Loading