From 652da2c81b47ea35c0fd1fea026ad31c3ac65b8e Mon Sep 17 00:00:00 2001 From: Nic <162764842+Nic-Polumeyv@users.noreply.github.com> Date: Sun, 6 Sep 2026 19:44:42 -0400 Subject: [PATCH] css, script and options readers at the folder root; read/ is gone --- packages/svelte/src/compiler/index.js | 2 +- .../phases/1-parse/{read/style.js => css.js} | 4 ++-- .../svelte/src/compiler/phases/1-parse/index.js | 2 +- .../compiler/phases/1-parse/{read => }/options.js | 4 ++-- .../compiler/phases/1-parse/{read => }/script.js | 15 +++++++-------- .../src/compiler/phases/1-parse/state/element.js | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) rename packages/svelte/src/compiler/phases/1-parse/{read/style.js => css.js} (99%) rename packages/svelte/src/compiler/phases/1-parse/{read => }/options.js (98%) rename packages/svelte/src/compiler/phases/1-parse/{read => }/script.js (83%) diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js index f637179597..3f8d117ae9 100644 --- a/packages/svelte/src/compiler/index.js +++ b/packages/svelte/src/compiler/index.js @@ -4,7 +4,7 @@ import { walk as zimmerframe_walk } from 'zimmerframe'; import { convert } from './legacy.js'; import { parse as _parse, Parser } from './phases/1-parse/index.js'; -import { parse_stylesheet } from './phases/1-parse/read/style.js'; +import { parse_stylesheet } from './phases/1-parse/css.js'; import { analyze_component, analyze_module } from './phases/2-analyze/index.js'; import { transform_component, transform_module } from './phases/3-transform/index.js'; import { validate_component_options, validate_module_options } from './validate-options.js'; diff --git a/packages/svelte/src/compiler/phases/1-parse/read/style.js b/packages/svelte/src/compiler/phases/1-parse/css.js similarity index 99% rename from packages/svelte/src/compiler/phases/1-parse/read/style.js rename to packages/svelte/src/compiler/phases/1-parse/css.js index 574c353adb..71c9b8cd07 100644 --- a/packages/svelte/src/compiler/phases/1-parse/read/style.js +++ b/packages/svelte/src/compiler/phases/1-parse/css.js @@ -1,6 +1,6 @@ /** @import { AST } from '#compiler' */ -/** @import { Parser } from '../index.js' */ -import * as e from '../../../errors.js'; +/** @import { Parser } from './index.js' */ +import * as e from '../../errors.js'; const REGEX_MATCHER = /[~^$*|]?=/y; const REGEX_CLOSING_BRACKET = /[\s\]]/; diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js index f7e5e3e161..bfbf3c5d48 100644 --- a/packages/svelte/src/compiler/phases/1-parse/index.js +++ b/packages/svelte/src/compiler/phases/1-parse/index.js @@ -6,7 +6,7 @@ import fragment from './state/fragment.js'; import { value_names } from '../../utils/ast.js'; import * as e from '../../errors.js'; import { create_fragment } from './utils/create.js'; -import read_options from './read/options.js'; +import read_options from './options.js'; import { is_reserved } from '../../../utils.js'; import { disallow_children } from '../2-analyze/visitors/shared/special-element.js'; import * as state from '../../state.js'; diff --git a/packages/svelte/src/compiler/phases/1-parse/read/options.js b/packages/svelte/src/compiler/phases/1-parse/options.js similarity index 98% rename from packages/svelte/src/compiler/phases/1-parse/read/options.js rename to packages/svelte/src/compiler/phases/1-parse/options.js index 2677fb3b61..383b5948f7 100644 --- a/packages/svelte/src/compiler/phases/1-parse/read/options.js +++ b/packages/svelte/src/compiler/phases/1-parse/options.js @@ -1,7 +1,7 @@ /** @import { ObjectExpression } from 'estree' */ /** @import { AST } from '#compiler' */ -import { NAMESPACE_MATHML, NAMESPACE_SVG } from '../../../../constants.js'; -import * as e from '../../../errors.js'; +import { NAMESPACE_MATHML, NAMESPACE_SVG } from '../../../constants.js'; +import * as e from '../../errors.js'; /** * @param {AST.SvelteOptionsRaw} node diff --git a/packages/svelte/src/compiler/phases/1-parse/read/script.js b/packages/svelte/src/compiler/phases/1-parse/script.js similarity index 83% rename from packages/svelte/src/compiler/phases/1-parse/read/script.js rename to packages/svelte/src/compiler/phases/1-parse/script.js index 2b36d11fd4..d8e7464a28 100644 --- a/packages/svelte/src/compiler/phases/1-parse/read/script.js +++ b/packages/svelte/src/compiler/phases/1-parse/script.js @@ -1,11 +1,11 @@ /** @import { Program } from 'estree' */ /** @import { AST } from '#compiler' */ -/** @import { Parser } from '../index.js' */ -import { parse_script } from '../js.js'; -import * as e from '../../../errors.js'; -import * as w from '../../../warnings.js'; -import { is_text_attribute } from '../../../utils/ast.js'; -import { locator } from '../../../state.js'; +/** @import { Parser } from './index.js' */ +import { parse_script } from './js.js'; +import * as e from '../../errors.js'; +import * as w from '../../warnings.js'; +import { is_text_attribute } from '../../utils/ast.js'; +import { locator } from '../../state.js'; const regex_closing_script_tag = /<\/script\s*>/; const regex_starts_with_closing_script_tag = /<\/script\s*>/y; @@ -30,8 +30,7 @@ export function read_script(parser, start, attributes) { parser.read(regex_starts_with_closing_script_tag); if (ast.loc) { - // Acorn always uses `0` as the start of a `Program`, but for sourcemap purposes - // we need it to be the start of the `