Skip to content

Fix Alt+Click "open in editor" whe a custom srcDir is defined. #7921

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

Closed
wants to merge 1 commit into from
Closed

Fix Alt+Click "open in editor" whe a custom srcDir is defined. #7921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions packages/qwik/src/optimizer/src/plugins/click-to-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
(function () {
const inspectAttribute = 'data-qwik-inspector';
const hotKeys = globalThis.qwikdevtools.hotKeys;
const srcDir = globalThis.qwikdevtools.srcDir;
const rootDir = globalThis.qwikdevtools.rootDir;
document.querySelector('#qwik-inspector-info-popup').textContent =
`Click-to-Source: ${hotKeys.join(' + ')}`;
console.debug(
Expand Down Expand Up @@ -148,20 +148,9 @@
);

globalThis.qwikOpenInEditor = function (path) {
const isWindows = navigator.platform.includes('Win');
const resolvedURL = new URL(path, isWindows ? origin : srcDir);
let filePath =
resolvedURL.protocol === 'file:' && resolvedURL.pathname.startsWith('/')
? resolvedURL.pathname.slice(1)
: resolvedURL.pathname.startsWith('/@fs/')
? resolvedURL.pathname.slice(isWindows ? 5 : 4)
: resolvedURL.pathname;
if (filePath.startsWith('/src/')) {
const prefix = isWindows ? srcDir : srcDir.replace('http://local.local', '');
filePath = prefix + filePath.slice(4);
}
const fullPath = `${rootDir}/${path.replace(/^\//, '')}`;
const params = new URLSearchParams();
params.set('file', filePath);
params.set('file', fullPath);
fetch('/__open-in-editor?' + params.toString());
};
document.addEventListener(
Expand Down
17 changes: 13 additions & 4 deletions packages/qwik/src/optimizer/src/plugins/vite-dev-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,11 @@ export async function configureDevServer(
});

res.write(
END_SSR_SCRIPT(opts, opts.srcDir ? opts.srcDir : path.join(opts.rootDir, 'src'))
END_SSR_SCRIPT(
opts,
opts.srcDir ? opts.srcDir : path.join(opts.rootDir, 'src'),
opts.rootDir
)
);
res.end();
} else {
Expand Down Expand Up @@ -435,10 +439,15 @@ function relativeURL(url: string, base: string) {
return url;
}

const DEV_QWIK_INSPECTOR = (opts: NormalizedQwikPluginOptions['devTools'], srcDir: string) => {
const DEV_QWIK_INSPECTOR = (
opts: NormalizedQwikPluginOptions['devTools'],
srcDir: string,
rootDir: string
) => {
const qwikdevtools = {
hotKeys: opts.clickToSource ?? [],
srcDir: new URL(srcDir + '/', 'http://local.local').href,
rootDir: rootDir,
};
return (
`<script>
Expand All @@ -449,12 +458,12 @@ const DEV_QWIK_INSPECTOR = (opts: NormalizedQwikPluginOptions['devTools'], srcDi
);
};

const END_SSR_SCRIPT = (opts: NormalizedQwikPluginOptions, srcDir: string) => `
const END_SSR_SCRIPT = (opts: NormalizedQwikPluginOptions, srcDir: string, rootDir: string) => `
<style>${VITE_ERROR_OVERLAY_STYLES}</style>
<script type="module" src="/@vite/client"></script>
${errorHost}
${perfWarning}
${DEV_QWIK_INSPECTOR(opts.devTools, srcDir)}
${DEV_QWIK_INSPECTOR(opts.devTools, srcDir, rootDir)}
`;

function getViteDevIndexHtml(entryUrl: string, serverData: Record<string, any>) {
Expand Down