Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion packages/qwik-router/src/buildtime/vite/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
},

async transform(code, id) {
if (id.startsWith('\0')) {
const isVirtualId = id.startsWith('\0');
if (isVirtualId) {
return;
}
const ext = extname(id).toLowerCase();
Expand Down
8 changes: 4 additions & 4 deletions packages/qwik/src/optimizer/src/plugins/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import type {
} from '../types';
import { convertManifestToBundleGraph } from './bundle-graph';
import { createLinter, type QwikLinter } from './eslint-plugin';
import { isWin, parseId } from './vite-utils';
import { isVirtualId, isWin, parseId } from './vite-utils';

const REG_CTX_NAME = ['server'];

Expand Down Expand Up @@ -448,7 +448,7 @@ export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
importerId: string | undefined,
resolveOpts?: Parameters<Extract<Plugin['resolveId'], Function>>[2]
) => {
if (id.startsWith('\0')) {
if (isVirtualId(id)) {
return;
}

Expand Down Expand Up @@ -638,7 +638,7 @@ export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
// This doesn't get used, but we need to return something
return '"opening in editor"';
}
if (id.startsWith('\0') || id.startsWith('/@fs/')) {
if (isVirtualId(id) || id.startsWith('/@fs/')) {
return;
}
const count = loadCount++;
Expand Down Expand Up @@ -724,7 +724,7 @@ export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
id: string,
transformOpts = {} as Parameters<Extract<Plugin['transform'], Function>>[2]
): Promise<Rollup.TransformResult> {
if (id.startsWith('\0')) {
if (isVirtualId(id)) {
return;
}
const count = transformCount++;
Expand Down
7 changes: 4 additions & 3 deletions packages/qwik/src/optimizer/src/plugins/rollup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
type QwikPluginOptions,
} from './plugin';
import { findDepPkgJsonPath } from './utils';
import { isVirtualId } from './vite-utils';

type QwikRollupPluginApi = {
getOptimizer: () => Optimizer;
Expand Down Expand Up @@ -94,21 +95,21 @@ export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
},

resolveId(id, importer) {
if (id.startsWith('\0')) {
if (isVirtualId(id)) {
return null;
}
return qwikPlugin.resolveId(this, id, importer);
},

load(id) {
if (id.startsWith('\0')) {
if (isVirtualId(id)) {
return null;
}
return qwikPlugin.load(this, id);
},

transform(code, id) {
if (id.startsWith('\0')) {
if (isVirtualId(id)) {
return null;
}
return qwikPlugin.transform(this, code, id);
Expand Down
2 changes: 2 additions & 0 deletions packages/qwik/src/optimizer/src/plugins/vite-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export const findLocation = (e: Error): Loc | undefined => {
return undefined;
};

export const isVirtualId = (id: string) => id.startsWith('\0');

const safeParseInt = (nu: string) => {
try {
return parseInt(nu, 10);
Expand Down
13 changes: 9 additions & 4 deletions packages/qwik/src/optimizer/src/plugins/vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
} from './plugin';
import { createRollupError, normalizeRollupOutputOptions } from './rollup';
import { configurePreviewServer, getViteIndexTags } from './dev';
import { isVirtualId } from './vite-utils';

const DEDUPE = [
QWIK_CORE_ID,
Expand Down Expand Up @@ -383,14 +384,16 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
},

resolveId(id, importer, resolveIdOpts) {
if (id.startsWith('\0') || !fileFilter(id, 'resolveId')) {
const shouldResolveFile = fileFilter(id, 'resolveId');
if (isVirtualId(id) || !shouldResolveFile) {
return null;
}
return qwikPlugin.resolveId(this, id, importer, resolveIdOpts);
},

load(id, loadOpts) {
if (id.startsWith('\0') || !fileFilter(id, 'load')) {
const shouldLoadFile = fileFilter(id, 'load');
if (isVirtualId(id) || !shouldLoadFile) {
return null;
}

Expand All @@ -405,7 +408,9 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
},

transform(code, id, transformOpts) {
if (id.startsWith('\0') || !fileFilter(id, 'transform') || id.includes('?raw')) {
const shouldTransformFile = fileFilter(id, 'transform');
const isStringImportId = id.includes('?raw');
if (isVirtualId(id) || !shouldTransformFile || isStringImportId) {
return null;
}
if (
Expand Down Expand Up @@ -801,7 +806,7 @@ interface QwikVitePluginCommonOptions {
* Predicate function to filter out files from the optimizer. hook for resolveId, load, and
* transform
*/
fileFilter?: (id: string, hook: string) => boolean;
fileFilter?: (id: string, hook: keyof VitePlugin) => boolean;
/**
* Run eslint on the source files for the ssr build or dev server. This can slow down startup on
* large projects. Defaults to `true`
Expand Down
Loading