diff --git a/.changeset/chatty-maps-enjoy.md b/.changeset/chatty-maps-enjoy.md new file mode 100644 index 0000000000..ad411a1372 --- /dev/null +++ b/.changeset/chatty-maps-enjoy.md @@ -0,0 +1,8 @@ +--- +"@marko/translator-interop-class-tags": patch +"marko": patch +"@marko/runtime-tags": patch +"@marko/compiler": patch +--- + +use tags/ instead of components/ for runtime-tags diff --git a/packages/compiler/src/taglib/finder/index.js b/packages/compiler/src/taglib/finder/index.js index 89c422725b..e666123c79 100644 --- a/packages/compiler/src/taglib/finder/index.js +++ b/packages/compiler/src/taglib/finder/index.js @@ -50,7 +50,7 @@ function getAllDependencyNames(pkg) { return Object.keys(map); } -function find(dirname, registeredTaglibs) { +function find(dirname, registeredTaglibs, tagDiscoveryDirs) { var found = findCache[dirname]; if (found) { return found; @@ -92,10 +92,14 @@ function find(dirname, registeredTaglibs) { } if (!taglib || taglib.tagsDir === undefined) { - const componentsPath = nodePath.join(curDirname, "components"); - - if (existsSync(componentsPath) && !excludedDirs[componentsPath]) { - helper.addTaglib(taglibLoader.loadTaglibFromDir(curDirname)); + for (const tagDiscoveryDir of tagDiscoveryDirs) { + const componentsPath = nodePath.join(curDirname, tagDiscoveryDir); + + if (existsSync(componentsPath) && !excludedDirs[componentsPath]) { + helper.addTaglib( + taglibLoader.loadTaglibFromDir(curDirname, tagDiscoveryDir), + ); + } } } } diff --git a/packages/compiler/src/taglib/index.js b/packages/compiler/src/taglib/index.js index 33fb64d409..d9ffa01952 100644 --- a/packages/compiler/src/taglib/index.js +++ b/packages/compiler/src/taglib/index.js @@ -45,7 +45,11 @@ export function buildLookup(dirname, requestedTranslator, onError) { } runAndCatchErrors(() => { - taglibsForDir = finder.find(dirname, taglibsForDir); + taglibsForDir = finder.find( + dirname, + taglibsForDir, + translator.tagDiscoveryDirs, + ); }, onError); const cacheKey = taglibsForDir diff --git a/packages/compiler/src/taglib/loader/index.js b/packages/compiler/src/taglib/loader/index.js index d84ead2a61..500424f65a 100644 --- a/packages/compiler/src/taglib/loader/index.js +++ b/packages/compiler/src/taglib/loader/index.js @@ -12,8 +12,8 @@ function loadTaglibFromFile(filePath, isFromPackageJson) { return loaders.loadTaglibFromFile(filePath, isFromPackageJson); } -function loadTaglibFromDir(filePath) { - return loaders.loadTaglibFromDir(filePath); +function loadTaglibFromDir(filePath, tagDiscoveryDir) { + return loaders.loadTaglibFromDir(filePath, tagDiscoveryDir); } function clearCache() { diff --git a/packages/compiler/src/taglib/loader/loadTaglibFromDir.js b/packages/compiler/src/taglib/loader/loadTaglibFromDir.js index 918f191699..4359ec4c3d 100644 --- a/packages/compiler/src/taglib/loader/loadTaglibFromDir.js +++ b/packages/compiler/src/taglib/loader/loadTaglibFromDir.js @@ -5,10 +5,10 @@ var DependencyChain = require("./DependencyChain"); var scanTagsDir = require("./scanTagsDir"); var types = require("./types"); -function loadFromDir(dir) { +function loadFromDir(dir, tagDiscoveryDir) { ok(dir, '"dir" is required'); - var componentsPath = nodePath.join(dir, "components"); + var componentsPath = nodePath.join(dir, tagDiscoveryDir); var taglib = cache.get(componentsPath); // Only load a taglib once by caching the loaded taglibs using the file @@ -19,7 +19,7 @@ function loadFromDir(dir) { scanTagsDir( componentsPath, dir, - "components", + tagDiscoveryDir, taglib, new DependencyChain([componentsPath]), ); diff --git a/packages/runtime-class/src/translator/index.js b/packages/runtime-class/src/translator/index.js index 352a158925..647815b586 100644 --- a/packages/runtime-class/src/translator/index.js +++ b/packages/runtime-class/src/translator/index.js @@ -31,6 +31,7 @@ import getComponentFiles from "./util/get-component-files"; import { optimizeHTMLWrites } from "./util/optimize-html-writes"; import { analyzeStaticVDOM } from "./util/optimize-vdom-create"; +export const tagDiscoveryDirs = ["components"]; export { optionalTaglibs, default as taglibs } from "./taglib"; export { entryBuilder as internalEntryBuilder } from "./util/add-dependencies"; diff --git a/packages/runtime-class/test/taglib-finder/fixtures/exports/test.js b/packages/runtime-class/test/taglib-finder/fixtures/exports/test.js index baab01d849..fda1a51cb4 100644 --- a/packages/runtime-class/test/taglib-finder/fixtures/exports/test.js +++ b/packages/runtime-class/test/taglib-finder/fixtures/exports/test.js @@ -2,7 +2,7 @@ var expect = require("chai").expect; exports.check = function (taglibFinder) { const discoveredTags = taglibFinder - .find(__dirname, []) + .find(__dirname, [], ["components"]) .flatMap((taglib) => Object.keys(taglib.tags)); expect(discoveredTags).to.include("included-tag"); diff --git a/packages/runtime-class/test/taglib-finder/fixtures/reset/test.js b/packages/runtime-class/test/taglib-finder/fixtures/reset/test.js index 301fe3ab91..f8bf5f19d0 100644 --- a/packages/runtime-class/test/taglib-finder/fixtures/reset/test.js +++ b/packages/runtime-class/test/taglib-finder/fixtures/reset/test.js @@ -5,7 +5,7 @@ exports.check = function (taglibFinder) { var finderDir = nodePath.join(__dirname, "a/b/c"); function getPaths() { - return taglibFinder.find(finderDir, []).map((taglib) => { + return taglibFinder.find(finderDir, [], ["components"]).map((taglib) => { return taglib.path; }); } diff --git a/packages/runtime-class/test/taglib-finder/index.test.js b/packages/runtime-class/test/taglib-finder/index.test.js index 41a413c9d5..683d458d34 100644 --- a/packages/runtime-class/test/taglib-finder/index.test.js +++ b/packages/runtime-class/test/taglib-finder/index.test.js @@ -25,13 +25,15 @@ autotest("fixtures", (fixture) => { } var finderDir = resolve(test.dir); - var found = taglibFinder.find(finderDir, []).map((taglib) => { - if (taglib.path.startsWith(dir)) { - return taglib.path.substring(dir.length).replace(/[\\]/g, "/"); - } else { - return "BAD:" + taglib.path; - } - }); + var found = taglibFinder + .find(finderDir, [], ["components"]) + .map((taglib) => { + if (taglib.path.startsWith(dir)) { + return taglib.path.substring(dir.length).replace(/[\\]/g, "/"); + } else { + return "BAD:" + taglib.path; + } + }); snapshot(found, ".json"); diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/components/custom-tag/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/tags/custom-tag/index.js similarity index 87% rename from packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/components/custom-tag/index.js rename to packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/tags/custom-tag/index.js index 65ce3e1cda..20fd005f9a 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/components/custom-tag/index.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/tags/custom-tag/index.js @@ -12,4 +12,4 @@ export const _pattern__ = /* @__PURE__ */_$.value("_pattern_", (_scope, _pattern }, () => _content_); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _pattern__(_scope, input.thing), () => _pattern__); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag/index.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag/index.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.js index 8b04276946..e31a8d0cc4 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = `${_customTag_template}`; export const _walks_ = /* beginChild, _customTag_walks, endChild */`D/${_customTag_walks}&`; -import { _setup_ as _customTag, _pattern__ as _customTag_input_thing, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag/index.marko"; +import { _setup_ as _customTag, _pattern__ as _customTag_input_thing, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag/index.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _thing_content2 = _$.register("__tests__/template.marko_2_renderer", /* @__PURE__ */_$.createRendererWithOwner("Goodbye", "")); const _thing_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("Hello", "")); diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/components/custom-tag/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js similarity index 85% rename from packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/components/custom-tag/index.js rename to packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js index ebe194f9d9..d194993143 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/components/custom-tag/index.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/tags/custom-tag/index.js @@ -15,4 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag/index.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js index c81e2b96e9..c5a61d499e 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _customTag from "./components/custom-tag/index.marko"; +import _customTag from "./tags/custom-tag/index.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const { diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/components/custom-tag/index.marko b/packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/tags/custom-tag/index.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/components/custom-tag/index.marko rename to packages/runtime-tags/src/__tests__/fixtures/at-tag-inside-if-tag/tags/custom-tag/index.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/components/hello/index.js deleted file mode 100644 index 115f0a03da..0000000000 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/components/hello/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as _$ from "@marko/runtime-tags/debug/html"; -const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { - const _scope0_id = _$.nextScopeId(); - _$.write("
"); -}); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js new file mode 100644 index 0000000000..d69052e921 --- /dev/null +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/tags/hello/index.js @@ -0,0 +1,6 @@ +import * as _$ from "@marko/runtime-tags/debug/html"; +const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { + const _scope0_id = _$.nextScopeId(); + _$.write("
"); +}); +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js index f0b5a3de24..783da43f16 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _hello from "./components/hello/index.marko"; +import _hello from "./tags/hello/index.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/components/hello/index.marko b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/tags/hello/index.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/components/hello/index.marko rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/tags/hello/index.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/components/hello/marko-tag.json b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/tags/hello/marko-tag.json similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/components/hello/marko-tag.json rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-and-static/tags/hello/marko-tag.json diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/components/hello/index.js deleted file mode 100644 index 115f0a03da..0000000000 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/components/hello/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as _$ from "@marko/runtime-tags/debug/html"; -const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { - const _scope0_id = _$.nextScopeId(); - _$.write("
"); -}); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js new file mode 100644 index 0000000000..d69052e921 --- /dev/null +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/tags/hello/index.js @@ -0,0 +1,6 @@ +import * as _$ from "@marko/runtime-tags/debug/html"; +const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { + const _scope0_id = _$.nextScopeId(); + _$.write("
"); +}); +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js index 1dbb8d5225..a7dbc85a8f 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _hello from "./components/hello/index.marko"; +import _hello from "./tags/hello/index.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const { diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/components/hello/index.marko b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/tags/hello/index.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/components/hello/index.marko rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/tags/hello/index.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/components/hello/marko-tag.json b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/tags/hello/marko-tag.json similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/components/hello/marko-tag.json rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic-with-params/tags/hello/marko-tag.json diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/components/hello/index.js deleted file mode 100644 index 115f0a03da..0000000000 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/components/hello/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as _$ from "@marko/runtime-tags/debug/html"; -const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { - const _scope0_id = _$.nextScopeId(); - _$.write("
"); -}); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js new file mode 100644 index 0000000000..d69052e921 --- /dev/null +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/tags/hello/index.js @@ -0,0 +1,6 @@ +import * as _$ from "@marko/runtime-tags/debug/html"; +const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { + const _scope0_id = _$.nextScopeId(); + _$.write("
"); +}); +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js index 63fcb3b4ad..a6b8208a4c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _hello from "./components/hello/index.marko"; +import _hello from "./tags/hello/index.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const _childScope = _$.peekNextScope(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/components/hello/index.marko b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/tags/hello/index.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/components/hello/index.marko rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/tags/hello/index.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/components/hello/marko-tag.json b/packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/tags/hello/marko-tag.json similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/components/hello/marko-tag.json rename to packages/runtime-tags/src/__tests__/fixtures/at-tags-dynamic/tags/hello/marko-tag.json diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/tags/hello/index.js similarity index 84% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/components/hello/index.js rename to packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/tags/hello/index.js index 5051aa8902..0f22760d28 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/components/hello/index.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/tags/hello/index.js @@ -7,4 +7,4 @@ const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _inpu export const _input_foo_ = /* @__PURE__ */_$.value("input_foo", (_scope, input_foo) => _dynamicTagName(_scope, input_foo), () => _dynamicTagName); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_foo_(_scope, input.foo), () => _input_foo_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.js index e848f19c81..d011005cb8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = `${_hello_template}`; export const _walks_ = /* beginChild, _hello_walks, endChild */`D/${_hello_walks}&D`; -import { _setup_ as _hello, _input_foo_ as _hello_input_foo, _template_ as _hello_template, _walks_ as _hello_walks } from "./components/hello/index.marko"; +import { _setup_ as _hello, _input_foo_ as _hello_input_foo, _template_ as _hello_template, _walks_ as _hello_walks } from "./tags/hello/index.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _foo_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("Foo!", "")); export function _setup_(_scope) { diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js similarity index 82% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/components/hello/index.js rename to packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js index f4231fbebc..1019115e01 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/components/hello/index.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/tags/hello/index.js @@ -9,4 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(input.foo) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js index cee30b4a27..c361b822b2 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/at-tags/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _hello from "./components/hello/index.marko"; +import _hello from "./tags/hello/index.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const _childScope = _$.peekNextScope(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/at-tags/components/hello/index.marko b/packages/runtime-tags/src/__tests__/fixtures/at-tags/tags/hello/index.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/at-tags/components/hello/index.marko rename to packages/runtime-tags/src/__tests__/fixtures/at-tags/tags/hello/index.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/tags/custom-tag.js similarity index 78% rename from packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/components/custom-tag.js rename to packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/tags/custom-tag.js index 75379cb93e..ac1319c1e2 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/components/custom-tag.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/tags/custom-tag.js @@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom"; export const _className_ = /* @__PURE__ */_$.value("className", (_scope, className) => _$.classAttr(_scope["#div/0"], className)); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _className_(_scope, input.class)); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js index 8a7ac26d0a..87c05246e3 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = `
${_customTag_template}${_customTag_template}`; export const _walks_ = /* get, over(3), beginChild, _customTag_walks, endChild, beginChild, _customTag_walks, endChild, replace, over(1) */` d/${_customTag_walks}&/${_customTag_walks}&%bD`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _customTag, _className_ as _customTag_input_class, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko"; +import { _setup_ as _customTag, _className_ as _customTag_input_class, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko"; const _test_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("Hello", "")); const _inputTest_input = _$.dynamicTagAttrs("#text/3"); const _expr_Text_c_d = /* @__PURE__ */_$.intersection(3, _scope => { diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js similarity index 75% rename from packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/components/custom-tag.js rename to packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js index 83b0c82979..ce96a685b0 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/components/custom-tag.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/tags/custom-tag.js @@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#div/0")}`); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js index 3e454f7325..e1815c1df0 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-class/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _customTag from "./components/custom-tag.marko"; +import _customTag from "./tags/custom-tag.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const { diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-class/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/attr-class/tags/custom-tag.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/attr-class/components/custom-tag.marko rename to packages/runtime-tags/src/__tests__/fixtures/attr-class/tags/custom-tag.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/tags/custom-tag.js similarity index 77% rename from packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/components/custom-tag.js rename to packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/tags/custom-tag.js index c9bd093fc4..a4691b8557 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/components/custom-tag.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/tags/custom-tag.js @@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom"; export const _style_ = /* @__PURE__ */_$.value("style", (_scope, style) => _$.styleAttr(_scope["#div/0"], style)); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _style_(_scope, input.style)); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/template.js index 9277ca3e65..39b3c3bdc3 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = `
${_customTag_template}${_customTag_template}${_customTag_template}`; export const _walks_ = /* get, over(3), beginChild, _customTag_walks, endChild, beginChild, _customTag_walks, endChild, beginChild, _customTag_walks, endChild, replace, over(1) */` d/${_customTag_walks}&/${_customTag_walks}&/${_customTag_walks}&%bD`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _customTag, _style_ as _customTag_input_style, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko"; +import { _setup_ as _customTag, _style_ as _customTag_input_style, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko"; const _test_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("Hello", "")); const _test_input = _$.dynamicTagAttrs("#text/4"); const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/4", _scope => _test_input(_scope, () => ({ diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js similarity index 74% rename from packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/components/custom-tag.js rename to packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js index 6d80077d32..c53ae3d620 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/components/custom-tag.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/tags/custom-tag.js @@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#div/0")}`); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js index eaf4430b3e..4177757e15 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/attr-style/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _customTag from "./components/custom-tag.marko"; +import _customTag from "./tags/custom-tag.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const { diff --git a/packages/runtime-tags/src/__tests__/fixtures/attr-style/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/attr-style/tags/custom-tag.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/attr-style/components/custom-tag.marko rename to packages/runtime-tags/src/__tests__/fixtures/attr-style/tags/custom-tag.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/tags/my-button.js similarity index 75% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/tags/my-button.js index 465343a1be..3c55cafe04 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/tags/my-button.js @@ -3,7 +3,7 @@ export const _walks_ = /* get, next(1), get, out(1) */" D l"; export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => _$.data(_scope["#text/1"], text)); -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); @@ -12,4 +12,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _text_(_scope, input.text); }); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.js index 2410888862..6c87daa2e8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = _myButton_template; export const _walks_ = /* beginChild, _myButton_walks, endChild */`/${_myButton_walks}&`; -import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko"; +import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => { _myButton_input_text(_scope["#childScope/0"], clickCount); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js similarity index 69% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js index 8d3eb3a9d3..563e3f8777 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/tags/my-button.js @@ -6,9 +6,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { text } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js index 13eff9f621..e103c10584 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md index 24b09a9459..3b8894c72b 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/resume.expected.md @@ -9,7 +9,7 @@ @@ -34,7 +34,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md index ce612ca0d1..abde917a87 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -13,7 +13,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-attrs/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/tags/my-button.js similarity index 75% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/tags/my-button.js index 465343a1be..659877f876 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/tags/my-button.js @@ -2,14 +2,14 @@ export const _template_ = ""; export const _walks_ = /* get, next(1), get, out(1) */" D l"; export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; -export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => _$.data(_scope["#text/1"], text)); -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); +export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => _$.data(_scope["#text/1"], text)); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { - _onClick_(_scope, input.onClick); _text_(_scope, input.text); + _onClick_(_scope, input.onClick); }); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.js index 2410888862..6c87daa2e8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = _myButton_template; export const _walks_ = /* beginChild, _myButton_walks, endChild */`/${_myButton_walks}&`; -import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko"; +import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => { _myButton_input_text(_scope["#childScope/0"], clickCount); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js similarity index 72% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js index b1e47843b0..50f13d6a8e 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/tags/my-button.js @@ -9,9 +9,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { onClick } = attrs; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js index 13eff9f621..e103c10584 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md index b832ff7094..36bf6f3f4d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/resume.expected.md @@ -9,7 +9,7 @@ @@ -34,7 +34,7 @@ container.querySelector("button").click() @@ -59,7 +59,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md index ce612ca0d1..abde917a87 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -13,7 +13,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/tags/my-button.js similarity index 80% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/tags/my-button.js index 61cca39c1c..2d89648435 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/tags/my-button.js @@ -10,7 +10,7 @@ export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => { _textAlias(_scope, text); }); export const _pattern__ = /* @__PURE__ */_$.value("_pattern_", (_scope, _pattern_) => _text_(_scope, _pattern_.text)); -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); @@ -19,4 +19,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _pattern__(_scope, input.value); }); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.js index 4b55dd191b..70c3e665d2 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = `${_myButton_template}${_myButton_template}`; export const _walks_ = /* beginChild, _myButton_walks, endChild, beginChild, _myButton_walks, endChild */`/${_myButton_walks}&/${_myButton_walks}&`; -import { _setup_ as _myButton, _pattern__ as _myButton_input_value, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks, _text_ as _myButton_input_value_text } from "./components/my-button.marko"; +import { _setup_ as _myButton, _pattern__ as _myButton_input_value, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks, _text_ as _myButton_input_value_text } from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => { _myButton_input_value(_scope["#childScope/0"], { diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js similarity index 76% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js index 3f44cf1988..878d2a7b6c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/tags/my-button.js @@ -13,9 +13,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { } } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js index ba4c299bd9..118a653f6f 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md index 704a78aeaa..2dee1c914c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/resume.expected.md @@ -22,7 +22,7 @@ @@ -60,7 +60,7 @@ container.querySelector("button").click() @@ -101,7 +101,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md index bd13d9174b..0549a8b6c9 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -26,7 +26,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias-within-pattern/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/tags/my-button.js similarity index 78% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/tags/my-button.js index 8f2e1ec1f2..0e9a849e3a 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/tags/my-button.js @@ -9,7 +9,7 @@ export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => { _$.data(_scope["#text/1"], text); _textAlias(_scope, text); }); -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); @@ -18,4 +18,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _text_(_scope, input.text); }); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.js index 2410888862..6c87daa2e8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = _myButton_template; export const _walks_ = /* beginChild, _myButton_walks, endChild */`/${_myButton_walks}&`; -import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko"; +import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => { _myButton_input_text(_scope["#childScope/0"], clickCount); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js similarity index 74% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js index 91858bbea4..dda3caa8a1 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/tags/my-button.js @@ -9,9 +9,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { text: textAlias } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js index 13eff9f621..e103c10584 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md index 74a04aaba7..2e558a9726 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/resume.expected.md @@ -13,7 +13,7 @@ @@ -42,7 +42,7 @@ container.querySelector("button").click() @@ -72,7 +72,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md index 13d280cc4c..a08c728d50 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -17,7 +17,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input-same-source-alias/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/tags/my-button.js similarity index 75% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/tags/my-button.js index 38e0d3987a..3c55cafe04 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input-alias/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/tags/my-button.js @@ -2,14 +2,14 @@ export const _template_ = ""; export const _walks_ = /* get, next(1), get, out(1) */" D l"; export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => _$.data(_scope["#text/1"], text)); +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); -export const _text_ = /* @__PURE__ */_$.value("text", (_scope, text) => _$.data(_scope["#text/1"], text)); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { - _text_(_scope, input.text); _onClick_(_scope, input.onClick); + _text_(_scope, input.text); }); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.js index 2410888862..6c87daa2e8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = _myButton_template; export const _walks_ = /* beginChild, _myButton_walks, endChild */`/${_myButton_walks}&`; -import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko"; +import { _setup_ as _myButton, _text_ as _myButton_input_text, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => { _myButton_input_text(_scope["#childScope/0"], clickCount); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js similarity index 69% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js index 8d3eb3a9d3..563e3f8777 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/tags/my-button.js @@ -6,9 +6,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { text } = input; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js index 13eff9f621..e103c10584 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md index b832ff7094..36bf6f3f4d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/resume.expected.md @@ -9,7 +9,7 @@ @@ -34,7 +34,7 @@ container.querySelector("button").click() @@ -59,7 +59,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md index ce612ca0d1..abde917a87 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -13,7 +13,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-input/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-input/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-input/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/tags/my-button.js similarity index 80% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/tags/my-button.js index a9190862d3..9f322ce329 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/tags/my-button.js @@ -5,7 +5,7 @@ import * as _$ from "@marko/runtime-tags/debug/dom"; const _content_input = _$.dynamicTagAttrs("#text/1"); const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/1", _scope => _content_input(_scope, () => ({})), () => _content_input); export const _content_ = /* @__PURE__ */_$.value("content", (_scope, content) => _dynamicTagName(_scope, content), () => _dynamicTagName); -const _onClick__effect = _$.effect("__tests__/components/my-button.marko_0_onClick", (_scope, { +const _onClick__effect = _$.effect("__tests__/tags/my-button.marko_0_onClick", (_scope, { onClick }) => _$.on(_scope["#button/0"], "click", onClick)); export const _onClick_ = /* @__PURE__ */_$.value("onClick", (_scope, onClick) => _onClick__effect(_scope)); @@ -14,4 +14,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _content_(_scope, input.content); }, () => _content_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js index ab7d637f7e..6b5a627b7f 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = _myButton_template; export const _walks_ = /* beginChild, _myButton_walks, endChild */`/${_myButton_walks}&`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _myButton, _content_ as _myButton_input_content, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./components/my-button.marko"; +import { _setup_ as _myButton, _content_ as _myButton_input_content, _onClick_ as _myButton_input_onClick, _template_ as _myButton_template, _walks_ as _myButton_walks } from "./tags/my-button.marko"; const _clickCount$myButton_content = _$.registerSubscriber("__tests__/template.marko_1_clickCount/subscriber", /* @__PURE__ */_$.dynamicClosure("clickCount", (_scope, clickCount) => _$.data(_scope["#text/0"], clickCount))); const _myButton_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner(" ", /* get */" ", void 0, () => [_clickCount$myButton_content])); const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => _myButton_input_onClick(_scope["#childScope/0"], _onClick(_scope)), () => _$.intersections([_$.inChild("#childScope/0", _myButton_input_onClick), _$.dynamicSubscribers("clickCount")])); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/components/my-button.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js similarity index 77% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/components/my-button.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js index 5531ee9d0d..9e510e4933 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/components/my-button.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/tags/my-button.js @@ -9,11 +9,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _dynamicScope = _$.peekNextScope(); _$.dynamicTagInput(_dynamicScope, content, {}); _$.write(`${_$.markResumeControlEnd(_scope0_id, "#text/1")}${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/my-button.marko_0_onClick"); + _$.writeEffect(_scope0_id, "__tests__/tags/my-button.marko_0_onClick"); _$.writeScope(_scope0_id, { "onClick": onClick, "#text/1!": _$.writeExistingScope(_dynamicScope), "#text/1(": _$.normalizeDynamicRenderer(content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/my-button.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/my-button.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js index ef11b6bfc7..e6f78dd1d6 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _myButton from "./components/my-button.marko"; +import _myButton from "./tags/my-button.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const clickCount = 0; diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md index daf8eb3ab7..915097d223 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/resume.expected.md @@ -11,7 +11,7 @@ @@ -38,7 +38,7 @@ container.querySelector("button").click() @@ -65,7 +65,7 @@ container.querySelector("button").click() @@ -92,7 +92,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md index cbc087fa3b..4ecb7b83dc 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -15,7 +15,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/tags/my-button.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/components/my-button.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component-renderBody/tags/my-button.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/tags/counter.js similarity index 70% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/components/counter.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/tags/counter.js index c8c49a2620..8ee7dbaa93 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/components/counter.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/tags/counter.js @@ -1,7 +1,7 @@ export const _template_ = ""; export const _walks_ = /* get, next(1), get, out(1) */" D l"; import * as _$ from "@marko/runtime-tags/debug/dom"; -const _clickCount_effect = _$.effect("__tests__/components/counter.marko_0_clickCount", (_scope, { +const _clickCount_effect = _$.effect("__tests__/tags/counter.marko_0_clickCount", (_scope, { clickCount }) => _$.on(_scope["#button/0"], "click", function () { _clickCount(_scope, clickCount + 1), clickCount; @@ -13,4 +13,4 @@ const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) = export function _setup_(_scope) { _clickCount(_scope, 0); } -export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.js index 852eec55c7..2a61ed2a61 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = `
${_counter_template}
`; export const _walks_ = /* next(1), beginChild, _counter_walks, endChild, out(1) */`D/${_counter_walks}&l`; -import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./components/counter.marko"; +import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./tags/counter.marko"; export function _setup_(_scope) { _counter(_scope["#childScope/0"]); } diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js similarity index 69% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/components/counter.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js index c5ebced896..825ab410eb 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/components/counter.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/tags/counter.js @@ -3,9 +3,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const clickCount = 0; _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_clickCount"); + _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_clickCount"); _$.writeScope(_scope0_id, { "clickCount": clickCount }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js index ac3acd86c2..f29868a7af 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _counter from "./components/counter.marko"; +import _counter from "./tags/counter.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); _$.write("
"); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md index 8ed2e6463f..f64c08b77a 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/resume.expected.md @@ -11,7 +11,7 @@
@@ -38,7 +38,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md index 77d335bc3f..2291c0d8ce 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-component/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write -
+
# Render "End" @@ -15,7 +15,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-component/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-component/tags/counter.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-component/components/counter.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-component/tags/counter.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/tags/comments.js similarity index 80% rename from packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/tags/comments.js index 73292ae3e0..fc6f8b53d0 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/components/comments.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/tags/comments.js @@ -20,7 +20,7 @@ const _comment_comments$if_content = /* @__PURE__ */_$.closure("comment_comments const _setup$if_content = _scope => { _setup_(_scope["#childScope/0"]); }; -const _if_content = _$.register("__tests__/components/comments.marko_2_renderer", /* @__PURE__ */_$.createRenderer(_comments_template, /* beginChild, _comments_walks, endChild */`/${_comments_walks}&`, _setup$if_content, () => [_id$if_content, _comment_comments$if_content])); +const _if_content = _$.register("__tests__/tags/comments.marko_2_renderer", /* @__PURE__ */_$.createRenderer(_comments_template, /* beginChild, _comments_walks, endChild */`/${_comments_walks}&`, _setup$if_content, () => [_id$if_content, _comment_comments$if_content])); const _expr_input_path_i$for_content = /* @__PURE__ */_$.intersection(2, _scope => { const { _: { @@ -31,7 +31,7 @@ const _expr_input_path_i$for_content = /* @__PURE__ */_$.intersection(2, _scope _id$for_content(_scope, `${input_path || "c"}-${i}`); }, () => _id$for_content); const _if$for_content = /* @__PURE__ */_$.conditional("#text/4", 0); -const _open$for_content_effect = _$.effect("__tests__/components/comments.marko_1_open", (_scope, { +const _open$for_content_effect = _$.effect("__tests__/tags/comments.marko_1_open", (_scope, { open }) => _$.on(_scope["#button/2"], "click", function () { _open$for_content(_scope, !open); @@ -57,7 +57,7 @@ const _input_path$for_content = /* @__PURE__ */_$.closure("input_path", 0, void const _setup$for_content = _scope => { _open$for_content(_scope, true); }; -const _for_content = _$.register("__tests__/components/comments.marko_1_renderer", /* @__PURE__ */_$.createRenderer("
    • ", /* get, next(2), get, out(1), get, next(1), get, out(1), replace */" E l D l%", _setup$for_content, () => [_input_path$for_content], () => _params_2$for_content)); +const _for_content = _$.register("__tests__/tags/comments.marko_1_renderer", /* @__PURE__ */_$.createRenderer("
    • ", /* get, next(2), get, out(1), get, next(1), get, out(1), replace */" E l D l%", _setup$for_content, () => [_input_path$for_content], () => _params_2$for_content)); const _for = /* @__PURE__ */_$.loopOf("#ul/0", _for_content); export const _input_path_ = /* @__PURE__ */_$.value("input_path", 0, () => _$.inLoopScope(_input_path$for_content, "#ul/0")); export const _input_comments_ = /* @__PURE__ */_$.value("input_comments", (_scope, input_comments) => _for(_scope, [input_comments]), () => _for); @@ -66,4 +66,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _input_path_(_scope, input.path); }, () => _$.intersections([_input_comments_, _input_path_])); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/comments.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/comments.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.js index edd8317362..675db0b2ea 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = _comments_template; export const _walks_ = /* beginChild, _comments_walks, endChild */`/${_comments_walks}&`; -import { _setup_ as _comments, _input_comments_ as _comments_input_comments, _input_path_ as _comments_input_path, _template_ as _comments_template, _walks_ as _comments_walks } from "./components/comments.marko"; +import { _setup_ as _comments, _input_comments_ as _comments_input_comments, _input_path_ as _comments_input_path, _template_ as _comments_template, _walks_ as _comments_walks } from "./tags/comments.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { const _comments_input_spread = input; diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js similarity index 88% rename from packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js index 21193c97ab..7d9e425b45 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/components/comments.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/tags/comments.js @@ -21,12 +21,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#childScope/0": _$.writeExistingScope(_childScope), "_": _$.ensureScopeWithId(_scope1_id) }); - _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/components/comments.marko_2_renderer"); + _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/tags/comments.marko_2_renderer"); _ifScopeId = _scope2_id; } _forScopeIds.push(_scope1_id); _$.write(`${_$.markResumeControlSingleNodeEnd(_scope1_id, "#text/4", _ifScopeId)}${_$.markResumeNode(_scope1_id, "#li/0")}`); - _$.writeEffect(_scope1_id, "__tests__/components/comments.marko_1_open"); + _$.writeEffect(_scope1_id, "__tests__/tags/comments.marko_1_open"); _$.writeScope(_scope1_id, { "comment_comments": comment?.comments, "i": i, @@ -44,4 +44,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#ul/0(": _scope1_.size ? _scope1_ : undefined }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/comments.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/comments.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js index 240a2a4a1b..447f829d8c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import _comments from "./components/comments.marko"; +import _comments from "./tags/comments.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md index 7b23b57a01..ce79746ab9 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/resume.expected.md @@ -57,7 +57,7 @@ @@ -131,7 +131,7 @@ container.querySelector(`#c-${id} > button`).click() @@ -205,7 +205,7 @@ container.querySelector(`#c-${id} > button`).click() @@ -280,7 +280,7 @@ container.querySelector(`#c-${id} > button`).click() @@ -356,7 +356,7 @@ container.querySelector(`#c-${id} > button`).click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md index 86cb21c72d..3e3829d847 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -61,7 +61,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/tags/comments.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/components/comments.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/tags/comments.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/components/layout.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/tags/layout.js similarity index 84% rename from packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/components/layout.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/tags/layout.js index 0b3ce07e1d..09e91858e1 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/components/layout.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/tags/layout.js @@ -7,4 +7,4 @@ const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _cont export const _content_ = /* @__PURE__ */_$.value("content", (_scope, content) => _dynamicTagName(_scope, content), () => _dynamicTagName); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _content_(_scope, input.content), () => _content_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/layout.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/layout.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js index 948ef23f15..367b9f9b35 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = _layout_template; export const _walks_ = /* beginChild, _layout_walks, endChild */`/${_layout_walks}&`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _layout, _content_ as _layout_input_content, _template_ as _layout_template, _walks_ as _layout_walks } from "./components/layout.marko"; +import { _setup_ as _layout, _content_ as _layout_input_content, _template_ as _layout_template, _walks_ as _layout_walks } from "./tags/layout.marko"; const _name$layout_content = _$.registerSubscriber("__tests__/template.marko_1_name/subscriber", /* @__PURE__ */_$.dynamicClosure("name", (_scope, name) => _$.data(_scope["#text/0"], name))); const _layout_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("

    Hello

    ", /* next(1), over(1), replace */"Db%", void 0, () => [_name$layout_content])); export const _name_ = /* @__PURE__ */_$.value("name", 0, () => _$.dynamicSubscribers("name")); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/components/layout.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js similarity index 85% rename from packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/components/layout.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js index 8713db010f..597d9bf33c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/components/layout.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/tags/layout.js @@ -13,4 +13,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/layout.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/layout.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js index c3cbd6fbff..0d6fda7dfd 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _layout from "./components/layout.marko"; +import _layout from "./tags/layout.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const { diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-layout/components/layout.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-layout/tags/layout.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-layout/components/layout.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-layout/tags/layout.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/tags/child.js similarity index 78% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/tags/child.js index ec26e1a329..f79ff9b027 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/tags/child.js @@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom"; export const _name_ = /* @__PURE__ */_$.value("name", (_scope, name) => _$.data(_scope["#text/0"], name)); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _name_(_scope, input.name)); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0])); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.js index 32577e3f47..04f18f7a87 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = ""; export const _walks_ = /* get, over(1), replace, over(1) */" b%bD"; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _child, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko"; +import { _setup_ as _child, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko"; const _expr_outer_inner$for_content = /* @__PURE__ */_$.intersection(2, _scope => { const { _: { diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js similarity index 75% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js index 5fcbfa9e2f..fd42097326 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/tags/child.js @@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { } = input; _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}
    `); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js index c74dc718d8..3609a4e3bb 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _child from "./components/child.marko"; +import _child from "./tags/child.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const items = [0, 1]; diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/tags/child.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/components/child.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-for/tags/child.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/tags/child.js similarity index 88% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/tags/child.js index bf2388d1f9..8486c72291 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/tags/child.js @@ -17,4 +17,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _value_(_scope, input.value); }, () => _$.intersections([_content_, _value_])); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.js index 9628ce0131..04d9a854c7 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = `${_child_template}`; export const _walks_ = /* get, over(1), beginChild, _child_walks, endChild */` b/${_child_walks}&`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _child, _content_ as _child_input_content, _value_ as _child_input_value, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko"; +import { _setup_ as _child, _content_ as _child_input_content, _value_ as _child_input_value, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko"; const _inner$child_content = /* @__PURE__ */_$.value("inner", (_scope, inner) => _$.data(_scope["#text/1"], inner)); const _outer$child_content = _$.registerSubscriber("__tests__/template.marko_2_outer/subscriber", /* @__PURE__ */_$.dynamicClosure("outer", (_scope, outer) => _$.data(_scope["#text/0"], outer))); const _params_3$child_content = /* @__PURE__ */_$.value("_params_3", (_scope, _params_3) => _inner$child_content(_scope, _params_3[0])); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js similarity index 85% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js index 07a775a3b1..378e317f92 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/tags/child.js @@ -15,4 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js index e8e2a88cc4..5b0ed73fc8 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _child from "./components/child.marko"; +import _child from "./tags/child.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const x = 1; diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/tags/child.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/components/child.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-params/tags/child.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/tags/child.js similarity index 85% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/tags/child.js index 5192d67b7b..bcfa85f54d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/tags/child.js @@ -7,4 +7,4 @@ const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _inpu export const _input_content_ = /* @__PURE__ */_$.value("input_content", (_scope, input_content) => _dynamicTagName(_scope, input_content), () => _dynamicTagName); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_content_(_scope, input.content), () => _input_content_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js index 66ef03579c..ad3f695c1c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = `${_child_template}`; export const _walks_ = /* beginChild, _child_walks, endChild */`D/${_child_walks}&D`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _child, _input_content_ as _child_input_content, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko"; +import { _setup_ as _child, _input_content_ as _child_input_content, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko"; const _count$child_content_effect = _$.effect("__tests__/template.marko_1_count", (_scope, { _: { count diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js similarity index 83% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js index 55112b8cd7..af39654187 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/tags/child.js @@ -9,4 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(input.content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js index 5efc50c232..4c86a4e9bc 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _child from "./components/child.marko"; +import _child from "./tags/child.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const count = 0; diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/tags/child.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/components/child.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-custom-tag/tags/child.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/tags/child.js similarity index 85% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/tags/child.js index 5192d67b7b..bcfa85f54d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/tags/child.js @@ -7,4 +7,4 @@ const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _inpu export const _input_content_ = /* @__PURE__ */_$.value("input_content", (_scope, input_content) => _dynamicTagName(_scope, input_content), () => _dynamicTagName); export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_content_(_scope, input.content), () => _input_content_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js index 30ae17c3f2..d008442a15 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/dom.expected/template.js @@ -1,6 +1,6 @@ export const _template_ = ""; export const _walks_ = /* replace, over(1) */"D%bD"; -import Child from "./components/child.marko"; +import Child from "./tags/child.marko"; import * as _$ from "@marko/runtime-tags/debug/dom"; const _count$falseChild_content_effect = _$.effect("__tests__/template.marko_1_count", (_scope, { _: { diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js similarity index 83% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js index 55112b8cd7..af39654187 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/tags/child.js @@ -9,4 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { "#text/0(": _$.normalizeDynamicRenderer(input.content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js index 74eba1c2f9..5afb3710db 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/html.expected/template.js @@ -1,4 +1,4 @@ -import Child from "./components/child.marko"; +import Child from "./tags/child.marko"; import * as _$ from "@marko/runtime-tags/debug/html"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md index 4fb9e58b6c..ba1afa44d6 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/resume.expected.md @@ -13,7 +13,7 @@ @@ -45,7 +45,7 @@ container.querySelector("button").click() @@ -74,7 +74,7 @@ container.querySelector("button").click() @@ -103,7 +103,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md index f59a66585f..39c002c333 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -17,7 +17,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/tags/child.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/components/child.marko rename to packages/runtime-tags/src/__tests__/fixtures/basic-nested-scope-dynamic-tag/tags/child.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/components/FancyButton.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/tags/FancyButton.js similarity index 77% rename from packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/components/FancyButton.js rename to packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/tags/FancyButton.js index a63a9b97ef..1057ea3a1c 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/components/FancyButton.js +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/tags/FancyButton.js @@ -4,7 +4,7 @@ export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; const _content_input = _$.dynamicTagAttrs("#text/1"); const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/1", _scope => _content_input(_scope, () => ({})), () => _content_input); -const _attrs__effect = _$.effect("__tests__/components/FancyButton.marko_0_attrs", _scope => _$.attrsEvents(_scope, "#button/0")); +const _attrs__effect = _$.effect("__tests__/tags/FancyButton.marko_0_attrs", _scope => _$.attrsEvents(_scope, "#button/0")); export const _attrs_ = (_scope, attrs) => { _$.attrs(_scope, "#button/0", attrs); _attrs__effect(_scope); @@ -15,4 +15,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _content_(_scope, input.content); }, () => _content_); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/FancyButton.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/FancyButton.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js index 835b6a91ae..ea55b0bd35 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = _FancyButton_template; export const _walks_ = /* beginChild, _FancyButton_walks, endChild */`/${_FancyButton_walks}&`; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _FancyButton, _input_ as _FancyButton_input, _template_ as _FancyButton_template, _walks_ as _FancyButton_walks } from "./components/FancyButton.marko"; +import { _setup_ as _FancyButton, _input_ as _FancyButton_input, _template_ as _FancyButton_template, _walks_ as _FancyButton_walks } from "./tags/FancyButton.marko"; const _clickCount$FancyButton_content = _$.registerSubscriber("__tests__/template.marko_1_clickCount/subscriber", /* @__PURE__ */_$.dynamicClosure("clickCount", (_scope, clickCount) => _$.data(_scope["#text/0"], clickCount))); const _FancyButton_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner(" ", /* get */" ", void 0, () => [_clickCount$FancyButton_content])); const _clickCount = /* @__PURE__ */_$.state("clickCount", (_scope, clickCount) => _FancyButton_input(_scope["#childScope/0"], { diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/components/FancyButton.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js similarity index 78% rename from packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/components/FancyButton.js rename to packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js index 899462501d..3d9e684256 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/components/FancyButton.js +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/tags/FancyButton.js @@ -9,11 +9,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _dynamicScope = _$.peekNextScope(); _$.dynamicTagInput(_dynamicScope, content, {}); _$.write(`${_$.markResumeControlEnd(_scope0_id, "#text/1")}${_$.markResumeNode(_scope0_id, "#button/0")}`); - _$.writeEffect(_scope0_id, "__tests__/components/FancyButton.marko_0_attrs"); + _$.writeEffect(_scope0_id, "__tests__/tags/FancyButton.marko_0_attrs"); _$.writeScope(_scope0_id, { "attrs": attrs, "#text/1!": _$.writeExistingScope(_dynamicScope), "#text/1(": _$.normalizeDynamicRenderer(content) }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/FancyButton.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/FancyButton.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js index ef0c49b458..204fdf78ef 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _FancyButton from "./components/FancyButton.marko"; +import _FancyButton from "./tags/FancyButton.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const clickCount = 0; diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md index ca7b59700d..a4a800188d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/resume.expected.md @@ -11,7 +11,7 @@ @@ -38,7 +38,7 @@ container.querySelector("button").click() @@ -65,7 +65,7 @@ container.querySelector("button").click() @@ -92,7 +92,7 @@ container.querySelector("button").click() diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md index 1dc7610009..d4bdd4ca78 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/body-content/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write - + # Render "End" @@ -15,7 +15,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko b/packages/runtime-tags/src/__tests__/fixtures/body-content/tags/FancyButton.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/body-content/components/FancyButton.marko rename to packages/runtime-tags/src/__tests__/fixtures/body-content/tags/FancyButton.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/tags/child.js similarity index 83% rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/tags/child.js index 4163776d70..4a11533863 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/tags/child.js @@ -2,7 +2,7 @@ export const _template_ = "

    "; export const _walks_ = /* next(1), get, out(1), next(1), get, out(1), next(1), get, out(1) */"D lD lD l"; export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; -const _expr_name_write_effect = _$.effect("__tests__/components/child.marko_0_name_write", (_scope, { +const _expr_name_write_effect = _$.effect("__tests__/tags/child.marko_0_name_write", (_scope, { name, write }) => { @@ -30,4 +30,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _write_(_scope, input.write); }, () => _$.intersections([_name_, _write_])); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.js index 1578e39505..90021c5399 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = "
    "; export const _walks_ = /* get, over(1), get, over(1), replace, over(1) */" b b%bD"; import * as _$ from "@marko/runtime-tags/debug/dom"; -import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko"; +import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko"; const _write$for_content = /* @__PURE__ */_$.closure("write", (_scope, write) => _child_input_write(_scope["#childScope/0"], write), void 0, () => _$.inChild("#childScope/0", _child_input_write)); const _item$for_content = /* @__PURE__ */_$.value("item", (_scope, item) => _child_input_name(_scope["#childScope/0"], item), () => _$.inChild("#childScope/0", _child_input_name)); const _params_2$for_content = /* @__PURE__ */_$.value("_params_2", (_scope, _params_2) => _item$for_content(_scope, _params_2[0]), () => _item$for_content); diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js similarity index 76% rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js index ce862752b0..5159beda5d 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/tags/child.js @@ -6,10 +6,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { write } = input; _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/1")}

    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/2")}

    ${_$.markResumeCleanup(_scope0_id)}`); - _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_name_write"); + _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_name_write"); _$.writeScope(_scope0_id, { "name": name, "write": write }); }); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js index 5a3f58a3be..cf1b09aba7 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/html.expected/template.js @@ -1,5 +1,5 @@ import * as _$ from "@marko/runtime-tags/debug/html"; -import _child from "./components/child.marko"; +import _child from "./tags/child.marko"; const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => { const _scope0_id = _$.nextScopeId(); const items = [1, 2, 3]; diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md index d8c517e910..64556a7736 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/resume.expected.md @@ -58,7 +58,7 @@ mounted 3 @@ -124,7 +124,7 @@ destroyed 3 @@ -179,7 +179,7 @@ destroyed 2 @@ -222,7 +222,7 @@ destroyed 1 @@ -296,7 +296,7 @@ mounted 3 diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md index f4d8b8c450..393accbae5 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/__snapshots__/ssr.expected.md @@ -1,5 +1,5 @@ # Write -
    1
    1

    1

    2
    2

    2

    3
    3

    3

    +
    1
    1

    1

    2
    2

    2

    3
    3

    3

    # Render "End" @@ -57,7 +57,7 @@ diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/tags/child.marko similarity index 100% rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/components/child.marko rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-for-shallow/tags/child.marko diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/tags/child.js similarity index 83% rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/components/child.js rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/tags/child.js index 51ca16fe62..ee397d97e5 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/components/child.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/tags/child.js @@ -2,7 +2,7 @@ export const _template_ = "
    a
    a

    a

    "; export const _walks_ = /* next(1), replace, out(1), next(1), replace, out(1), next(1), replace, out(1) */"D%lD%lD%l"; export const _setup_ = () => {}; import * as _$ from "@marko/runtime-tags/debug/dom"; -const _expr_name_write_effect = _$.effect("__tests__/components/child.marko_0_name_write", (_scope, { +const _expr_name_write_effect = _$.effect("__tests__/tags/child.marko_0_name_write", (_scope, { name, write }) => { @@ -30,4 +30,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => { _write_(_scope, input.write); }, () => _$.intersections([_name_, _write_])); export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_); -export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file +export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__); \ No newline at end of file diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.js index a45e34a4a1..1e477d3522 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.js +++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/dom.expected/template.js @@ -1,7 +1,7 @@ export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), get, over(1), get, over(1), replace, over(1) */" b b b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _write$if_content3 = /* @__PURE__ */_$.dynamicClosure("write", (_scope, write) => _child_input_write(_scope["#childScope/0"], write), _scope => _scope._._._, () => _$.inChild("#childScope/0", _child_input_write));
 const _setup$if_content3 = _scope => {
   _child(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
similarity index 76%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
index 5fe583672f..81850f80e0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/tags/child.js
@@ -6,10 +6,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     write
   } = input;
   _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")} a
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/1")} a
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/2")} a
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_name_write");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_name_write");
   _$.writeScope(_scope0_id, {
     "name": name,
     "write": write
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
index 118647d547..24b8eb0f9e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const showOuter = true;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
index 8b92a1df05..a10a29f892 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/resume.expected.md
@@ -85,7 +85,7 @@ Inner mounted
     
     
     
   
 
@@ -175,7 +175,7 @@ Inner destroyed
     
     
     
   
 
@@ -249,7 +249,7 @@ Middle destroyed
     
     
     
   
 
@@ -302,7 +302,7 @@ Outer destroyed
     
     
     
   
 
@@ -355,7 +355,7 @@ Outer destroyed
     
     
     
   
 
@@ -404,7 +404,7 @@ Outer destroyed
     
     
     
   
 
@@ -486,7 +486,7 @@ Inner mounted
       
     
     
   
 
@@ -554,7 +554,7 @@ Inner destroyed
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
index 4ad21aacea..26319f34e6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Outer a
    Outer a
    Outer a
    Middle a
    Middle a
    Middle a
    Inner a
    Inner a
    Inner a
    
+  
    Outer a
    Outer a
    Outer a
    Middle a
    Middle a
    Middle a
    Inner a
    Inner a
    Inner a
    
 
 
 # Render "End"
@@ -84,7 +84,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-deep/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/tags/child.js
similarity index 71%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/tags/child.js
index 292e643b99..ad37ae3d4d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/tags/child.js
@@ -2,7 +2,7 @@ export const _template_ = "
    a
    b
    c
    ";
 export const _walks_ = /* over(3) */"d";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _input__effect = _$.effect("__tests__/components/child.marko_0_input", (_scope, {
+const _input__effect = _$.effect("__tests__/tags/child.marko_0_input", (_scope, {
   input
 }) => {
   input.write('mounted');
@@ -15,4 +15,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _input__effect(_scope);
 });
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.js
index 3ce8c2a085..e04b1d1653 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), replace, over(1) */" b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _setup$if_content = _scope => {
   _child(_scope["#childScope/0"]);
   _child_input(_scope["#childScope/0"], {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
similarity index 64%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
index 7c4f95f1ca..177c72c514 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/tags/child.js
@@ -2,9 +2,9 @@ import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`
    a
    b
    c
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_input");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_input");
   _$.writeScope(_scope0_id, {
     "input": input
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
index 3863f4b623..990dc45c83 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const show = true;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
index 26f55acce4..f36ae887f2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
     
     
     
   
 
@@ -54,7 +54,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -99,7 +99,7 @@ container.querySelector("button").click()
     
    
     
     
   
 
@@ -134,7 +134,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
index bdbd18763a..a4b1862010 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    a
    b
    c
    
+  
    a
    b
    c
    
 
 
 # Render "End"
@@ -26,7 +26,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-n-child-if-shallow/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/tags/child.js
similarity index 80%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/tags/child.js
index df79cff46f..60ed4d2cee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/tags/child.js
@@ -2,7 +2,7 @@ export const _template_ = "
     
    ";
 export const _walks_ = /* next(1), get, out(1) */"D l";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _expr_name_write_effect = _$.effect("__tests__/components/child.marko_0_name_write", (_scope, {
+const _expr_name_write_effect = _$.effect("__tests__/tags/child.marko_0_name_write", (_scope, {
   name,
   write
 }) => (_$.getAbortSignal(_scope, 0).onabort = () => {
@@ -23,4 +23,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _write_(_scope, input.write);
 }, () => _$.intersections([_name_, _write_]));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.js
index 2adb012944..4bd6399621 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), replace, over(1) */" b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _expr_outerItem_middleItem$for_content = /* @__PURE__ */_$.intersection(2, _scope => {
   const {
     _: {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
index c80f077cd1..25c008434a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/tags/child.js
@@ -6,10 +6,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     write
   } = input;
   _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_name_write");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_name_write");
   _$.writeScope(_scope0_id, {
     "name": name,
     "write": write
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
index a0cfa2d581..6719da63aa 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const items = [1, 2, 3];
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
index 5a4a7dd78d..49c619f956 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/resume.expected.md
@@ -98,7 +98,7 @@
     
     
     
   
 
@@ -177,7 +177,7 @@ destroyed 2.3
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
index a1edc70f27..eaa44416a3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    1
    1.1
    1.2
    1.3
    2
    2.1
    2.2
    2.3
    3
    3.1
    3.2
    3.3
    
+  
    1
    1.1
    1.2
    1.3
    2
    2.1
    2.2
    2.3
    3
    3.1
    3.2
    3.3
    
 
 
 # Render "End"
@@ -102,7 +102,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/tags/child.js
similarity index 81%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/tags/child.js
index 778b8a4dc8..f2c037cfb3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/tags/child.js
@@ -2,7 +2,7 @@ export const _template_ = "
     
    ";
 export const _walks_ = /* next(1), get, out(1) */"D l";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _expr_name_write_effect = _$.effect("__tests__/components/child.marko_0_name_write", (_scope, {
+const _expr_name_write_effect = _$.effect("__tests__/tags/child.marko_0_name_write", (_scope, {
   name,
   write
 }) => {
@@ -26,4 +26,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _write_(_scope, input.write);
 }, () => _$.intersections([_name_, _write_]));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.js
index 1578e39505..90021c5399 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), replace, over(1) */" b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _write$for_content = /* @__PURE__ */_$.closure("write", (_scope, write) => _child_input_write(_scope["#childScope/0"], write), void 0, () => _$.inChild("#childScope/0", _child_input_write));
 const _item$for_content = /* @__PURE__ */_$.value("item", (_scope, item) => _child_input_name(_scope["#childScope/0"], item), () => _$.inChild("#childScope/0", _child_input_name));
 const _params_2$for_content = /* @__PURE__ */_$.value("_params_2", (_scope, _params_2) => _item$for_content(_scope, _params_2[0]), () => _item$for_content);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
index c80f077cd1..25c008434a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-deep/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/tags/child.js
@@ -6,10 +6,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     write
   } = input;
   _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_name_write");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_name_write");
   _$.writeScope(_scope0_id, {
     "name": name,
     "write": write
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
index 178defbcdb..8d8906660f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const items = [1, 2, 3];
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
index 977819b14a..23547f8605 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/resume.expected.md
@@ -31,7 +31,7 @@ mounted 3
     
     
     
   
 
@@ -79,7 +79,7 @@ destroyed 3
     
     
     
   
 
@@ -122,7 +122,7 @@ destroyed 2
     
     
     
   
 
@@ -162,7 +162,7 @@ destroyed 1
     
     
     
   
 
@@ -215,7 +215,7 @@ mounted 3
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
index e463acbe5b..50e772d4d5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    1
    2
    3
    
+  
    1
    2
    3
    
 
 
 # Render "End"
@@ -30,7 +30,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-for-shallow/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/tags/child.js
similarity index 81%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/tags/child.js
index 31c6b70c2b..f12be81a4b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/tags/child.js
@@ -2,7 +2,7 @@ export const _template_ = "
     
    ";
 export const _walks_ = /* next(1), get, out(1) */"D l";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _expr_name_write_effect = _$.effect("__tests__/components/child.marko_0_name_write", (_scope, {
+const _expr_name_write_effect = _$.effect("__tests__/tags/child.marko_0_name_write", (_scope, {
   name,
   write
 }) => {
@@ -26,4 +26,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _write_(_scope, input.write);
 }, () => _$.intersections([_name_, _write_]));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.js
index a45e34a4a1..1e477d3522 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), get, over(1), get, over(1), replace, over(1) */" b b b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _write_ as _child_input_write, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _write$if_content3 = /* @__PURE__ */_$.dynamicClosure("write", (_scope, write) => _child_input_write(_scope["#childScope/0"], write), _scope => _scope._._._, () => _$.inChild("#childScope/0", _child_input_write));
 const _setup$if_content3 = _scope => {
   _child(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
index e85acfd495..fee020dcad 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/tags/child.js
@@ -6,10 +6,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     write
   } = input;
   _$.write(`
    ${_$.escapeXML(name)}${_$.markResumeNode(_scope0_id, "#text/0")}
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_name_write");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_name_write");
   _$.writeScope(_scope0_id, {
     "name": name,
     "write": write
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
index ed1c605f66..fc6d5da190 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const showOuter = true;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
index 8b7282b46b..2a1f0b6227 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/resume.expected.md
@@ -51,7 +51,7 @@ Inner mounted
     
     
     
   
 
@@ -119,7 +119,7 @@ Inner destroyed
     
     
     
   
 
@@ -179,7 +179,7 @@ Middle destroyed
     
     
     
   
 
@@ -232,7 +232,7 @@ Outer destroyed
     
     
     
   
 
@@ -285,7 +285,7 @@ Outer destroyed
     
     
     
   
 
@@ -334,7 +334,7 @@ Outer destroyed
     
     
     
   
 
@@ -398,7 +398,7 @@ Inner mounted
       
     
     
   
 
@@ -464,7 +464,7 @@ Inner destroyed
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
index 1335ab2c78..f56bf08775 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Outer
    Middle
    Inner
    
+  
    Outer
    Middle
    Inner
    
 
 
 # Render "End"
@@ -50,7 +50,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-deep/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/tags/child.js
similarity index 71%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/tags/child.js
index cf632f00fa..8883ea9b58 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/tags/child.js
@@ -2,7 +2,7 @@ export const _template_ = "
    child
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _input__effect = _$.effect("__tests__/components/child.marko_0_input", (_scope, {
+const _input__effect = _$.effect("__tests__/tags/child.marko_0_input", (_scope, {
   input
 }) => {
   input.write('mounted');
@@ -15,4 +15,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _input__effect(_scope);
 });
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.js
index 3ce8c2a085..e04b1d1653 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "
    ";
 export const _walks_ = /* get, over(1), get, over(1), replace, over(1) */" b b%bD";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 const _setup$if_content = _scope => {
   _child(_scope["#childScope/0"]);
   _child_input(_scope["#childScope/0"], {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
similarity index 63%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
index ef4649cb16..204f4c8026 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/tags/child.js
@@ -2,9 +2,9 @@ import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`
    child
    ${_$.markResumeCleanup(_scope0_id)}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_input");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_input");
   _$.writeScope(_scope0_id, {
     "input": input
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
index 03abf53c3f..9502746f8b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const show = true;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
index f2aa4fc568..e576959597 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     
     
     
   
 
@@ -47,7 +47,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -83,7 +83,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -116,7 +116,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
index 7dba4e94e8..6b53548226 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    child
    
+  
    child
    
 
 
 # Render "End"
@@ -19,7 +19,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/cleanup-single-child-if-shallow/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/tags/counter.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/tags/counter.js
index 0ac042826c..af1968d6c2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/tags/counter.js
@@ -8,7 +8,7 @@ const _expr_input_count = /* @__PURE__ */_$.intersection(2, _scope => {
   } = _scope;
   _$.data(_scope["#text/1"], input.format(count));
 });
-const _count_effect = _$.effect("__tests__/components/counter.marko_0_count", (_scope, {
+const _count_effect = _$.effect("__tests__/tags/counter.marko_0_count", (_scope, {
   count
 }) => _$.on(_scope["#button/0"], "click", function () {
   _count(_scope, count + 1), count;
@@ -19,4 +19,4 @@ export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_)
 export function _setup_(_scope) {
   _count(_scope, 0);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/template.js
index bdef51cba2..f4e5ec0df9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = _counter_template;
 export const _walks_ = /* beginChild, _counter_walks, endChild */`/${_counter_walks}&`;
 import { formatNumber } from "./helpers";
-import { _setup_ as _counter, _input_ as _counter_input, _template_ as _counter_template, _walks_ as _counter_walks } from "./components/counter.marko";
+import { _setup_ as _counter, _input_ as _counter_input, _template_ as _counter_template, _walks_ as _counter_walks } from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 export function _setup_(_scope) {
   _counter(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
index 8df3fecb28..0732e8c081 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/tags/counter.js
@@ -3,10 +3,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_count");
+  _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_count");
   _$.writeScope(_scope0_id, {
     "input": input,
     "count": count
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
index 75cbee39de..a16ee633e8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import { formatNumber } from "./helpers";
-import _counter from "./components/counter.marko";
+import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
index 1a26a95225..0e15742fae 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
+  
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/tags/counter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/components/counter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-import-value/tags/counter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/components/display-intersection.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/tags/display-intersection.js
similarity index 83%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/components/display-intersection.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/tags/display-intersection.js
index a87f7e8d56..cbc0376266 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/components/display-intersection.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/tags/display-intersection.js
@@ -15,4 +15,4 @@ export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_)
 export function _setup_(_scope) {
   _dummy(_scope, {});
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/display-intersection.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/display-intersection.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.js
index 997d61fbfe..cf929950cb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_displayIntersection_template}`;
 export const _walks_ = /* beginChild, _displayIntersection_walks, endChild, get, over(1) */`/${_displayIntersection_walks}& b`;
-import { _setup_ as _displayIntersection, _value_ as _displayIntersection_input_value, _template_ as _displayIntersection_template, _walks_ as _displayIntersection_walks } from "./components/display-intersection.marko";
+import { _setup_ as _displayIntersection, _value_ as _displayIntersection_input_value, _template_ as _displayIntersection_template, _walks_ as _displayIntersection_walks } from "./tags/display-intersection.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _count_effect = _$.effect("__tests__/template.marko_0_count", (_scope, {
   count
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/components/display-intersection.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/components/display-intersection.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
index fbdd4da58b..a402dc0938 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/components/display-intersection.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/tags/display-intersection.js
@@ -11,4 +11,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "dummy": dummy
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/display-intersection.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/display-intersection.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
index 8d3065c3dc..c9e2ea3a48 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _displayIntersection from "./components/display-intersection.marko";
+import _displayIntersection from "./tags/display-intersection.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/components/display-intersection.marko b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/tags/display-intersection.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/components/display-intersection.marko
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-intersection/tags/display-intersection.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/tags/counter.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/tags/counter.js
index 0ac042826c..af1968d6c2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/tags/counter.js
@@ -8,7 +8,7 @@ const _expr_input_count = /* @__PURE__ */_$.intersection(2, _scope => {
   } = _scope;
   _$.data(_scope["#text/1"], input.format(count));
 });
-const _count_effect = _$.effect("__tests__/components/counter.marko_0_count", (_scope, {
+const _count_effect = _$.effect("__tests__/tags/counter.marko_0_count", (_scope, {
   count
 }) => _$.on(_scope["#button/0"], "click", function () {
   _count(_scope, count + 1), count;
@@ -19,4 +19,4 @@ export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_)
 export function _setup_(_scope) {
   _count(_scope, 0);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.js
index 53debe9242..93b41a8447 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/dom.expected/template.js
@@ -2,7 +2,7 @@ export const _template_ = `${_counter_template}${_counter_template}`;
 export const _walks_ = /* beginChild, _counter_walks, endChild, beginChild, _counter_walks, endChild */`/${_counter_walks}&/${_counter_walks}&`;
 const formatNumber = _formatNumber;
 const formatNumber2 = _formatNumber2;
-import { _setup_ as _counter, _input_ as _counter_input, _template_ as _counter_template, _walks_ as _counter_walks } from "./components/counter.marko";
+import { _setup_ as _counter, _input_ as _counter_input, _template_ as _counter_template, _walks_ as _counter_walks } from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 export function _setup_(_scope) {
   _counter(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
index 8df3fecb28..0732e8c081 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/tags/counter.js
@@ -3,10 +3,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_count");
+  _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_count");
   _$.writeScope(_scope0_id, {
     "input": input,
     "count": count
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
index 92b6cd93d8..c849845ee1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/html.expected/template.js
@@ -5,7 +5,7 @@ function formatNumber2(n) {
   return "$" + n.toFixed(2);
 }
 _$.register(formatNumber2, "__tests__/template.marko_0/formatNumber2");
-import _counter from "./components/counter.marko";
+import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
index 25f225b09e..4bc290dbf3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     
     
     
   
 
@@ -44,7 +44,7 @@ container.querySelectorAll("button").forEach(button => button.click())
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
index 35c1375af5..1935c433b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
+  
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/tags/counter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/components/counter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/component-attrs-static-code/tags/counter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/components/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/tags/checkbox.js
similarity index 63%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/components/checkbox.js
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/tags/checkbox.js
index fe8da7bed2..26aebb525c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/components/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/tags/checkbox.js
@@ -2,7 +2,7 @@ export const _template_ = "";
 export const _walks_ = /* get, over(1) */" b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _input__effect = _$.effect("__tests__/components/checkbox.marko_0_input", _scope => _$.attrsEvents(_scope, "#input/0"));
+const _input__effect = _$.effect("__tests__/tags/checkbox.marko_0_input", _scope => _$.attrsEvents(_scope, "#input/0"));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _$.attrs(_scope, "#input/0", {
     type: "checkbox",
@@ -11,4 +11,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _input__effect(_scope);
 });
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/checkbox.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.js
index 6d8b55d004..95df084132 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_checkbox_template} `;
 export const _walks_ = /* beginChild, _checkbox_walks, endChild, next(1), get, out(1) */`/${_checkbox_walks}&D l`;
-import { _setup_ as _checkbox, _input_ as _checkbox_input, _template_ as _checkbox_template, _walks_ as _checkbox_walks } from "./components/checkbox.marko";
+import { _setup_ as _checkbox, _input_ as _checkbox_input, _template_ as _checkbox_template, _walks_ as _checkbox_walks } from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _checked = /* @__PURE__ */_$.state("checked", (_scope, checked) => {
   _$.data(_scope["#text/1"], String(checked));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/components/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/components/checkbox.js
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
index e6f2f11d58..32b623543b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/components/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/tags/checkbox.js
@@ -5,9 +5,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     type: "checkbox",
     ...input
   }, "#input/0", _scope0_id, "input")}>${_$.markResumeNode(_scope0_id, "#input/0")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/checkbox.marko_0_input");
+  _$.writeEffect(_scope0_id, "__tests__/tags/checkbox.marko_0_input");
   _$.writeScope(_scope0_id, {
     "input": input
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/checkbox.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
index e90e3bf927..b30ce38579 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _checkbox from "./components/checkbox.marko";
+import _checkbox from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
index bb216e09b9..e3a0b6cd14 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/resume.expected.md
@@ -12,7 +12,7 @@
       
     
     
   
 
@@ -41,7 +41,7 @@ container.querySelector("input").click()
       
     
     
   
 
@@ -69,7 +69,7 @@ container.querySelector("input").click()
       
     
     
   
 
@@ -98,7 +98,7 @@ container.querySelector("input").click()
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
index e64e51c571..8adc10848a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  false
+  false
 
 
 # Render "End"
@@ -16,7 +16,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/components/checkbox.marko b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/tags/checkbox.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/components/checkbox.marko
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/tags/checkbox.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/components/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/tags/checkbox.js
similarity index 63%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/components/checkbox.js
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/tags/checkbox.js
index fe8da7bed2..26aebb525c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-spread/__snapshots__/dom.expected/components/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/tags/checkbox.js
@@ -2,7 +2,7 @@ export const _template_ = "";
 export const _walks_ = /* get, over(1) */" b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _input__effect = _$.effect("__tests__/components/checkbox.marko_0_input", _scope => _$.attrsEvents(_scope, "#input/0"));
+const _input__effect = _$.effect("__tests__/tags/checkbox.marko_0_input", _scope => _$.attrsEvents(_scope, "#input/0"));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _$.attrs(_scope, "#input/0", {
     type: "checkbox",
@@ -11,4 +11,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _input__effect(_scope);
 });
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/checkbox.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js
index 6076ecd2c8..8d7e424449 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_checkbox_template}${_checkbox_template}${_checkbox_template} `;
 export const _walks_ = /* beginChild, _checkbox_walks, endChild, beginChild, _checkbox_walks, endChild, beginChild, _checkbox_walks, endChild, next(1), get, out(1) */`/${_checkbox_walks}&/${_checkbox_walks}&/${_checkbox_walks}&D l`;
-import { _setup_ as _checkbox, _input_ as _checkbox_input, _template_ as _checkbox_template, _walks_ as _checkbox_walks } from "./components/checkbox.marko";
+import { _setup_ as _checkbox, _input_ as _checkbox_input, _template_ as _checkbox_template, _walks_ as _checkbox_walks } from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _checkedValue = /* @__PURE__ */_$.state("checkedValue", (_scope, checkedValue) => {
   _$.data(_scope["#text/3"], checkedValue);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/components/checkbox.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/components/checkbox.js
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
index e6f2f11d58..32b623543b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/components/checkbox.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/tags/checkbox.js
@@ -5,9 +5,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     type: "checkbox",
     ...input
   }, "#input/0", _scope0_id, "input")}>${_$.markResumeNode(_scope0_id, "#input/0")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/checkbox.marko_0_input");
+  _$.writeEffect(_scope0_id, "__tests__/tags/checkbox.marko_0_input");
   _$.writeScope(_scope0_id, {
     "input": input
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/checkbox.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/checkbox.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
index 933965f199..bbb7cd9db4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _checkbox from "./components/checkbox.marko";
+import _checkbox from "./tags/checkbox.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
index 2ce5a9af04..3537f02d48 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
       
     
     
   
 
@@ -65,7 +65,7 @@ container.querySelector("input").click()
       
     
     
   
 
@@ -106,7 +106,7 @@ container.querySelector("input").click()
       
     
     
   
 
@@ -146,7 +146,7 @@ container.querySelector("input").click()
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
index adc6891a21..2c9d0e8e13 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  a,b
+  a,b
 
 
 # Render "End"
@@ -29,7 +29,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/components/checkbox.marko b/packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/tags/checkbox.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/components/checkbox.marko
rename to packages/runtime-tags/src/__tests__/fixtures/controllable-checked-values-spread/tags/checkbox.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 58%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/tags/custom-tag.js
index 92ffbb0b40..c9d63042ff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/dom.expected/tags/custom-tag.js
@@ -2,4 +2,4 @@ export const _template_ = "
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
similarity index 66%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
index 2534c6ebe5..5470e0e630 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/tags/custom-tag.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 58%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/tags/custom-tag.js
index 92ffbb0b40..c9d63042ff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/dom.expected/tags/custom-tag.js
@@ -2,4 +2,4 @@ export const _template_ = "
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
similarity index 66%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
index 2534c6ebe5..5470e0e630 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-and-attributes-error/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/__snapshots__/html.expected/tags/custom-tag.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-args-error/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/hello/index.js
similarity index 57%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/hello/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/hello/index.js
index faa3cc6c38..d7191491a0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/hello/index.js
@@ -2,4 +2,4 @@ export const _template_ = "Hello";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/message.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/message.js
similarity index 58%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/message.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/message.js
index a8b690354c..90949bb71e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/components/message.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/dom.expected/tags/message.js
@@ -2,4 +2,4 @@ export const _template_ = "Frank";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/message.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/message.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/hello/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
similarity index 65%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/hello/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
index 9fb3ba98b7..4de9bc2061 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/hello/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/hello/index.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Hello");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello/index.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello/index.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/message.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
similarity index 66%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/message.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
index 607b9b0bf7..5ee852eb8e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/components/message.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/__snapshots__/html.expected/tags/message.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Frank");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/message.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/message.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/index.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/index.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/index.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/index.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/marko-tag.json b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/marko-tag.json
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/marko-tag.json
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/marko-tag.json
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/transformer.ts
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/hello/transformer.ts
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/message.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/message.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/message.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/tags/message.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/tags/child.js
similarity index 81%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/tags/child.js
index e9a2569f33..2a63fdbf3e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/tags/child.js
@@ -6,4 +6,4 @@ const _value = /* @__PURE__ */_$.value("value", (_scope, value) => _$.data(_scop
 export const _input_value_ = /* @__PURE__ */_$.value("input_value", (_scope, input_value) => _value(_scope, input_value));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_value_(_scope, input.value));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/template.js
index 0e8267f988..564b94887d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}${_child_template}`;
 export const _walks_ = /* beginChild, _child_walks, endChild, beginChild, _child_walks, endChild */`/${_child_walks}&/${_child_walks}&`;
-import { _setup_ as _child, _input_value_ as _child_input_value, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _input_value_ as _child_input_value, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _x = /* @__PURE__ */_$.state("x", (_scope, x) => _child_input_value(_scope["#childScope/1"], x), () => _$.inChild("#childScope/1", _child_input_value));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
similarity index 74%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
index 4f4b3e6804..36366bca59 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/tags/child.js
@@ -4,4 +4,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const value = input.value;
   _$.write(`${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")} `);
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
index 4b5a3feb68..0b84b756d3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-default-value/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 87%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/tags/custom-tag.js
index 3fcbdc2679..c0b0743573 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/tags/custom-tag.js
@@ -9,7 +9,7 @@ const _expr_Text_x_y = /* @__PURE__ */_$.intersection(3, _scope => {
   } = _scope;
   _inputContent_input(_scope, () => [x, y]);
 }, () => _inputContent_input);
-const _expr_x_y_effect = _$.effect("__tests__/components/custom-tag.marko_0_x_y", (_scope, {
+const _expr_x_y_effect = _$.effect("__tests__/tags/custom-tag.marko_0_x_y", (_scope, {
   x,
   y
 }) => _$.on(_scope["#button/0"], "click", function () {
@@ -33,4 +33,4 @@ export function _setup_(_scope) {
   _x(_scope, 1);
   _y(_scope, 10);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.js
index be9ba2664d..7ce01ad552 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = `${_customTag_template}`;
 export const _walks_ = /* beginChild, _customTag_walks, endChild */`/${_customTag_walks}&D`;
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
+import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko";
 const _count2$customTag_content = /* @__PURE__ */_$.value("count2", (_scope, count2) => _$.data(_scope["#text/1"], count2));
 const _count$customTag_content = /* @__PURE__ */_$.value("count", (_scope, count) => _$.data(_scope["#text/0"], count));
 const _params_2$customTag_content = /* @__PURE__ */_$.value("_params_2", (_scope, _params_2) => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
similarity index 80%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
index aae59e9b78..8576efa08b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/tags/custom-tag.js
@@ -7,7 +7,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagArgs(_dynamicScope, input.content, [x, y]);
   _$.write(_$.markResumeControlEnd(_scope0_id, "#text/3"));
-  _$.writeEffect(_scope0_id, "__tests__/components/custom-tag.marko_0_x_y");
+  _$.writeEffect(_scope0_id, "__tests__/tags/custom-tag.marko_0_x_y");
   _$.writeScope(_scope0_id, {
     "x": x,
     "y": y,
@@ -15,4 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/3(": _$.normalizeDynamicRenderer(input.content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
index b4fa3beb90..0220da1d8d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _customTag from "./components/custom-tag.marko";
+import _customTag from "./tags/custom-tag.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
index 7828cc1dbb..9f38b62577 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/resume.expected.md
@@ -27,7 +27,7 @@
     
     
     
   
 
@@ -70,7 +70,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -116,7 +116,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -162,7 +162,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
index 7c1e3b8cf1..1362a5e015 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Counts: 1,10
    
+  
    Counts: 1,10
    
 
 
 # Render "End"
@@ -31,7 +31,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-args/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 86%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/tags/custom-tag.js
index 280927c2b1..409ae041e9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/tags/custom-tag.js
@@ -13,7 +13,7 @@ const _expr_Text_input_name_x = /* @__PURE__ */_$.intersection(3, _scope => {
   }));
 }, () => _inputContent_input);
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/2", 0, () => _expr_Text_input_name_x);
-const _x_effect = _$.effect("__tests__/components/custom-tag.marko_0_x", (_scope, {
+const _x_effect = _$.effect("__tests__/tags/custom-tag.marko_0_x", (_scope, {
   x
 }) => _$.on(_scope["#button/0"], "click", function () {
   _x(_scope, x + 1), x;
@@ -32,4 +32,4 @@ export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_)
 export function _setup_(_scope) {
   _x(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.js
index 77593b2707..913b09ea8f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = `${_customTag_template}`;
 export const _walks_ = /* beginChild, _customTag_walks, endChild */`/${_customTag_walks}&D`;
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _input_name_ as _customTag_input_name, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
+import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _input_name_ as _customTag_input_name, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko";
 const _name$customTag_content = /* @__PURE__ */_$.value("name", (_scope, name) => _$.data(_scope["#text/0"], name));
 const _count$customTag_content = /* @__PURE__ */_$.value("count", (_scope, count) => _$.data(_scope["#text/1"], count));
 const _pattern_$customTag_content = /* @__PURE__ */_$.value("_pattern_", (_scope, _pattern_) => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
similarity index 80%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
index fc4aab2000..f51427e891 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/tags/custom-tag.js
@@ -9,7 +9,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     name: input.name
   });
   _$.write(_$.markResumeControlEnd(_scope0_id, "#text/2"));
-  _$.writeEffect(_scope0_id, "__tests__/components/custom-tag.marko_0_x");
+  _$.writeEffect(_scope0_id, "__tests__/tags/custom-tag.marko_0_x");
   _$.writeScope(_scope0_id, {
     "input_name": input.name,
     "x": x,
@@ -17,4 +17,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/2(": _$.normalizeDynamicRenderer(input.content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
index f8e9170a0d..7b9d448bdf 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _customTag from "./components/custom-tag.marko";
+import _customTag from "./tags/custom-tag.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
index a85511f310..756d785ec6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/resume.expected.md
@@ -23,7 +23,7 @@
     
     
     
   
 
@@ -62,7 +62,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -102,7 +102,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -142,7 +142,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
index a1825238a5..d83776b94c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Count (hello): 1
    
+  
    Count (hello): 1
    
 
 
 # Render "End"
@@ -27,7 +27,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-attributes/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 84%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/tags/custom-tag.js
index 03224b21a6..6d7e752c71 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/tags/custom-tag.js
@@ -9,7 +9,7 @@ const _expr_Text_x = /* @__PURE__ */_$.intersection(2, _scope => {
   _inputContent_input(_scope, () => x);
 }, () => _inputContent_input);
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/2", 0, () => _expr_Text_x);
-const _x_effect = _$.effect("__tests__/components/custom-tag.marko_0_x", (_scope, {
+const _x_effect = _$.effect("__tests__/tags/custom-tag.marko_0_x", (_scope, {
   x
 }) => _$.on(_scope["#button/0"], "click", function () {
   _x(_scope, x + 1), x;
@@ -24,4 +24,4 @@ export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_)
 export function _setup_(_scope) {
   _x(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.js
index 29923392cd..3bbf0b67c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = `${_customTag_template}`;
 export const _walks_ = /* beginChild, _customTag_walks, endChild */`/${_customTag_walks}&D`;
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
+import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko";
 const _count$customTag_content = /* @__PURE__ */_$.value("count", (_scope, count) => _$.data(_scope["#text/0"], count));
 const _params_2$customTag_content = /* @__PURE__ */_$.value("_params_2", (_scope, _params_2) => _count$customTag_content(_scope, _params_2[0]));
 const _customTag_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("
    Count: 
    ", /* next(1), over(1), replace */"Db%", void 0, void 0, () => _params_2$customTag_content));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
index 7a614784b3..2bc3a78b5c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/tags/custom-tag.js
@@ -6,11 +6,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _dynamicScope = _$.peekNextScope();
   _$.dynamicTagInput(_dynamicScope, input.content, x);
   _$.write(_$.markResumeControlEnd(_scope0_id, "#text/2"));
-  _$.writeEffect(_scope0_id, "__tests__/components/custom-tag.marko_0_x");
+  _$.writeEffect(_scope0_id, "__tests__/tags/custom-tag.marko_0_x");
   _$.writeScope(_scope0_id, {
     "x": x,
     "#text/2!": _$.writeExistingScope(_dynamicScope),
     "#text/2(": _$.normalizeDynamicRenderer(input.content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
index 52fb9ffa7a..8fc0c6ed9a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _customTag from "./components/custom-tag.marko";
+import _customTag from "./tags/custom-tag.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
index ae567051f7..075d6bd53f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     
     
     
   
 
@@ -54,7 +54,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -90,7 +90,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -126,7 +126,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
index 39506d567c..327f70c5ed 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Count: 1
    
+  
    Count: 1
    
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-parameters-from-single-arg/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/components/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/tags/child/index.js
similarity index 86%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/components/child/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/tags/child/index.js
index 8e988712b2..2c606171a1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/components/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/tags/child/index.js
@@ -11,4 +11,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _content_(_scope, input.content);
 }, () => _content_);
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child/index.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
index cc9ef2b139..eb6bc9d525 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}`;
 export const _walks_ = /* beginChild, _child_walks, endChild */`/${_child_walks}&D`;
-import { _setup_ as _child, _content_ as _child_input_content, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./components/child/index.marko";
+import { _setup_ as _child, _content_ as _child_input_content, _name_ as _child_input_name, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _child_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("This is the body content", ""));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/components/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
similarity index 85%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/components/child/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
index 64c52e46d2..027ddaba71 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/components/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/tags/child/index.js
@@ -14,4 +14,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/1(": _$.normalizeDynamicRenderer(content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child/index.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
index 883776fade..bc81c92a25 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child/index.marko";
+import _child from "./tags/child/index.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/components/child/index.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/tags/child/index.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/components/child/index.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-render-body/tags/child/index.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
similarity index 69%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
index d3408ddcf7..18d4e473e1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* get, next(1), get, out(1) */" D l";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _x_effect = _$.effect("__tests__/components/counter.marko_0_x", (_scope, {
+const _x_effect = _$.effect("__tests__/tags/counter.marko_0_x", (_scope, {
   x
 }) => _$.on(_scope["#button/0"], "click", function () {
   _x(_scope, x + 1), x;
@@ -20,5 +20,5 @@ function _valueChange(_scope) {
     _x(_scope, _new_x);
   };
 }
-_$.register("__tests__/components/counter.marko_0/valueChange", _valueChange);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+_$.register("__tests__/tags/counter.marko_0/valueChange", _valueChange);
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.js
index ace0e3af49..0632d01c64 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_counter_template}`;
 export const _walks_ = /* beginChild, _counter_walks, endChild, get, next(1), get, out(1), get, over(1) */`/${_counter_walks}& D l b`;
-import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./components/counter.marko";
+import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _count_effect = _$.effect("__tests__/template.marko_0_count", (_scope, {
   count
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
similarity index 67%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
index b8bd4af41b..5358f193dd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
@@ -4,14 +4,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const x = 1;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
   const _return = x;
-  _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_x");
+  _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_x");
   _$.writeScope(_scope0_id, {
     "x": x,
     "/": _tagVar,
     "@": _$.register(_new_x => {
       x = _new_x;
-    }, "__tests__/components/counter.marko_0/valueChange", _scope0_id)
+    }, "__tests__/tags/counter.marko_0/valueChange", _scope0_id)
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
index 9fa281044d..d82dc0a1d1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _counter from "./components/counter.marko";
+import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
index 3922d57845..61ad415574 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/resume.expected.md
@@ -24,7 +24,7 @@
     
     
     
   
 
@@ -64,7 +64,7 @@ container.querySelector("button.inc-child").click()
     
     
     
   
 
@@ -105,7 +105,7 @@ container.querySelector("button.inc-parent").click()
     
     
     
   
 
@@ -146,7 +146,7 @@ container.querySelector("button.reset").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
index 32fd7e4a30..164c43d9a5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
+  
 
 
 # Render "End"
@@ -28,7 +28,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/tags/counter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/components/counter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-assignment/tags/counter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/tags/child.js
similarity index 72%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/tags/child.js
index 5e28116aff..11f287c0bc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/tags/child.js
@@ -5,4 +5,4 @@ const _x = /* @__PURE__ */_$.state("x", (_scope, x) => _$.tagVarSignal(_scope, x
 export function _setup_(_scope) {
   _x(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.js
index 00bf2673c6..1cd34af2f5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}
     
    `;
 export const _walks_ = /* beginChild, _child_walks, endChild, next(1), get, out(1) */`/${_child_walks}&D l`;
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _data = _$.registerBoundSignal("__tests__/template.marko_0_data/var", /* @__PURE__ */_$.value("data", (_scope, data) => _$.data(_scope["#text/1"], data)));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
similarity index 76%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
index 3e793ca3df..3af3ae132e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/tags/child.js
@@ -9,4 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
index 1f3c7189ba..4e5ba39371 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-expression/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/tags/child.js
similarity index 81%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/tags/child.js
index f79ee6c5fd..0c121aa761 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/tags/child.js
@@ -14,4 +14,4 @@ export function _setup_(_scope) {
   _x(_scope, 1);
   _y(_scope, 2);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.js
index 00bf2673c6..1cd34af2f5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}
     
    `;
 export const _walks_ = /* beginChild, _child_walks, endChild, next(1), get, out(1) */`/${_child_walks}&D l`;
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _data = _$.registerBoundSignal("__tests__/template.marko_0_data/var", /* @__PURE__ */_$.value("data", (_scope, data) => _$.data(_scope["#text/1"], data)));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
index 61c70b6008..e330a2712b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/tags/child.js
@@ -12,4 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
index 1f3c7189ba..4e5ba39371 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var-multiple/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/tags/child.js
similarity index 71%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/tags/child.js
index 3eb8d700ac..f23190292d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/tags/child.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* get, next(1), get, out(1) */" D l";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _x_effect = _$.effect("__tests__/components/child.marko_0_x", (_scope, {
+const _x_effect = _$.effect("__tests__/tags/child.marko_0_x", (_scope, {
   x
 }) => _$.on(_scope["#button/0"], "click", function () {
   _x(_scope, x + 1), x;
@@ -14,4 +14,4 @@ const _x = /* @__PURE__ */_$.state("x", (_scope, x) => {
 export function _setup_(_scope) {
   _x(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.js
index 00bf2673c6..1cd34af2f5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}
     
    `;
 export const _walks_ = /* beginChild, _child_walks, endChild, next(1), get, out(1) */`/${_child_walks}&D l`;
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _data = _$.registerBoundSignal("__tests__/template.marko_0_data/var", /* @__PURE__ */_$.value("data", (_scope, data) => _$.data(_scope["#text/1"], data)));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
similarity index 72%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
index 61c95063b1..8d22ad28a0 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/tags/child.js
@@ -4,11 +4,11 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const x = 1;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
   const _return = x;
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_x");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_x");
   _$.writeScope(_scope0_id, {
     "x": x,
     "/": _tagVar
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
index 1f3c7189ba..4e5ba39371 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
index 4e186583e8..199d531bf8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/resume.expected.md
@@ -15,7 +15,7 @@
       
     
     
   
 
@@ -46,7 +46,7 @@ container.querySelector("button.inc").click()
       
     
     
   
 
@@ -78,7 +78,7 @@ container.querySelector("button.inc").click()
       
     
     
   
 
@@ -110,7 +110,7 @@ container.querySelector("button.inc").click()
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
index 3525b2f6d0..c80de9d669 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    1
    
+  
    1
    
 
 
 # Render "End"
@@ -19,7 +19,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/custom-tag-var/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/tags/child.js
similarity index 90%
rename from packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/tags/child.js
index f0b7f73979..c4247471b6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/tags/child.js
@@ -14,4 +14,4 @@ export const _input_thing_ = /* @__PURE__ */_$.value("input_thing", (_scope, inp
 }, () => _input_thing_content_);
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_thing_(_scope, input.thing), () => _input_thing_);
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
index b5ed0b3263..1ac273be65 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}`;
 export const _walks_ = /* beginChild, _child_walks, endChild, get, over(1) */`/${_child_walks}& b`;
-import { _setup_ as _child, _input_thing_ as _child_input_thing, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _input_thing_ as _child_input_thing, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _define_content = _$.register("__tests__/template.marko_1_renderer", /* @__PURE__ */_$.createRendererWithOwner("The thing", ""));
 const _myThing = /* @__PURE__ */_$.value("myThing", (_scope, myThing) => _child_input_thing(_scope["#childScope/0"], myThing), () => _$.inChild("#childScope/0", _child_input_thing));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
similarity index 86%
rename from packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
index 0330304510..824cdc256c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/tags/child.js
@@ -12,4 +12,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/1(": _$.normalizeDynamicRenderer(input.thing.content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
index 9f20a662a6..77919dd6c7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const selected = false;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/define-tag-for-attribute-tag/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 85%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/tags/custom-tag.js
index 191c7b4c20..45df77173a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/tags/custom-tag.js
@@ -7,4 +7,4 @@ const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _inpu
 export const _input_content_ = /* @__PURE__ */_$.value("input_content", (_scope, input_content) => _dynamicTagName(_scope, input_content), () => _dynamicTagName);
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _input_content_(_scope, input.content), () => _input_content_);
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
index 2e2631a6c7..2fd35e0ad7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/dom.expected/template.js
@@ -2,7 +2,7 @@ export const _template_ = `${_customTag_template}
    
 export const _walks_ = /* get, over(1), beginChild, _customTag_walks, endChild, next(1), replace, out(1) */` b/${_customTag_walks}&D%l`;
 const a = 1;
 import * as _$ from "@marko/runtime-tags/debug/dom";
-import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./components/custom-tag.marko";
+import { _setup_ as _customTag, _input_content_ as _customTag_input_content, _template_ as _customTag_template, _walks_ as _customTag_walks } from "./tags/custom-tag.marko";
 const _c$if_content = _$.registerSubscriber("__tests__/template.marko_3_c/subscriber", /* @__PURE__ */_$.dynamicClosure("c", (_scope, c) => _$.data(_scope["#text/2"], c), _scope => _scope._._));
 const _b$if_content = /* @__PURE__ */_$.dynamicClosure("b", (_scope, b) => _$.data(_scope["#text/1"], b), _scope => _scope._._);
 const _setup$if_content = _scope => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
similarity index 83%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
index 2f767234e6..1af9bea552 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/tags/custom-tag.js
@@ -10,4 +10,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "#text/0(": _$.normalizeDynamicRenderer(input.content)
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
index 44c7e2a8b6..554bd5ded1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/__snapshots__/html.expected/template.js
@@ -1,6 +1,6 @@
 const a = 1;
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _customTag from "./components/custom-tag.marko";
+import _customTag from "./tags/custom-tag.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const b = 2;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-closures/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/tags/custom-tag.js
index 69c92c8233..b96355f340 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/tags/custom-tag.js
@@ -7,4 +7,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _$.tagVarSignal(_scope, input);
 }, () => _$.tagVarSignal);
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.js
index 64809dac5c..24f1105ce9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = "
    Parent: 
    ";
 export const _walks_ = /* get, next(1), over(1), replace, out(1), replace, over(1), next(1), over(1), replace, out(1) */" Db%l%bDb%l";
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tags0_input = _$.dynamicTagAttrs("#text/2");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
index 224c2d6d65..1b6ff4753b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/tags/custom-tag.js
@@ -8,4 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
index 2a985585a5..12577ffdb3 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
index f51b6b4258..7a3b8658f5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/resume.expected.md
@@ -25,7 +25,7 @@
       
     
     
   
 
@@ -66,7 +66,7 @@ container.querySelector("button").click()
       
     
     
   
 
@@ -109,7 +109,7 @@ container.querySelector("button").click()
       
     
     
   
 
@@ -152,7 +152,7 @@ container.querySelector("button").click()
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
index 6f7c30a368..4a3de1f902 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Child: 1
    Parent: 1
    
+  
    Child: 1
    Parent: 1
    
 
 
 # Render "End"
@@ -29,7 +29,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/template.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/template.marko
index f1284b7f3a..ad272e0cee 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/template.marko
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args-tag-var/template.marko
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 static const tags = [customTag];
 
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/tags/custom-tag.js
similarity index 73%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/tags/custom-tag.js
index 2be6bcdb9c..333ffd4903 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/tags/custom-tag.js
@@ -4,4 +4,4 @@ export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _$.data(_scope["#text/0"], input));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.js
index da6d5afbbb..a450695dfd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = "";
 export const _walks_ = /* get, next(1), over(1), replace, out(1), replace, over(1) */" Db%l%bD";
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tags0_input = _$.dynamicTagAttrs("#text/2", void 0, 1);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
similarity index 72%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
index 1143325013..b0fd03f610 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/tags/custom-tag.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write(`
    ${_$.escapeXML(input)}${_$.markResumeNode(_scope0_id, "#text/0")}
    `);
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
index 0b80771caf..25dc438d9f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
index 833025e2d3..3be9f0c6a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     
     
     
   
 
@@ -50,7 +50,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -84,7 +84,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -118,7 +118,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
index 6cca571a35..4eee8d418d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    1
    
+  
    1
    
 
 
 # Render "End"
@@ -21,7 +21,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko
index 71b9a94ac7..540bd0b7b6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-args/template.marko
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 static const tags = [customTag];
 
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/tags/child.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/tags/child.js
index 7a447555fa..e4aecf8ce7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/tags/child.js
@@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom";
 export const _id_ = /* @__PURE__ */_$.value("id", (_scope, id) => _$.data(_scope["#text/0"], id));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _id_(_scope, input.id));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.js
index 7e01d8d90c..a5ebeaa167 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = "";
 export const _walks_ = /* get, over(1), replace, over(1) */" b%bD";
-import child from "./components/child.marko";
+import child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tagName_input = _$.dynamicTagAttrs("#text/1");
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/1", _scope => _tagName_input(_scope, () => ({
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
similarity index 75%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
index 46d163aaf3..4deb87236d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/tags/child.js
@@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   } = input;
   _$.write(`
    Id is ${_$.escapeXML(id)}${_$.markResumeNode(_scope0_id, "#text/0")}
    `);
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
index 230adefc48..7ff043a435 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import child from "./components/child.marko";
+import child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
index 08c784f83f..aaa5304210 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     
     
     
   
 
@@ -40,7 +40,7 @@ container.querySelector("button").click()
     />
     
     
   
 
@@ -69,7 +69,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
index fe768eb122..30846397c2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    Id is dynamic
    
+  
    Id is dynamic
    
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-native/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child1.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child1.js
similarity index 79%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child1.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child1.js
index 9a422942b2..e4166e4ac1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child1.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child1.js
@@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom";
 export const _value_ = /* @__PURE__ */_$.value("value", (_scope, value) => _$.data(_scope["#text/0"], value));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _value_(_scope, input.value));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child1.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child1.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child2.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child2.js
similarity index 79%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child2.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child2.js
index d0b1549b0e..d7a0123d17 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/components/child2.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/tags/child2.js
@@ -5,4 +5,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom";
 export const _value_ = /* @__PURE__ */_$.value("value", (_scope, value) => _$.data(_scope["#text/0"], value));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _value_(_scope, input.value));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child2.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child2.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.js
index cdd6b32c87..6c2e7166f1 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* replace, over(1), get, over(1) */"D%b b";
-import child1 from "./components/child1.marko";
-import child2 from "./components/child2.marko";
+import child1 from "./tags/child1.marko";
+import child2 from "./tags/child2.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tagName_input = _$.dynamicTagAttrs("#text/0");
 const _expr_Text_val = /* @__PURE__ */_$.intersection(2, _scope => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child1.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
similarity index 76%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child1.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
index 0d574e45f3..0dc2204c3a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child1.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child1.js
@@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   } = input;
   _$.write(`
    Child 1 has ${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}
    `);
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child1.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child1.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child2.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
similarity index 76%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child2.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
index 34ef81d5d4..9c61375433 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/components/child2.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/tags/child2.js
@@ -6,4 +6,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   } = input;
   _$.write(`
    Child 2 has ${_$.escapeXML(value)}${_$.markResumeNode(_scope0_id, "#text/0")}
    `);
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child2.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child2.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
index ab641c7875..305abd6f6e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
-import child1 from "./components/child1.marko";
-import child2 from "./components/child2.marko";
+import child1 from "./tags/child1.marko";
+import child2 from "./tags/child2.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
index 9bae982bfc..1cf7476d2c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-custom-tags/__snapshots__/resume.expected.md
@@ -14,7 +14,7 @@
     
+  
    Child 1 has 3
    
 
 
 # Render "End"
@@ -18,7 +18,7 @@
     ";
 export const _walks_ = /* get, next(1), over(1), replace, out(1), replace, over(1) */" Db%l%bD";
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tags0_input = _$.dynamicTagAttrs("#text/2");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/components/custom-tag.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/components/custom-tag.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
index ce7ed2dfe4..e9defbb8d8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/components/custom-tag.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/tags/custom-tag.js
@@ -8,4 +8,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/custom-tag.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/custom-tag.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
index fbc489298c..8e310ab294 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 const tags = [customTag];
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
index 833025e2d3..3be9f0c6a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/resume.expected.md
@@ -17,7 +17,7 @@
     
     
     
   
 
@@ -50,7 +50,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -84,7 +84,7 @@ container.querySelector("button").click()
     
     
     
   
 
@@ -118,7 +118,7 @@ container.querySelector("button").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
index 6cca571a35..4eee8d418d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    1
    
+  
    1
    
 
 
 # Render "End"
@@ -21,7 +21,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/tags/custom-tag.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/components/custom-tag.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/tags/custom-tag.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko
index 387d6fec32..a39a06347b 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-single-arg/template.marko
@@ -1,4 +1,4 @@
-import customTag from './components/custom-tag.marko';
+import customTag from './tags/custom-tag.marko';
 static const tags = [customTag];
 
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
similarity index 69%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
index 29bec3e225..7a01b48fe9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/tags/counter.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* get, next(1), get, out(1) */" D l";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _x_effect = _$.effect("__tests__/components/counter.marko_0_x", (_scope, {
+const _x_effect = _$.effect("__tests__/tags/counter.marko_0_x", (_scope, {
   x
 }) => _$.on(_scope["#button/0"], "click", function () {
   _x(_scope, x + 1), x;
@@ -20,5 +20,5 @@ function _valueChange(_scope) {
     _x(_scope, _new_x);
   };
 }
-_$.register("__tests__/components/counter.marko_0/valueChange", _valueChange);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+_$.register("__tests__/tags/counter.marko_0/valueChange", _valueChange);
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.js
index ad60c88d40..32df8b7a31 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = "";
 export const _walks_ = /* replace, over(1), get, over(1) */"D%b b";
-import Counter from "./components/counter.marko";
+import Counter from "./tags/counter.marko";
 const getCounter = _getCounter;
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _getCounter_input = _$.dynamicTagAttrs("#text/0");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
similarity index 67%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
index 73ccf2ef34..eb862d2831 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/tags/counter.js
@@ -4,14 +4,14 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const x = 1;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
   const _return = x;
-  _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_x");
+  _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_x");
   _$.writeScope(_scope0_id, {
     "x": x,
     "/": _tagVar,
     "@": _$.register(_new_x => {
       x = _new_x;
-    }, "__tests__/components/counter.marko_0/valueChange", _scope0_id)
+    }, "__tests__/tags/counter.marko_0/valueChange", _scope0_id)
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
index 9f3e35dabe..25f3921f79 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import Counter from "./components/counter.marko";
+import Counter from "./tags/counter.marko";
 function getCounter() {
   return Counter; // breaks tag name analysis.
 }
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
index e6a4501aa6..626e482b9a 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     
     
     
   
 
@@ -55,7 +55,7 @@ container.querySelector("button.inc").click()
     
     
     
   
 
@@ -90,7 +90,7 @@ container.querySelector("button.inc").click()
     
     
     
   
 
@@ -125,7 +125,7 @@ container.querySelector("button.reset").click()
     
     
     
   
 
@@ -160,7 +160,7 @@ container.querySelector("button.inc").click()
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
index a543b13336..404f709990 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
+  
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/tags/counter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/components/counter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var-assignment/tags/counter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/components/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/tags/child/index.js
similarity index 59%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/components/child/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/tags/child/index.js
index 4afa18ac3a..dd2e072edd 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/components/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/tags/child/index.js
@@ -4,4 +4,4 @@ import * as _$ from "@marko/runtime-tags/debug/dom";
 export function _setup_(_scope) {
   _$.tagVarSignal(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child/index.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/template.js
index fcc35bdc4c..3a6f799997 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = `${_child_template}${_child_template}<${input.show && "div"}>`;
 export const _walks_ = /* beginChild, _child_walks, endChild, beginChild, _child_walks, endChild, replace, over(1), get, over(1) */`D/${_child_walks}&/${_child_walks}&%b bD`;
-import child from "./components/child/index.marko";
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child/index.marko";
+import child from "./tags/child/index.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _inputDynamic_input = _$.dynamicTagAttrs("#text/2");
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/2", _scope => {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/components/child/index.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
similarity index 72%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/components/child/index.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
index 07a1fd06fe..382c46fdc5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/components/child/index.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/tags/child/index.js
@@ -7,4 +7,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child/index.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child/index.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
index 4118d84140..08001a574c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import child from "./components/child/index.marko";
+import child from "./tags/child/index.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/components/child/index.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/tags/child/index.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/components/child/index.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-var/tags/child/index.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/tags/counter.js
similarity index 69%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/tags/counter.js
index 1aa501f2b8..a1ed2027f6 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/tags/counter.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* get, next(1), get, out(1) */" D l";
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _count_effect = _$.effect("__tests__/components/counter.marko_0_count", (_scope, {
+const _count_effect = _$.effect("__tests__/tags/counter.marko_0_count", (_scope, {
   count
 }) => _$.on(_scope["#button/0"], "click", function () {
   _count(_scope, count + 1), count;
@@ -13,4 +13,4 @@ const _count = /* @__PURE__ */_$.state("count", (_scope, count) => {
 export function _setup_(_scope) {
   _count(_scope, 0);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.js
index 95fcbef804..b2a151d1c8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = "";
 export const _walks_ = /* replace, over(1), get, over(1) */"D%b b";
-import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./components/counter.marko";
+import { _setup_ as _counter, _template_ as _counter_template, _walks_ as _counter_walks } from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _setup$tagName_content = _scope => {
   _counter(_scope["#childScope/0"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/components/counter.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
similarity index 69%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/components/counter.js
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
index 35dca4ca3b..9ce8226c60 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/components/counter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/tags/counter.js
@@ -3,9 +3,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/counter.marko_0_count");
+  _$.writeEffect(_scope0_id, "__tests__/tags/counter.marko_0_count");
   _$.writeScope(_scope0_id, {
     "count": count
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/counter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
index 16ab1c95da..62e3e1f6f4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _counter from "./components/counter.marko";
+import _counter from "./tags/counter.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
index 4ccdb8caf7..b2d1e65bf8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/resume.expected.md
@@ -19,7 +19,7 @@
     />
     
     
   
 
@@ -55,7 +55,7 @@ container.querySelector("#count").click()
     />
     
     
   
 
@@ -87,7 +87,7 @@ container.querySelector("#changeTag").click()
     />
     
     
   
 
@@ -122,7 +122,7 @@ container.querySelector("#count").click()
     />
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
index 0f7c880069..6293da3c23 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    
+  
    
 
 
 # Render "End"
@@ -23,7 +23,7 @@
     />
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko b/packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/tags/counter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/components/counter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/dynamic-tag-with-updating-body/tags/counter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/components/parent-el.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/tags/parent-el.js
similarity index 58%
rename from packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/components/parent-el.js
rename to packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/tags/parent-el.js
index 65a5267883..a9ddf60868 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/components/parent-el.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/tags/parent-el.js
@@ -2,9 +2,9 @@ export const _template_ = "";
 export const _walks_ = /* get, over(1) */" b";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _tagName = /* @__PURE__ */_$.state("tagName", (_scope, tagName) => _$.tagVarSignal(_scope, tagName), () => _$.tagVarSignal);
-const _setup__effect = _$.effect("__tests__/components/parent-el.marko_0", _scope => _tagName(_scope, _scope["#comment/0"].parentElement.tagName));
+const _setup__effect = _$.effect("__tests__/tags/parent-el.marko_0", _scope => _tagName(_scope, _scope["#comment/0"].parentElement.tagName));
 export function _setup_(_scope) {
   _setup__effect(_scope);
   _tagName(_scope, undefined);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/parent-el.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/parent-el.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.js
index 7dbbad01c0..cf64681878 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `
    ${_parentEl_template} 
    ${_parentEl_template} `;
 export const _walks_ = /* next(1), beginChild, _parentEl_walks, endChild, get, out(1), next(1), beginChild, _parentEl_walks, endChild, get, out(1) */`D/${_parentEl_walks}& lD/${_parentEl_walks}& l`;
-import { _setup_ as _parentEl, _template_ as _parentEl_template, _walks_ as _parentEl_walks } from "./components/parent-el.marko";
+import { _setup_ as _parentEl, _template_ as _parentEl_template, _walks_ as _parentEl_walks } from "./tags/parent-el.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _spanName = _$.registerBoundSignal("__tests__/template.marko_0_spanName/var", /* @__PURE__ */_$.value("spanName", (_scope, spanName) => _$.data(_scope["#text/3"], spanName)));
 const _divName = _$.registerBoundSignal("__tests__/template.marko_0_divName/var", /* @__PURE__ */_$.value("divName", (_scope, divName) => _$.data(_scope["#text/1"], divName)));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/components/parent-el.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
similarity index 70%
rename from packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/components/parent-el.js
rename to packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
index 7b884c0015..21d26ee4e4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/components/parent-el.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/tags/parent-el.js
@@ -5,10 +5,10 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const tagName = undefined;
   _$.write(`${_$.markResumeNode(_scope0_id, "#comment/0")}`);
   const _return = tagName;
-  _$.writeEffect(_scope0_id, "__tests__/components/parent-el.marko_0");
+  _$.writeEffect(_scope0_id, "__tests__/tags/parent-el.marko_0");
   _$.writeScope(_scope0_id, {
     "/": _tagVar
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/parent-el.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/parent-el.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
index 41bac07b50..d5b1d6d2a8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _parentEl from "./components/parent-el.marko";
+import _parentEl from "./tags/parent-el.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
index 00bccb348e..6da8f3d126 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/resume.expected.md
@@ -16,7 +16,7 @@
       
     
     
   
 
@@ -46,7 +46,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
index 303784403a..a3a01a9fe4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    ‍
    ‍
+  
    ‍
    ‍
 
 
 # Render "End"
@@ -20,7 +20,7 @@
       
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko b/packages/runtime-tags/src/__tests__/fixtures/html-comment-var/tags/parent-el.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/html-comment-var/components/parent-el.marko
rename to packages/runtime-tags/src/__tests__/fixtures/html-comment-var/tags/parent-el.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/components/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/tags/baz.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/components/baz.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/tags/baz.js
index 411410cd65..9728a9bb75 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/components/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/tags/baz.js
@@ -2,4 +2,4 @@ export const _template_ = "
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/template.js
index bb7f5470ab..4c4426d298 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = `${_BazComp_template}${_BazComp_template}`;
 export const _walks_ = /* beginChild, _BazComp_walks, endChild, beginChild, _BazComp_walks, endChild */`D/${_BazComp_walks}&/${_BazComp_walks}&D`;
-import BazComp from "./components/baz.marko";
-import { _setup_ as _BazComp, _template_ as _BazComp_template, _walks_ as _BazComp_walks } from "./components/baz.marko";
+import BazComp from "./tags/baz.marko";
+import { _setup_ as _BazComp, _template_ as _BazComp_template, _walks_ as _BazComp_walks } from "./tags/baz.marko";
 export function _setup_(_scope) {
   _BazComp(_scope["#childScope/0"]);
   _BazComp(_scope["#childScope/1"]);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/components/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
similarity index 67%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/components/baz.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
index eaeea0ec4e..d2549eac97 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/components/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/tags/baz.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
index a093b2b60a..8f8d89dfbe 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import BazComp from "./components/baz.marko";
+import BazComp from "./tags/baz.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/components/baz.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/tags/baz.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/components/baz.marko
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-shorthand/tags/baz.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/baz.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/baz.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/baz.js
index 583994ab5a..6ddd1d5280 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/baz.js
@@ -2,4 +2,4 @@ export const _template_ = "
    baz
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/foo.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/foo.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/foo.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/foo.js
index 50a73befc9..42baf7b9dc 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/components/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/tags/foo.js
@@ -2,4 +2,4 @@ export const _template_ = "
    foo
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/foo.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/template.js
index 51b155f699..16b37e0522 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/dom.expected/template.js
@@ -1,7 +1,7 @@
 export const _template_ = "";
 export const _walks_ = /* replace, over(1) */"D%bD";
-import baz from "./components/baz.marko";
-import foo from "./components/foo.marko";
+import baz from "./tags/baz.marko";
+import foo from "./tags/foo.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _x1BazFoo_input = _$.dynamicTagAttrs("#text/0");
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _x1BazFoo_input(_scope, () => ({})), () => _x1BazFoo_input);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/baz.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
index 889ae03edc..bf8ca6b6b2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/baz.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    baz
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/foo.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/foo.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
index fff852f063..f71424196c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/components/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/tags/foo.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    foo
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/foo.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
index d65ca10b98..7722951796 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
-import baz from "./components/baz.marko";
-import foo from "./components/foo.marko";
+import baz from "./tags/baz.marko";
+import foo from "./tags/foo.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
index d4045a3790..0d20657cf9 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/resume.expected.md
@@ -9,7 +9,7 @@
     
    
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
index d1b5972d8a..e2b6a31a74 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    baz
    
+  
    baz
    
 
 
 # Render "End"
@@ -13,7 +13,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/tags/baz.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/components/baz.marko
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/tags/baz.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/components/foo.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/tags/foo.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/components/foo.marko
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/tags/foo.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/template.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/template.marko
index 926b3a183d..4d4f2e5f29 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/template.marko
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag-ternary/template.marko
@@ -1,4 +1,4 @@
-import baz from "./components/baz.marko"
-import foo from "./components/foo.marko"
+import baz from "./tags/baz.marko"
+import foo from "./tags/foo.marko"
 
 <${x === 1 ? baz : foo} />
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/components/baz.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/tags/baz.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/components/baz.js
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/tags/baz.js
index 411410cd65..9728a9bb75 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/components/baz.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/tags/baz.js
@@ -2,4 +2,4 @@ export const _template_ = "
    ";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/template.js
index 8a10a818e7..5dcde39cd5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/dom.expected/template.js
@@ -2,8 +2,8 @@ export const _template_ = `${_Baz_template}${_Baz_template}${_Baz_template} {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/baz.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/baz.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
index 8471066a64..d55b2e478d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/__snapshots__/html.expected/template.js
@@ -1,8 +1,8 @@
 import "./foo";
 import { b as c } from "./bar";
-import Baz from "./components/baz.marko";
+import Baz from "./tags/baz.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _baz from "./components/baz.marko";
+import _baz from "./tags/baz.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const _childScope = _$.peekNextScope();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/components/baz.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag/tags/baz.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/import-tag/components/baz.marko
rename to packages/runtime-tags/src/__tests__/fixtures/import-tag/tags/baz.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/import-tag/template.marko b/packages/runtime-tags/src/__tests__/fixtures/import-tag/template.marko
index e47ab51f91..9945209ff5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/import-tag/template.marko
+++ b/packages/runtime-tags/src/__tests__/fixtures/import-tag/template.marko
@@ -1,6 +1,6 @@
 import "./foo";
 import { b as c } from "./bar";
-import Baz from "./components/baz.marko";
+import Baz from "./tags/baz.marko";
 <${Baz}/>
 
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/tags/child.js
similarity index 84%
rename from packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/tags/child.js
index b6d1fa3863..0651df29fb 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/tags/child.js
@@ -9,7 +9,7 @@ const _expr_input_value_input_valueChange = /* @__PURE__ */_$.intersection(2, _s
   } = _scope;
   _state(_scope, input_value, input_valueChange);
 });
-const _otherState_effect = _$.effect("__tests__/components/child.marko_0_otherState", (_scope, {
+const _otherState_effect = _$.effect("__tests__/tags/child.marko_0_otherState", (_scope, {
   otherState
 }) => _$.on(_scope["#button/3"], "click", function () {
   _otherState(_scope, otherState + 1), otherState;
@@ -18,7 +18,7 @@ const _otherState = /* @__PURE__ */_$.state("otherState", (_scope, otherState) =
   _$.data(_scope["#text/5"], otherState);
   _otherState_effect(_scope);
 });
-const _state_effect = _$.effect("__tests__/components/child.marko_0_state", (_scope, {
+const _state_effect = _$.effect("__tests__/tags/child.marko_0_state", (_scope, {
   state
 }) => _$.on(_scope["#button/0"], "click", function () {
   _state(_scope, state + 1), state;
@@ -38,4 +38,4 @@ export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => {
   _otherState(_scope, input.value, input["value" + "Change"]);
 }, () => _$.intersections([_input_value, _input_valueChange]));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]), () => _input_);
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.js
index a41c8e2688..ae26c90f94 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `${_child_template}source=`;
 export const _walks_ = /* beginChild, _child_walks, endChild, over(1), replace, over(1) */`/${_child_walks}&b%b`;
-import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _input_ as _child_input, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _source = /* @__PURE__ */_$.state("source", (_scope, source) => {
   _$.data(_scope["#text/1"], source);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
similarity index 78%
rename from packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
index 737745fc4a..9a1ef36718 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/tags/child.js
@@ -4,8 +4,8 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const state = input.value;
   const otherState = input.value;
   _$.write(`${_$.markResumeNode(_scope0_id, "#button/0")}${_$.markResumeNode(_scope0_id, "#button/3")}`);
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_otherState");
-  _$.writeEffect(_scope0_id, "__tests__/components/child.marko_0_state");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_otherState");
+  _$.writeEffect(_scope0_id, "__tests__/tags/child.marko_0_state");
   _$.writeScope(_scope0_id, {
     "input_value": input.value,
     "input_valueChange": input.valueChange,
@@ -15,4 +15,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
     "otherState@": input["value" + "Change"]
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
index df58d91bb4..2448a66188 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
index 7dff87cd48..ee1e106b19 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/resume.expected.md
@@ -26,7 +26,7 @@
     1
     
     
   
 
@@ -68,7 +68,7 @@ container.querySelectorAll("button").forEach(item => item.click())
     2
     
     
   
 
@@ -114,7 +114,7 @@ container.querySelectorAll("button").forEach(item => item.click())
     3
     
     
   
 
@@ -160,7 +160,7 @@ container.querySelectorAll("button").forEach(item => item.click())
     4
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
index 3ca405cab7..9b76a5c52d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  source=1
+  source=1
 
 
 # Render "End"
@@ -30,7 +30,7 @@
     1
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/let-tag-controllable-child/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/components/hello-setter.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/tags/hello-setter.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/components/hello-setter.js
rename to packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/tags/hello-setter.js
index 7c9c20211d..ed8cb79c5e 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/components/hello-setter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/tags/hello-setter.js
@@ -2,10 +2,10 @@ export const _template_ = "";
 export const _walks_ = "";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-const _el__effect = _$.effect("__tests__/components/hello-setter.marko_0_el", ({
+const _el__effect = _$.effect("__tests__/tags/hello-setter.marko_0_el", ({
   el
 }) => (el().textContent = "hello"));
 export const _el_ = /* @__PURE__ */_$.value("el", (_scope, el) => _el__effect(_scope));
 export const _input_ = /* @__PURE__ */_$.value("input", (_scope, input) => _el_(_scope, input.el));
 export const _params__ = /* @__PURE__ */_$.value("_params_", (_scope, _params_) => _input_(_scope, _params_[0]));
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello-setter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello-setter.marko", _template_, _walks_, _setup_, void 0, () => _params__);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.js
index fedb70d222..ca5335d669 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/dom.expected/template.js
@@ -2,7 +2,7 @@ export const _template_ = `
    ${_helloSetter_template}`;
 export const _walks_ = /* get, over(1), beginChild, _helloSetter_walks, endChild */` b/${_helloSetter_walks}&`;
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _get_el = _$.nodeRef("__tests__/template.marko_0/#div", "#div/0");
-import { _setup_ as _helloSetter, _el_ as _helloSetter_input_el, _template_ as _helloSetter_template, _walks_ as _helloSetter_walks } from "./components/hello-setter.marko";
+import { _setup_ as _helloSetter, _el_ as _helloSetter_input_el, _template_ as _helloSetter_template, _walks_ as _helloSetter_walks } from "./tags/hello-setter.marko";
 export function _setup_(_scope) {
   _helloSetter(_scope["#childScope/1"]);
   _helloSetter_input_el(_scope["#childScope/1"], _get_el(_scope));
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/components/hello-setter.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
similarity index 58%
rename from packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/components/hello-setter.js
rename to packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
index cd15673b8f..d0882a5cff 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/components/hello-setter.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/tags/hello-setter.js
@@ -4,9 +4,9 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const {
     el
   } = input;
-  _$.writeEffect(_scope0_id, "__tests__/components/hello-setter.marko_0_el");
+  _$.writeEffect(_scope0_id, "__tests__/tags/hello-setter.marko_0_el");
   _$.writeScope(_scope0_id, {
     "el": el
   });
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/hello-setter.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello-setter.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
index 38077ee8a5..fd3ac6a8a7 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _helloSetter from "./components/hello-setter.marko";
+import _helloSetter from "./tags/hello-setter.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const el = _$.nodeRef(_scope0_id, "__tests__/template.marko_0/#div");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
index d4e4b65721..b95a2cf4ae 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/resume.expected.md
@@ -8,7 +8,7 @@
     
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
index 6ef8ed47a2..895c2dbff2 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
+++ b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/__snapshots__/ssr.expected.md
@@ -1,5 +1,5 @@
 # Write
-  
    
+  
    
 
 
 # Render "End"
@@ -10,7 +10,7 @@
     
    
     
     
   
 
diff --git a/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko b/packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/tags/hello-setter.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/components/hello-setter.marko
rename to packages/runtime-tags/src/__tests__/fixtures/native-tag-ref-effect-child/tags/hello-setter.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/tags/child.js
similarity index 72%
rename from packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/tags/child.js
index b3b1e36d2b..6c4ca3ace8 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/tags/child.js
@@ -5,4 +5,4 @@ const _x = /* @__PURE__ */_$.state("x", (_scope, x) => _$.tagVarSignal(_scope, x
 export function _setup_(_scope) {
   _x(_scope, 1);
 }
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/template.js
index 0119fd620f..1c2231563f 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = _child_template;
 export const _walks_ = /* beginChild, _child_walks, endChild */`/${_child_walks}&`;
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 export function _setup_(_scope) {
   _child(_scope["#childScope/0"]);
 }
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
similarity index 76%
rename from packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
index 0bb99e950c..f6b19132a4 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/tags/child.js
@@ -9,4 +9,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   });
   return _return;
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
index a6fe85f19c..dc7c00aade 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/__snapshots__/html.expected/template.js
@@ -1,4 +1,4 @@
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
diff --git a/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/return-tag-no-var/tags/child.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/Bar.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/Bar.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/Bar.js
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/Bar.js
index ebd4b546c6..5797839567 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/Bar.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/Bar.js
@@ -2,4 +2,4 @@ export const _template_ = "";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/Bar.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/Bar.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/foo.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/foo.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/foo.js
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/foo.js
index 92274591bc..62de385357 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/components/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/tags/foo.js
@@ -2,4 +2,4 @@ export const _template_ = "";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/foo.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/template.js
index caa2ca2044..31aef41e4d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/dom.expected/template.js
@@ -3,7 +3,7 @@ export const _walks_ = /* over(1), beginChild, _foo_walks, endChild, replace, ov
 const div = "span";
 const foo = "div";
 const Bar = "div";
-import { _setup_ as _foo, _template_ as _foo_template, _walks_ as _foo_walks } from "./components/foo.marko";
+import { _setup_ as _foo, _template_ as _foo_template, _walks_ as _foo_walks } from "./tags/foo.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _Bar_input = _$.dynamicTagAttrs("#text/1");
 const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/1", _scope => _Bar_input(_scope, () => ({})), () => _Bar_input);
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/Bar.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/Bar.js
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
index 5e81fc0d2b..3d074e87ea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/Bar.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/Bar.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/Bar.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/Bar.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/foo.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/foo.js
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
index dbbf959ee4..55bffcfb97 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/components/foo.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/tags/foo.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/foo.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/foo.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
index 7e6ce815df..12fcad8fea 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/__snapshots__/html.expected/template.js
@@ -2,7 +2,7 @@ const div = "span";
 const foo = "div";
 const Bar = "div";
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _foo from "./components/foo.marko";
+import _foo from "./tags/foo.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("
    ");
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/components/Bar.marko b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/tags/Bar.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/components/Bar.marko
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/tags/Bar.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/components/foo.marko b/packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/tags/foo.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/components/foo.marko
rename to packages/runtime-tags/src/__tests__/fixtures/tag-resolution-priority/tags/foo.marko
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/tags/child.js
similarity index 60%
rename from packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/tags/child.js
index 6850d9753f..201c9f7ce5 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/tags/child.js
@@ -2,4 +2,4 @@ export const _template_ = "Hello";
 export const _walks_ = /* over(1) */"b";
 export const _setup_ = () => {};
 import * as _$ from "@marko/runtime-tags/debug/dom";
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/template.js
index 519ead53d3..7f10f1719c 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/dom.expected/template.js
@@ -1,6 +1,6 @@
 export const _template_ = `
    ${_child_template}
     
    `;
 export const _walks_ = /* next(1), beginChild, _child_walks, endChild, out(1), next(1), get, out(1) */`D/${_child_walks}&lD l`;
-import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./components/child.marko";
+import { _setup_ as _child, _template_ as _child_template, _walks_ as _child_walks } from "./tags/child.marko";
 import * as _$ from "@marko/runtime-tags/debug/dom";
 const _count = /* @__PURE__ */_$.state("count", (_scope, count) => _$.data(_scope["#text/1"], count));
 export function _setup_(_scope) {
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/components/child.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
similarity index 68%
rename from packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/components/child.js
rename to packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
index ad8af9e6af..c9d2d4c657 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/components/child.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/tags/child.js
@@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   _$.write("Hello");
 });
-export default /* @__PURE__ */_$.createTemplate("__tests__/components/child.marko", _renderer);
\ No newline at end of file
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/child.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
index d4469311ef..200b41594d 100644
--- a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
+++ b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/__snapshots__/html.expected/template.js
@@ -1,5 +1,5 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
-import _child from "./components/child.marko";
+import _child from "./tags/child.marko";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
   const _scope0_id = _$.nextScopeId();
   const count = 0;
diff --git a/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/components/child.marko b/packages/runtime-tags/src/__tests__/fixtures/walk-over-child/tags/child.marko
similarity index 100%
rename from packages/runtime-tags/src/__tests__/fixtures/walk-over-child/components/child.marko
rename to packages/runtime-tags/src/__tests__/fixtures/walk-over-child/tags/child.marko
diff --git a/packages/runtime-tags/src/translator/index.ts b/packages/runtime-tags/src/translator/index.ts
index 969b8b8687..852282ce14 100644
--- a/packages/runtime-tags/src/translator/index.ts
+++ b/packages/runtime-tags/src/translator/index.ts
@@ -31,6 +31,7 @@ const visitors = extractVisitors({
   MarkoComment,
 });
 
+export const tagDiscoveryDirs = ["tags"];
 export { default as internalEntryBuilder } from "./util/entry-builder";
 export const preferAPI = "tags";
 export const { transform, analyze, translate } = visitors;
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/csr.expected.md b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/csr.expected.md
new file mode 100644
index 0000000000..2d4621888f
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/csr.expected.md
@@ -0,0 +1,11 @@
+# Render {}
+```html
+
    
+  Hello world
+
    
+```
+
+# Mutations
+```
+inserted #text0, #text1, #text2, h13, #text4, #text5, #text6
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/tags/hello.js
new file mode 100644
index 0000000000..bb915d756f
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/tags/hello.js
@@ -0,0 +1,5 @@
+export const _template_ = "
    Hello world
    ";
+export const _walks_ = /* over(1) */"b";
+export const _setup_ = () => {};
+import * as _$ from "@marko/runtime-tags/debug/dom";
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.hydrate.js
new file mode 100644
index 0000000000..ead625e857
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.hydrate.js
@@ -0,0 +1,2 @@
+import "virtual:./template.marko.hydrate-5.js ";
+import "virtual:./template.marko.hydrate-6.js import \"./tags/hello.marko\";";
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.js
new file mode 100644
index 0000000000..f1a18d2376
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/dom.expected/template.js
@@ -0,0 +1,20 @@
+import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
+import { t as _t } from "marko/src/runtime/vdom/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js";
+_marko_registerComponent(_marko_componentType, () => _marko_template);
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_dynamic_tag(out, _hello, null, null, null, null, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
+import _marko_defineComponent from "marko/src/runtime/components/defineComponent.js";
+_marko_template.Component = _marko_defineComponent(_marko_component, _marko_template._);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js
new file mode 100644
index 0000000000..ceb2a655d1
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/tags/hello.js
@@ -0,0 +1,6 @@
+import * as _$ from "@marko/runtime-tags/debug/html";
+const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
+  const _scope0_id = _$.nextScopeId();
+  _$.write("
    Hello world
    ");
+});
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _renderer);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/template.js
new file mode 100644
index 0000000000..7183a14ddb
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/html.expected/template.js
@@ -0,0 +1,16 @@
+import "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
+import { t as _t } from "marko/src/runtime/html/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_dynamic_tag(out, _hello, null, null, null, null, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/resume.expected.md
new file mode 100644
index 0000000000..634f2d75f2
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/resume.expected.md
@@ -0,0 +1,16 @@
+# Render undefined
+```html
+
+  
+  
+    
    
+      Hello world
+    
    
+  
+
+```
+
+# Mutations
+```
+
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/ssr.expected.md
new file mode 100644
index 0000000000..fdd36f48cc
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/__snapshots__/ssr.expected.md
@@ -0,0 +1,24 @@
+# Write
+  
    Hello world
    
+
+
+# Render "End"
+```html
+
+  
+  
+    
    
+      Hello world
+    
    
+  
+
+```
+
+# Mutations
+```
+inserted #document/html0
+inserted #document/html0/head0
+inserted #document/html0/body1
+inserted #document/html0/body1/h10
+inserted #document/html0/body1/h10/#text0
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/tags/hello.marko b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/tags/hello.marko
new file mode 100644
index 0000000000..61168280f5
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/tags/hello.marko
@@ -0,0 +1 @@
+
    Hello world
    
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/template.marko b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/template.marko
new file mode 100644
index 0000000000..1972c155d7
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/ambiguous-tags-dir/template.marko
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/tags/hello.error.txt b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/tags/hello.error.txt
new file mode 100644
index 0000000000..e1f0c8f304
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/tags/hello.error.txt
@@ -0,0 +1,7 @@
+Cannot use "class api" features under a "tags/" directory:
+
+ tag at packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/tags/hello.marko(1,1):
+> 1 | class {}
+    | ^^^^^
+  2 |
+  3 | 
    Hello world
    
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/template.js
new file mode 100644
index 0000000000..6004c09718
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/dom.expected/template.js
@@ -0,0 +1,19 @@
+import { t as _t } from "marko/src/runtime/vdom/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_tag from "marko/src/runtime/helpers/render-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js";
+_marko_registerComponent(_marko_componentType, () => _marko_template);
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_tag(_hello, {}, out, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
+import _marko_defineComponent from "marko/src/runtime/components/defineComponent.js";
+_marko_template.Component = _marko_defineComponent(_marko_component, _marko_template._);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/tags/hello.error.txt b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/tags/hello.error.txt
new file mode 100644
index 0000000000..e1f0c8f304
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/tags/hello.error.txt
@@ -0,0 +1,7 @@
+Cannot use "class api" features under a "tags/" directory:
+
+ tag at packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/tags/hello.marko(1,1):
+> 1 | class {}
+    | ^^^^^
+  2 |
+  3 | 
    Hello world
    
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/template.js
new file mode 100644
index 0000000000..4bff885fcf
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/__snapshots__/html.expected/template.js
@@ -0,0 +1,15 @@
+import { t as _t } from "marko/src/runtime/html/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_tag from "marko/src/runtime/helpers/render-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_tag(_hello, {}, out, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/tags/hello.marko b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/tags/hello.marko
new file mode 100644
index 0000000000..f6978de4c5
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/tags/hello.marko
@@ -0,0 +1,3 @@
+class {}
+
+
    Hello world
    
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/template.marko b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/template.marko
new file mode 100644
index 0000000000..1972c155d7
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/template.marko
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/test.ts b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/test.ts
new file mode 100644
index 0000000000..5d45983070
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/error-class-tags-dir/test.ts
@@ -0,0 +1,4 @@
+export const error_compiler = ["tags/hello.marko"];
+export const skip_csr = true;
+export const skip_ssr = true;
+export const skip_resume = true;
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/csr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/csr.expected.md
new file mode 100644
index 0000000000..77e2b3adcf
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/csr.expected.md
@@ -0,0 +1,15 @@
+# Render {}
+```html
+
+
    
+  Hello world
+
    
+
+```
+
+# Mutations
+```
+inserted #text0, #text1, #text2, #comment3, #text4, #text6, #comment7, #text8, #text9, #text10
+inserted h15
+inserted h15/#text0
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/components/hello-internal.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/components/hello-internal.js
new file mode 100644
index 0000000000..2620b40257
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/components/hello-internal.js
@@ -0,0 +1,18 @@
+import { t as _t } from "marko/src/runtime/vdom/index.js";
+const _marko_componentType = "__tests__/tags/components/hello-internal.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js";
+_marko_registerComponent(_marko_componentType, () => _marko_template);
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  out.be("h1", null, "0", _component, null, 0);
+  out.t("Hello world", _component);
+  out.ee();
+}, {
+  t: _marko_componentType,
+  d: true
+}, _marko_component);
+import _marko_defineComponent from "marko/src/runtime/components/defineComponent.js";
+_marko_template.Component = _marko_defineComponent(_marko_component, _marko_template._);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/hello.js
new file mode 100644
index 0000000000..4cba016a20
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/tags/hello.js
@@ -0,0 +1,13 @@
+import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
+export const _template_ = "";
+export const _walks_ = /* replace, over(1) */"D%bD";
+import _helloInternal from "./components/hello-internal.marko";
+import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
+import * as _$ from "@marko/runtime-tags/debug/dom";
+_$.register("__tests__/tags/components/hello-internal.marko", _helloInternal);
+const _helloInternal_input = _$.dynamicTagAttrs("#text/0");
+const _dynamicTagName = /* @__PURE__ */_$.conditional("#text/0", _scope => _helloInternal_input(_scope, () => ({})), () => _helloInternal_input);
+export function _setup_(_scope) {
+  _dynamicTagName(_scope, _helloInternal);
+}
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _template_, _walks_, _setup_);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.hydrate.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.hydrate.js
new file mode 100644
index 0000000000..998cbf9f4e
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.hydrate.js
@@ -0,0 +1,2 @@
+import "virtual:./template.marko.hydrate-5.js import { init } from \"marko/src/runtime/components/index.js\";\nimport \"./tags/components/hello-internal.marko\";\ninit();";
+import "virtual:./template.marko.hydrate-6.js import \"./tags/hello.marko\";";
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.js
new file mode 100644
index 0000000000..f1a18d2376
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/dom.expected/template.js
@@ -0,0 +1,20 @@
+import "marko/src/runtime/helpers/tags-compat/dom-debug.mjs";
+import { t as _t } from "marko/src/runtime/vdom/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js";
+_marko_registerComponent(_marko_componentType, () => _marko_template);
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_dynamic_tag(out, _hello, null, null, null, null, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
+import _marko_defineComponent from "marko/src/runtime/components/defineComponent.js";
+_marko_template.Component = _marko_defineComponent(_marko_component, _marko_template._);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/components/hello-internal.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/components/hello-internal.js
new file mode 100644
index 0000000000..1bc566e5b4
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/components/hello-internal.js
@@ -0,0 +1,14 @@
+import { t as _t } from "marko/src/runtime/html/index.js";
+const _marko_componentType = "__tests__/tags/components/hello-internal.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  out.w("
    ");
+  out.w("Hello world");
+  out.w("
    ");
+}, {
+  t: _marko_componentType,
+  d: true
+}, _marko_component);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js
new file mode 100644
index 0000000000..c944c425d1
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/tags/hello.js
@@ -0,0 +1,16 @@
+import "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
+import _helloInternal from "./components/hello-internal.marko";
+import { s as _s } from "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
+import * as _$ from "@marko/runtime-tags/debug/html";
+const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
+  const _scope0_id = _$.nextScopeId();
+  const _dynamicScope = _$.peekNextScope();
+  _$.dynamicTagInput(_dynamicScope, _helloInternal, {});
+  _s(_helloInternal, "__tests__/tags/components/hello-internal.marko");
+  _$.write(_$.markResumeControlEnd(_scope0_id, "#text/0"));
+  _$.writeScope(_scope0_id, {
+    "#text/0!": _$.writeExistingScope(_dynamicScope),
+    "#text/0(": _$.normalizeDynamicRenderer(_helloInternal)
+  });
+});
+export default /* @__PURE__ */_$.createTemplate("__tests__/tags/hello.marko", _renderer);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/template.js b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/template.js
new file mode 100644
index 0000000000..7183a14ddb
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/html.expected/template.js
@@ -0,0 +1,16 @@
+import "marko/src/runtime/helpers/tags-compat/html-debug.mjs";
+import { t as _t } from "marko/src/runtime/html/index.js";
+const _marko_componentType = "__tests__/template.marko",
+  _marko_template = _t(_marko_componentType);
+export default _marko_template;
+import _hello from "./tags/hello.marko";
+import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js";
+import _marko_renderer from "marko/src/runtime/components/renderer.js";
+const _marko_component = {};
+_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) {
+  _marko_dynamic_tag(out, _hello, null, null, null, null, _componentDef, "0");
+}, {
+  t: _marko_componentType,
+  i: true,
+  d: true
+}, _marko_component);
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md
new file mode 100644
index 0000000000..01785ede72
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/resume.expected.md
@@ -0,0 +1,24 @@
+# Render undefined
+```html
+
+  
+  
+    
+    
    
+      Hello world
+    
    
+    
+    
+  
+
+```
+
+# Mutations
+```
+inserted #document/html0/body1/#text1
+inserted #document/html0/body1/#text3
+removed #comment after #document/html0/body1/#comment0
+removed #comment after #document/html0/body1/#text3
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md
new file mode 100644
index 0000000000..69dcc5a0e6
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/__snapshots__/ssr.expected.md
@@ -0,0 +1,37 @@
+# Write
+  
    Hello world
    
+
+
+# Render "End"
+```html
+
+  
+  
+    
+    
+    
    
+      Hello world
+    
    
+    
+    
+    
+  
+
+```
+
+# Mutations
+```
+inserted #document/html0
+inserted #document/html0/head0
+inserted #document/html0/body1
+inserted #document/html0/body1/#comment0
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/h12
+inserted #document/html0/body1/h12/#text0
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/#comment4
+inserted #document/html0/body1/script5
+inserted #document/html0/body1/script5/#text0
+```
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/components/hello-internal.marko b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/components/hello-internal.marko
new file mode 100644
index 0000000000..f6978de4c5
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/components/hello-internal.marko
@@ -0,0 +1,3 @@
+class {}
+
+
    Hello world
    
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/hello.marko b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/hello.marko
new file mode 100644
index 0000000000..b4deb155c3
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/tags/hello.marko
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/template.marko b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/template.marko
new file mode 100644
index 0000000000..1972c155d7
--- /dev/null
+++ b/packages/translator-interop/src/__tests__/fixtures/interop-class-in-components-in-tags-dir/template.marko
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/translator-interop/src/feature-detection.ts b/packages/translator-interop/src/feature-detection.ts
index 3ed44059d6..d985f6dd5a 100644
--- a/packages/translator-interop/src/feature-detection.ts
+++ b/packages/translator-interop/src/feature-detection.ts
@@ -23,23 +23,66 @@ const DEFAULT_FEATURE_TYPE = FeatureType.Class;
 
 export function isTagsAPI(path: t.NodePath) {
   const { file } = path.hub;
+  let featureType = file.path.node.extra?.featureType;
 
-  if ((file as any).___compileStage === "parse") {
-    return false; // can't analyze the entire program for parse hooks
-  }
-
-  const program = file.path;
-  let featureType = program.node.extra?.featureType;
   if (!featureType) {
-    const state = {} as FeatureState;
-    program.node.extra ??= {};
-    program.traverse(featureDetectionVisitor, state);
-    featureType = program.node.extra.featureType =
-      state.feature?.type || DEFAULT_FEATURE_TYPE;
+    const forceTags = isTagsAPIFromFileName(file.opts.filename);
+
+    if ((file as any).___compileStage === "parse") {
+      featureType = forceTags ? FeatureType.Tags : DEFAULT_FEATURE_TYPE;
+    } else {
+      const program = file.path;
+      const state = {} as FeatureState;
+      program.node.extra ??= {};
+      program.traverse(featureDetectionVisitor, state);
+
+      if (forceTags) {
+        if (state.feature?.type === FeatureType.Class) {
+          throw buildAggregateError(
+            path.hub.file,
+            'Cannot use "class api" features under a "tags/" directory',
+            [state.feature.name, state.feature.path],
+          );
+        }
+      }
+
+      featureType = program.node.extra.featureType = forceTags
+        ? FeatureType.Tags
+        : state.feature?.type || DEFAULT_FEATURE_TYPE;
+    }
   }
+
   return featureType === FeatureType.Tags;
 }
 
+const PATH_SEPARATOR_REGEX = /\/|\\/;
+const TAGS_LENGTH = "tags".length;
+const COMPONENTS_LENGTH = "components".length;
+function isTagsAPIFromFileName(filename: string) {
+  const pathSeparator = PATH_SEPARATOR_REGEX.exec(filename)?.[0];
+  if (pathSeparator) {
+    let previousIndex = filename.length - 1;
+    while (previousIndex > 0) {
+      const index = filename.lastIndexOf(pathSeparator, previousIndex);
+      switch (previousIndex - index) {
+        case TAGS_LENGTH: {
+          if (filename.startsWith("tags", index + 1)) {
+            return true;
+          }
+          break;
+        }
+        case COMPONENTS_LENGTH: {
+          if (filename.startsWith("components", index + 1)) {
+            return false;
+          }
+        }
+      }
+      previousIndex = index - 1;
+    }
+  }
+  return false;
+}
+
 const featureDetectionVisitor = {
   MarkoComment(comment, state) {
     if (/^\s*use tags\s*$/.test(comment.node.value)) {
diff --git a/packages/translator-interop/src/index.ts b/packages/translator-interop/src/index.ts
index c45df4673f..c1b97575af 100644
--- a/packages/translator-interop/src/index.ts
+++ b/packages/translator-interop/src/index.ts
@@ -39,6 +39,7 @@ const CANONICAL_TAGDEF_KEYS = {
 };
 const VISITOR_TAGDEF_KEYS = ["parse", "migrate", "transform", "translate"];
 
+export const tagDiscoveryDirs = ["tags", "components"];
 export const taglibs = mergeTaglibs(
   taglib.resolveOptionalTaglibs(optionalTaglibs5).concat(taglibs5),
   taglibs6,