From 4704ccf5fa39b36d69068c0be11eb73974ddd514 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 21 Mar 2024 09:51:05 -0400 Subject: [PATCH] tidy up --- .../phases/3-transform/client/visitors/template.js | 10 ++++------ packages/svelte/src/constants.js | 4 ++++ packages/svelte/src/internal/client/constants.js | 4 ---- .../src/internal/client/dom/elements/transitions.js | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js index 7b69b612ee..15a6f0ebf1 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js @@ -32,17 +32,15 @@ import { EACH_IS_CONTROLLED, EACH_IS_STRICT_EQUALS, EACH_ITEM_REACTIVE, - EACH_KEYED + EACH_KEYED, + TRANSITION_GLOBAL, + TRANSITION_IN, + TRANSITION_OUT } from '../../../../../constants.js'; import { regex_is_valid_identifier } from '../../../patterns.js'; import { javascript_visitors_runes } from './javascript-runes.js'; import { sanitize_template_string } from '../../../../utils/sanitize_template_string.js'; import { walk } from 'zimmerframe'; -import { - TRANSITION_GLOBAL, - TRANSITION_IN, - TRANSITION_OUT -} from '../../../../../internal/client/constants.js'; /** * @param {import('#compiler').RegularElement | import('#compiler').SvelteElement} element diff --git a/packages/svelte/src/constants.js b/packages/svelte/src/constants.js index 7996e3b2fa..73f124302a 100644 --- a/packages/svelte/src/constants.js +++ b/packages/svelte/src/constants.js @@ -12,6 +12,10 @@ export const PROPS_IS_RUNES = 1 << 1; export const PROPS_IS_UPDATED = 1 << 2; export const PROPS_IS_LAZY_INITIAL = 1 << 3; +export const TRANSITION_IN = 1; +export const TRANSITION_OUT = 1 << 1; +export const TRANSITION_GLOBAL = 1 << 2; + /** List of Element events that will be delegated */ export const DelegatedEvents = [ 'beforeinput', diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js index e80541aede..33d6519c9d 100644 --- a/packages/svelte/src/internal/client/constants.js +++ b/packages/svelte/src/internal/client/constants.js @@ -11,9 +11,5 @@ export const INERT = 1 << 11; export const DESTROYED = 1 << 12; export const IS_ELSEIF = 1 << 13; -export const TRANSITION_IN = 1 << 1; -export const TRANSITION_OUT = 1 << 2; -export const TRANSITION_GLOBAL = 1 << 3; - export const UNINITIALIZED = Symbol(); export const STATE_SYMBOL = Symbol('$state'); diff --git a/packages/svelte/src/internal/client/dom/elements/transitions.js b/packages/svelte/src/internal/client/dom/elements/transitions.js index d940aaa6cc..2d7e73a179 100644 --- a/packages/svelte/src/internal/client/dom/elements/transitions.js +++ b/packages/svelte/src/internal/client/dom/elements/transitions.js @@ -1,12 +1,12 @@ import { noop } from '../../../common.js'; import { user_effect } from '../../reactivity/effects.js'; -import { current_block, current_effect, untrack } from '../../runtime.js'; +import { current_effect, untrack } from '../../runtime.js'; import { raf } from '../../timing.js'; import { loop } from '../../loop.js'; import { run_transitions } from '../../render.js'; -import { TRANSITION_GLOBAL, TRANSITION_IN, TRANSITION_OUT } from '../../constants.js'; import { is_function } from '../../utils.js'; import { current_each_item_block } from '../blocks/each.js'; +import { TRANSITION_GLOBAL, TRANSITION_IN, TRANSITION_OUT } from '../../../../constants.js'; /** * @template T