Skip to content

Revert "[fix] check for private var usage in client code instead of server code" #7497

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
merged 1 commit into from
Nov 4, 2022
Merged

Revert "[fix] check for private var usage in client code instead of server code" #7497

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
5 changes: 0 additions & 5 deletions .changeset/empty-dryers-applaud.md
View file
Open in desktop

This file was deleted.

25 changes: 11 additions & 14 deletions packages/kit/src/exports/vite/dev/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,12 @@ export async function dev(vite, vite_config, svelte_config) {
async function resolve(id) {
const url = id.startsWith('..') ? `/@fs${path.posix.resolve(id)}` : `/${id}`;

// need to ensure the entry is in the module graph before we can get it
// we leave the ssr parameter undefined because we care about the client-side code here
await vite.moduleGraph.ensureEntryFromUrl(url);
const module = await vite.ssrLoadModule(url);

const module_node = await vite.moduleGraph.getModuleByUrl(url);
if (!module_node) throw new Error(`Could not find node for ${url}`);

return { module_node, url };
return { module, module_node, url };
}

async function update_manifest() {
Expand Down Expand Up @@ -88,8 +87,9 @@ export async function dev(vite, vite_config, svelte_config) {

if (node.component) {
result.component = async () => {
const id = /** @type {string} */ (node.component);
const { module_node, url } = await resolve(id);
const { module_node, module, url } = await resolve(
/** @type {string} */ (node.component)
);

module_nodes.push(module_node);
result.file = url.endsWith('.svelte') ? url : url + '?import'; // TODO what is this for?
Expand All @@ -100,30 +100,27 @@ export async function dev(vite, vite_config, svelte_config) {
extensions
);

// wait to load the module until after we check for illegal imports
const module = await vite.ssrLoadModule(url);
return module.default;
};
}

if (node.shared) {
const { module_node, url } = await resolve(node.shared);
const { module, module_node } = await resolve(node.shared);

module_nodes.push(module_node);

result.shared = module;

prevent_illegal_vite_imports(
module_node,
normalizePath(svelte_config.kit.files.lib),
extensions
);

// wait to load the module until after we check for illegal imports
result.shared = await vite.ssrLoadModule(url);
}

if (node.server) {
const { url } = await resolve(node.server);
result.server = await vite.ssrLoadModule(url);
const { module } = await resolve(node.server);
result.server = module;
result.server_id = node.server;
}

Expand Down