diff --git a/packages/svelte/package.json b/packages/svelte/package.json index bb2716a989..56f48a14c2 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -44,8 +44,8 @@ "./elements": { "types": "./elements.d.ts" }, - "./internal": { - "default": "./src/internal/index.js" + "./internal/client": { + "default": "./src/internal/client/index.js" }, "./internal/disclose-version": { "default": "./src/internal/disclose-version.js" diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js index 3b672fada8..7f0fab0def 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js @@ -46,7 +46,7 @@ export function client_component(source, analysis, options) { options, scope: analysis.module.scope, scopes: analysis.template.scopes, - hoisted: [b.import_all('$', 'svelte/internal')], + hoisted: [b.import_all('$', 'svelte/internal/client')], node: /** @type {any} */ (null), // populated by the root node // these should be set by create_block - if they're called outside, it's a bug get before_init() { @@ -582,6 +582,6 @@ export function client_module(analysis, options) { return { type: 'Program', sourceType: 'module', - body: [b.import_all('$', 'svelte/internal'), ...module.body] + body: [b.import_all('$', 'svelte/internal/client'), ...module.body] }; } diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js index a4e4a4cdf1..f7399d8685 100644 --- a/packages/svelte/src/index-client.js +++ b/packages/svelte/src/index-client.js @@ -1,6 +1,6 @@ import { current_component_context, untrack } from './internal/client/runtime.js'; import { is_array } from './internal/client/utils.js'; -import { user_effect } from './internal/index.js'; +import { user_effect } from './internal/client/index.js'; /** * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM. @@ -182,4 +182,4 @@ export { getContext, getAllContexts, setContext -} from './internal/index.js'; +} from './internal/client/index.js'; diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js new file mode 100644 index 0000000000..5d45144072 --- /dev/null +++ b/packages/svelte/src/internal/client/index.js @@ -0,0 +1,72 @@ +export { + get, + invalidate_inner_signals, + flushSync, + tick, + untrack, + update, + update_pre, + value_or_fallback, + exclude_from_object, + pop, + push, + inspect, + unwrap, + freeze, + deep_read, + deep_read_state, + getAllContexts, + getContext, + setContext, + hasContext +} from './runtime.js'; +export * from './dev/ownership.js'; +export { await_block as await } from './dom/blocks/await.js'; +export { if_block as if } from './dom/blocks/if.js'; +export { key_block as key } from './dom/blocks/key.js'; +export * from './dom/blocks/css-props.js'; +export * from './dom/blocks/each.js'; +export * from './dom/blocks/html.js'; +export * from './dom/blocks/snippet.js'; +export * from './dom/blocks/svelte-component.js'; +export * from './dom/blocks/svelte-element.js'; +export * from './dom/blocks/svelte-head.js'; +export * from './dom/elements/actions.js'; +export * from './dom/elements/attributes.js'; +export * from './dom/elements/class.js'; +export * from './dom/elements/events.js'; +export * from './dom/elements/misc.js'; +export * from './dom/elements/style.js'; +export * from './dom/elements/transitions.js'; +export * from './dom/elements/bindings/input.js'; +export * from './dom/elements/bindings/media.js'; +export * from './dom/elements/bindings/navigator.js'; +export * from './dom/elements/bindings/props.js'; +export * from './dom/elements/bindings/select.js'; +export * from './dom/elements/bindings/size.js'; +export * from './dom/elements/bindings/this.js'; +export * from './dom/elements/bindings/universal.js'; +export * from './dom/elements/bindings/window.js'; +export * from './dom/legacy/event-modifiers.js'; +export * from './dom/legacy/lifecycle.js'; +export * from './dom/legacy/misc.js'; +export * from './dom/template.js'; +export * from './reactivity/deriveds.js'; +export * from './reactivity/effects.js'; +export * from './reactivity/sources.js'; +export * from './reactivity/equality.js'; +export * from './reactivity/props.js'; +export * from './reactivity/store.js'; +export * from './render.js'; +export * from './validate.js'; +export { raf } from './timing.js'; +export { proxy, unstate } from './proxy.js'; +export { create_custom_element } from './dom/elements/custom-element.js'; +export { + child, + first_child, + sibling, + $window as window, + $document as document +} from './dom/operations.js'; +export { noop } from '../common.js'; diff --git a/packages/svelte/src/internal/index.js b/packages/svelte/src/internal/index.js deleted file mode 100644 index a8286ea16d..0000000000 --- a/packages/svelte/src/internal/index.js +++ /dev/null @@ -1,72 +0,0 @@ -export { - get, - invalidate_inner_signals, - flushSync, - tick, - untrack, - update, - update_pre, - value_or_fallback, - exclude_from_object, - pop, - push, - inspect, - unwrap, - freeze, - deep_read, - deep_read_state, - getAllContexts, - getContext, - setContext, - hasContext -} from './client/runtime.js'; -export * from './client/dev/ownership.js'; -export { await_block as await } from './client/dom/blocks/await.js'; -export { if_block as if } from './client/dom/blocks/if.js'; -export { key_block as key } from './client/dom/blocks/key.js'; -export * from './client/dom/blocks/css-props.js'; -export * from './client/dom/blocks/each.js'; -export * from './client/dom/blocks/html.js'; -export * from './client/dom/blocks/snippet.js'; -export * from './client/dom/blocks/svelte-component.js'; -export * from './client/dom/blocks/svelte-element.js'; -export * from './client/dom/blocks/svelte-head.js'; -export * from './client/dom/elements/actions.js'; -export * from './client/dom/elements/attributes.js'; -export * from './client/dom/elements/class.js'; -export * from './client/dom/elements/events.js'; -export * from './client/dom/elements/misc.js'; -export * from './client/dom/elements/style.js'; -export * from './client/dom/elements/transitions.js'; -export * from './client/dom/elements/bindings/input.js'; -export * from './client/dom/elements/bindings/media.js'; -export * from './client/dom/elements/bindings/navigator.js'; -export * from './client/dom/elements/bindings/props.js'; -export * from './client/dom/elements/bindings/select.js'; -export * from './client/dom/elements/bindings/size.js'; -export * from './client/dom/elements/bindings/this.js'; -export * from './client/dom/elements/bindings/universal.js'; -export * from './client/dom/elements/bindings/window.js'; -export * from './client/dom/legacy/event-modifiers.js'; -export * from './client/dom/legacy/lifecycle.js'; -export * from './client/dom/legacy/misc.js'; -export * from './client/dom/template.js'; -export * from './client/reactivity/deriveds.js'; -export * from './client/reactivity/effects.js'; -export * from './client/reactivity/sources.js'; -export * from './client/reactivity/equality.js'; -export * from './client/reactivity/props.js'; -export * from './client/reactivity/store.js'; -export * from './client/render.js'; -export * from './client/validate.js'; -export { raf } from './client/timing.js'; -export { proxy, unstate } from './client/proxy.js'; -export { create_custom_element } from './client/dom/elements/custom-element.js'; -export { - child, - first_child, - sibling, - $window as window, - $document as document -} from './client/dom/operations.js'; -export { noop } from './common.js'; diff --git a/packages/svelte/src/legacy/legacy-client.js b/packages/svelte/src/legacy/legacy-client.js index 775a9e1517..f3ba3ed204 100644 --- a/packages/svelte/src/legacy/legacy-client.js +++ b/packages/svelte/src/legacy/legacy-client.js @@ -1,5 +1,5 @@ import { define_property } from '../internal/client/utils.js'; -import * as $ from '../internal/index.js'; +import * as $ from '../internal/client/index.js'; /** * Takes the same options as a Svelte 4 component and the component function and returns a Svelte 4 compatible component. diff --git a/packages/svelte/tests/animation-helpers.js b/packages/svelte/tests/animation-helpers.js index a941a643cc..d86b5b29f0 100644 --- a/packages/svelte/tests/animation-helpers.js +++ b/packages/svelte/tests/animation-helpers.js @@ -1,4 +1,4 @@ -import { raf as svelte_raf } from 'svelte/internal'; +import { raf as svelte_raf } from 'svelte/internal/client'; export const raf = { animations: new Set(), diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts index 36e615b991..6a1f99f69f 100644 --- a/packages/svelte/tests/runtime-legacy/shared.ts +++ b/packages/svelte/tests/runtime-legacy/shared.ts @@ -1,8 +1,7 @@ import * as fs from 'node:fs'; import { setImmediate } from 'node:timers/promises'; import glob from 'tiny-glob/sync.js'; -// import { clear_loops, flush, set_now, set_raf } from 'svelte/internal'; -import * as $ from 'svelte/internal'; +import * as $ from 'svelte/internal/client'; import { createClassComponent } from 'svelte/legacy'; import { render } from 'svelte/server'; import { afterAll, assert, beforeAll } from 'vitest'; diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js index c6b1ce9ead..b14eaa71a9 100644 --- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export default function Bind_this($$anchor, $$props) { $.push($$props, false); diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js index 38a74ef9bb..d2c1c9c540 100644 --- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export default function Class_state_field_constructor_assignment($$anchor, $$props) { $.push($$props, true); diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js index 6112527db1..9d6dff7a3b 100644 --- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js +++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js @@ -1,7 +1,7 @@ // main.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; var root = $.template(`
`, 3); diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js index a01456fc48..56e320506f 100644 --- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export default function Each_string_template($$anchor, $$props) { $.push($$props, false); diff --git a/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js index 4cc594e9d0..bab47c8c50 100644 --- a/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js @@ -1,4 +1,4 @@ /* index.svelte.js generated by Svelte VERSION */ -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export const object = $.proxy({ ok: true }); \ No newline at end of file diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js index 5174c1183e..f5f31c253d 100644 --- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export default function Function_prop_no_getter($$anchor, $$props) { $.push($$props, true); diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js index aa18876ec7..4f0aadff19 100644 --- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; var root = $.template(`

hello world

`); diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js index 18371d51d0..9d5954ade2 100644 --- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; function reset(_, str, tpl) { $.set(str, ''); diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js index 85888fa82e..e9db44cd7a 100644 --- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js @@ -1,7 +1,7 @@ // index.svelte (Svelte VERSION) // Note: compiler output will change before 5.0 is released! import "svelte/internal/disclose-version"; -import * as $ from "svelte/internal"; +import * as $ from "svelte/internal/client"; export default function Svelte_element($$anchor, $$props) { $.push($$props, true); diff --git a/packages/svelte/tsconfig.json b/packages/svelte/tsconfig.json index 0d7efcd6c5..e1bc981ec8 100644 --- a/packages/svelte/tsconfig.json +++ b/packages/svelte/tsconfig.json @@ -19,7 +19,7 @@ "svelte": ["./src/index.d.ts"], "svelte/action": ["./src/action/public.d.ts"], "svelte/compiler": ["./src/compiler/public.d.ts"], - "svelte/internal": ["./src/internal/index.js"], + "svelte/internal/client": ["./src/internal/client/index.js"], "svelte/legacy": ["./src/legacy/legacy-client.js"], "svelte/motion": ["./src/motion/public.d.ts"], "svelte/server": ["./src/server/index.js"],