From b48f7244b775412536926ca08136459a813c3c71 Mon Sep 17 00:00:00 2001 From: Valerio Ageno <51341197+Valerioageno@users.noreply.github.com> Date: Mon, 28 Apr 2025 20:54:40 +0200 Subject: [PATCH] refactor: turn `tuono-fs-router-vite-plugin` into `tuono-react-vite-plugin` (#756) --- eslint.config.js | 3 +-- .../README.md | 0 .../package.json | 4 ++-- .../src/fs-routing}/build-route-config.spec.ts | 0 .../src/fs-routing}/build-route-config.ts | 3 ++- .../src/fs-routing}/constants.ts | 0 .../src/fs-routing}/generator.ts | 5 +++-- .../src/fs-routing}/has-parent-route.spec.ts | 0 .../src/fs-routing}/has-parent-route.ts | 3 ++- .../src/fs-routing}/is-default-exported.ts | 0 .../src/fs-routing}/sort-route-nodes.spec.ts | 0 .../src/fs-routing}/sort-route-nodes.ts | 3 ++- .../src => tuono-react-vite-plugin/src/fs-routing}/utils.ts | 2 +- packages/tuono-react-vite-plugin/src/index.ts | 1 + .../src/index.ts => tuono-react-vite-plugin/src/plugin.ts} | 6 +++--- .../src/types.ts | 0 .../tests/generator.spec.ts | 2 +- .../tests/generator/catch_all/routeTree.expected.ts | 0 .../tests/generator/catch_all/routes/index.tsx | 0 .../generator/catch_all/routes/posts/[...catch_all].rs | 0 .../generator/catch_all/routes/posts/[...catch_all].tsx | 0 .../tests/generator/mdx/routeTree.expected.ts | 0 .../tests/generator/mdx/routes/__layout.tsx | 0 .../tests/generator/mdx/routes/about.mdx | 0 .../tests/generator/mdx/routes/index.tsx | 0 .../multi-level-root-dynamic/routeTree.expected.ts | 0 .../generator/multi-level-root-dynamic/routes/__layout.tsx | 0 .../generator/multi-level-root-dynamic/routes/about.tsx | 0 .../generator/multi-level-root-dynamic/routes/index.tsx | 0 .../multi-level-root-dynamic/routes/posts/[post].tsx | 0 .../multi-level-root-dynamic/routes/posts/__layout.tsx | 0 .../multi-level-root-dynamic/routes/posts/index.tsx | 0 .../multi-level-root-dynamic/routes/posts/my-post.tsx | 0 .../tests/generator/multi-level/routeTree.expected.ts | 0 .../tests/generator/multi-level/routes/__layout.tsx | 0 .../tests/generator/multi-level/routes/about.tsx | 0 .../tests/generator/multi-level/routes/index.tsx | 0 .../tests/generator/multi-level/routes/posts/my-post.tsx | 0 .../tests/generator/single-level/routeTree.expected.ts | 0 .../tests/generator/single-level/routes/__layout.tsx | 0 .../tests/generator/single-level/routes/about.tsx | 0 .../tests/generator/single-level/routes/index.tsx | 0 .../tsconfig.json | 0 .../vite.config.ts | 0 packages/tuono/package.json | 2 +- packages/tuono/src/build/index.ts | 4 ++-- pnpm-lock.yaml | 6 +++--- 47 files changed, 24 insertions(+), 20 deletions(-) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/README.md (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/package.json (93%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/build-route-config.spec.ts (100%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/build-route-config.ts (91%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/constants.ts (100%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/generator.ts (98%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/has-parent-route.spec.ts (100%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/has-parent-route.ts (95%) rename packages/{tuono-fs-router-vite-plugin/src/utils => tuono-react-vite-plugin/src/fs-routing}/is-default-exported.ts (100%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/sort-route-nodes.spec.ts (100%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/sort-route-nodes.ts (94%) rename packages/{tuono-fs-router-vite-plugin/src => tuono-react-vite-plugin/src/fs-routing}/utils.ts (98%) create mode 100644 packages/tuono-react-vite-plugin/src/index.ts rename packages/{tuono-fs-router-vite-plugin/src/index.ts => tuono-react-vite-plugin/src/plugin.ts} (86%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/src/types.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator.spec.ts (93%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/catch_all/routeTree.expected.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/catch_all/routes/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/catch_all/routes/posts/[...catch_all].rs (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/catch_all/routes/posts/[...catch_all].tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/mdx/routeTree.expected.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/mdx/routes/__layout.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/mdx/routes/about.mdx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/mdx/routes/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routeTree.expected.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/__layout.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/about.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/posts/[post].tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/posts/__layout.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/posts/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level-root-dynamic/routes/posts/my-post.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level/routeTree.expected.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level/routes/__layout.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level/routes/about.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level/routes/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/multi-level/routes/posts/my-post.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/single-level/routeTree.expected.ts (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/single-level/routes/__layout.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/single-level/routes/about.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tests/generator/single-level/routes/index.tsx (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/tsconfig.json (100%) rename packages/{tuono-fs-router-vite-plugin => tuono-react-vite-plugin}/vite.config.ts (100%) diff --git a/eslint.config.js b/eslint.config.js index 1cdc2443..59e80b60 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -31,7 +31,7 @@ const tuonoEslintConfig = tseslint.config( // #endregion shared // #region package-specific - 'packages/tuono-fs-router-vite-plugin/tests/generator/**', + 'packages/tuono-react-vite-plugin/tests/generator/**', 'packages/tuono-lazy-fn-vite-plugin/tests/sources/**', @@ -69,7 +69,6 @@ const tuonoEslintConfig = tseslint.config( { files: [REACT_FILES_MATCH], plugins: { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment 'react-hooks': eslintPluginReactHooks, }, rules: { diff --git a/packages/tuono-fs-router-vite-plugin/README.md b/packages/tuono-react-vite-plugin/README.md similarity index 100% rename from packages/tuono-fs-router-vite-plugin/README.md rename to packages/tuono-react-vite-plugin/README.md diff --git a/packages/tuono-fs-router-vite-plugin/package.json b/packages/tuono-react-vite-plugin/package.json similarity index 93% rename from packages/tuono-fs-router-vite-plugin/package.json rename to packages/tuono-react-vite-plugin/package.json index ce3baf88..9468c897 100644 --- a/packages/tuono-fs-router-vite-plugin/package.json +++ b/packages/tuono-react-vite-plugin/package.json @@ -1,5 +1,5 @@ { - "name": "tuono-fs-router-vite-plugin", + "name": "tuono-react-vite-plugin", "version": "0.19.4", "description": "Plugin for the tuono's file system router. Tuono is the react/rust fullstack framework", "homepage": "https://tuono.dev", @@ -16,7 +16,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tuono-labs/tuono.git", - "directory": "packages/tuono-fs-router-vite-plugin" + "directory": "packages/tuono-react-vite-plugin" }, "keywords": [], "author": "Valerio Ageno", diff --git a/packages/tuono-fs-router-vite-plugin/src/build-route-config.spec.ts b/packages/tuono-react-vite-plugin/src/fs-routing/build-route-config.spec.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/build-route-config.spec.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/build-route-config.spec.ts diff --git a/packages/tuono-fs-router-vite-plugin/src/build-route-config.ts b/packages/tuono-react-vite-plugin/src/fs-routing/build-route-config.ts similarity index 91% rename from packages/tuono-fs-router-vite-plugin/src/build-route-config.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/build-route-config.ts index d4201719..0e784360 100644 --- a/packages/tuono-fs-router-vite-plugin/src/build-route-config.ts +++ b/packages/tuono-react-vite-plugin/src/fs-routing/build-route-config.ts @@ -1,5 +1,6 @@ +import type { RouteNode } from '../types' + import { spaces } from './utils' -import type { RouteNode } from './types' export function buildRouteConfig(nodes: Array, depth = 1): string { const children = nodes.map((node) => { diff --git a/packages/tuono-fs-router-vite-plugin/src/constants.ts b/packages/tuono-react-vite-plugin/src/fs-routing/constants.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/constants.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/constants.ts diff --git a/packages/tuono-fs-router-vite-plugin/src/generator.ts b/packages/tuono-react-vite-plugin/src/fs-routing/generator.ts similarity index 98% rename from packages/tuono-fs-router-vite-plugin/src/generator.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/generator.ts index 9e6dad06..636c84e5 100644 --- a/packages/tuono-fs-router-vite-plugin/src/generator.ts +++ b/packages/tuono-react-vite-plugin/src/fs-routing/generator.ts @@ -3,6 +3,8 @@ import path from 'path' import { format } from 'prettier' +import type { Config, RouteNode } from '../types' + import { buildRouteConfig } from './build-route-config' import { hasParentRoute } from './has-parent-route' import { @@ -17,7 +19,6 @@ import { removeUnderscores, } from './utils' -import type { Config, RouteNode } from './types' import { ROUTES_FOLDER, LAYOUT_PATH_ID, @@ -26,7 +27,7 @@ import { } from './constants' import { sortRouteNodes } from './sort-route-nodes' -import isDefaultExported from './utils/is-default-exported' +import isDefaultExported from './is-default-exported' let latestTask = 0 diff --git a/packages/tuono-fs-router-vite-plugin/src/has-parent-route.spec.ts b/packages/tuono-react-vite-plugin/src/fs-routing/has-parent-route.spec.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/has-parent-route.spec.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/has-parent-route.spec.ts diff --git a/packages/tuono-fs-router-vite-plugin/src/has-parent-route.ts b/packages/tuono-react-vite-plugin/src/fs-routing/has-parent-route.ts similarity index 95% rename from packages/tuono-fs-router-vite-plugin/src/has-parent-route.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/has-parent-route.ts index 6708e02f..143629c2 100644 --- a/packages/tuono-fs-router-vite-plugin/src/has-parent-route.ts +++ b/packages/tuono-react-vite-plugin/src/fs-routing/has-parent-route.ts @@ -1,6 +1,7 @@ +import type { RouteNode } from '../types' + import { LAYOUT_PATH_ID } from './constants' import { multiSortBy } from './utils' -import type { RouteNode } from './types' export function hasParentRoute( routes: Array, diff --git a/packages/tuono-fs-router-vite-plugin/src/utils/is-default-exported.ts b/packages/tuono-react-vite-plugin/src/fs-routing/is-default-exported.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/utils/is-default-exported.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/is-default-exported.ts diff --git a/packages/tuono-fs-router-vite-plugin/src/sort-route-nodes.spec.ts b/packages/tuono-react-vite-plugin/src/fs-routing/sort-route-nodes.spec.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/sort-route-nodes.spec.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/sort-route-nodes.spec.ts diff --git a/packages/tuono-fs-router-vite-plugin/src/sort-route-nodes.ts b/packages/tuono-react-vite-plugin/src/fs-routing/sort-route-nodes.ts similarity index 94% rename from packages/tuono-fs-router-vite-plugin/src/sort-route-nodes.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/sort-route-nodes.ts index 30784112..40f665d2 100644 --- a/packages/tuono-fs-router-vite-plugin/src/sort-route-nodes.ts +++ b/packages/tuono-react-vite-plugin/src/fs-routing/sort-route-nodes.ts @@ -1,4 +1,5 @@ -import type { RouteNode } from './types' +import type { RouteNode } from '../types' + import { multiSortBy } from './utils' import { LAYOUT_PATH_ID } from './constants' diff --git a/packages/tuono-fs-router-vite-plugin/src/utils.ts b/packages/tuono-react-vite-plugin/src/fs-routing/utils.ts similarity index 98% rename from packages/tuono-fs-router-vite-plugin/src/utils.ts rename to packages/tuono-react-vite-plugin/src/fs-routing/utils.ts index 37fac9d6..7b38e8ce 100644 --- a/packages/tuono-fs-router-vite-plugin/src/utils.ts +++ b/packages/tuono-react-vite-plugin/src/fs-routing/utils.ts @@ -1,4 +1,4 @@ -import type { RouteNode } from './types' +import type { RouteNode } from '../types' export function removeExt(d: string, keepExtension: boolean = false): string { return keepExtension ? d : d.substring(0, d.lastIndexOf('.')) || d diff --git a/packages/tuono-react-vite-plugin/src/index.ts b/packages/tuono-react-vite-plugin/src/index.ts new file mode 100644 index 00000000..3f9759f1 --- /dev/null +++ b/packages/tuono-react-vite-plugin/src/index.ts @@ -0,0 +1 @@ +export { TuonoReactPlugin } from './plugin' diff --git a/packages/tuono-fs-router-vite-plugin/src/index.ts b/packages/tuono-react-vite-plugin/src/plugin.ts similarity index 86% rename from packages/tuono-fs-router-vite-plugin/src/index.ts rename to packages/tuono-react-vite-plugin/src/plugin.ts index 7a8456fd..04d01bfe 100644 --- a/packages/tuono-fs-router-vite-plugin/src/index.ts +++ b/packages/tuono-react-vite-plugin/src/plugin.ts @@ -2,13 +2,13 @@ import { normalize } from 'node:path' import type { Plugin } from 'vite' -import { routeGenerator } from './generator' +import { routeGenerator } from './fs-routing/generator' const ROUTES_DIRECTORY_PATH = './src/routes' let lock = false -export function TuonoFsRouterPlugin(): Plugin { +export function TuonoReactPlugin(): Plugin { const generate = async (): Promise => { if (lock) return lock = true @@ -31,7 +31,7 @@ export function TuonoFsRouterPlugin(): Plugin { } return { - name: 'vite-plugin-tuono-fs-router', + name: 'vite-plugin-tuono-react', configResolved: async (): Promise => { await generate() }, diff --git a/packages/tuono-fs-router-vite-plugin/src/types.ts b/packages/tuono-react-vite-plugin/src/types.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/src/types.ts rename to packages/tuono-react-vite-plugin/src/types.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator.spec.ts b/packages/tuono-react-vite-plugin/tests/generator.spec.ts similarity index 93% rename from packages/tuono-fs-router-vite-plugin/tests/generator.spec.ts rename to packages/tuono-react-vite-plugin/tests/generator.spec.ts index efa7909d..e4b02a8f 100644 --- a/packages/tuono-fs-router-vite-plugin/tests/generator.spec.ts +++ b/packages/tuono-react-vite-plugin/tests/generator.spec.ts @@ -2,7 +2,7 @@ import fs from 'fs/promises' import { describe, it, expect } from 'vitest' -import { routeGenerator } from '../src/generator' +import { routeGenerator } from '../src/fs-routing/generator' describe('generator works', async () => { const folderNames = await fs.readdir(`${process.cwd()}/tests/generator`) diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routeTree.expected.ts b/packages/tuono-react-vite-plugin/tests/generator/catch_all/routeTree.expected.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routeTree.expected.ts rename to packages/tuono-react-vite-plugin/tests/generator/catch_all/routeTree.expected.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs b/packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs rename to packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].tsx b/packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].tsx rename to packages/tuono-react-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routeTree.expected.ts b/packages/tuono-react-vite-plugin/tests/generator/mdx/routeTree.expected.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routeTree.expected.ts rename to packages/tuono-react-vite-plugin/tests/generator/mdx/routeTree.expected.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/__layout.tsx b/packages/tuono-react-vite-plugin/tests/generator/mdx/routes/__layout.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/__layout.tsx rename to packages/tuono-react-vite-plugin/tests/generator/mdx/routes/__layout.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/about.mdx b/packages/tuono-react-vite-plugin/tests/generator/mdx/routes/about.mdx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/about.mdx rename to packages/tuono-react-vite-plugin/tests/generator/mdx/routes/about.mdx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/mdx/routes/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/mdx/routes/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/mdx/routes/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routeTree.expected.ts b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routeTree.expected.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routeTree.expected.ts rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routeTree.expected.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/__layout.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/__layout.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/__layout.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/__layout.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/about.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/about.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/about.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/about.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/[post].tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/[post].tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/[post].tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/[post].tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/__layout.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/__layout.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/__layout.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/__layout.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/my-post.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/my-post.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/my-post.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level-root-dynamic/routes/posts/my-post.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routeTree.expected.ts b/packages/tuono-react-vite-plugin/tests/generator/multi-level/routeTree.expected.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routeTree.expected.ts rename to packages/tuono-react-vite-plugin/tests/generator/multi-level/routeTree.expected.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/__layout.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/__layout.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/__layout.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/__layout.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/about.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/about.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/about.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/about.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/posts/my-post.tsx b/packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/posts/my-post.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/multi-level/routes/posts/my-post.tsx rename to packages/tuono-react-vite-plugin/tests/generator/multi-level/routes/posts/my-post.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routeTree.expected.ts b/packages/tuono-react-vite-plugin/tests/generator/single-level/routeTree.expected.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routeTree.expected.ts rename to packages/tuono-react-vite-plugin/tests/generator/single-level/routeTree.expected.ts diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/__layout.tsx b/packages/tuono-react-vite-plugin/tests/generator/single-level/routes/__layout.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/__layout.tsx rename to packages/tuono-react-vite-plugin/tests/generator/single-level/routes/__layout.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/about.tsx b/packages/tuono-react-vite-plugin/tests/generator/single-level/routes/about.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/about.tsx rename to packages/tuono-react-vite-plugin/tests/generator/single-level/routes/about.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/index.tsx b/packages/tuono-react-vite-plugin/tests/generator/single-level/routes/index.tsx similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tests/generator/single-level/routes/index.tsx rename to packages/tuono-react-vite-plugin/tests/generator/single-level/routes/index.tsx diff --git a/packages/tuono-fs-router-vite-plugin/tsconfig.json b/packages/tuono-react-vite-plugin/tsconfig.json similarity index 100% rename from packages/tuono-fs-router-vite-plugin/tsconfig.json rename to packages/tuono-react-vite-plugin/tsconfig.json diff --git a/packages/tuono-fs-router-vite-plugin/vite.config.ts b/packages/tuono-react-vite-plugin/vite.config.ts similarity index 100% rename from packages/tuono-fs-router-vite-plugin/vite.config.ts rename to packages/tuono-react-vite-plugin/vite.config.ts diff --git a/packages/tuono/package.json b/packages/tuono/package.json index 07c4c0dd..feea62dc 100644 --- a/packages/tuono/package.json +++ b/packages/tuono/package.json @@ -71,7 +71,7 @@ "@rollup/plugin-inject": "^5.0.5", "@vitejs/plugin-react-swc": "^3.8.0", "fast-text-encoding": "^1.0.6", - "tuono-fs-router-vite-plugin": "workspace:*", + "tuono-react-vite-plugin": "workspace:*", "tuono-router": "workspace:*", "url-search-params-polyfill": "^8.2.5", "vite": "^6.1.1", diff --git a/packages/tuono/src/build/index.ts b/packages/tuono/src/build/index.ts index 0aacf3d3..3f99f816 100644 --- a/packages/tuono/src/build/index.ts +++ b/packages/tuono/src/build/index.ts @@ -2,7 +2,7 @@ import type { InlineConfig, Plugin } from 'vite' import { build, createServer, mergeConfig } from 'vite' import react from '@vitejs/plugin-react-swc' import inject from '@rollup/plugin-inject' -import { TuonoFsRouterPlugin } from 'tuono-fs-router-vite-plugin' +import { TuonoReactPlugin } from 'tuono-react-vite-plugin' import type { TuonoConfig } from '../config' @@ -71,7 +71,7 @@ function createBaseViteConfigFromTuonoConfig( // @ts-expect-error see above comment react({ include: pluginFilesInclude }), - TuonoFsRouterPlugin(), + TuonoReactPlugin(), ], } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 817b9fd3..00cf8f80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -208,9 +208,9 @@ importers: fast-text-encoding: specifier: ^1.0.6 version: 1.0.6 - tuono-fs-router-vite-plugin: + tuono-react-vite-plugin: specifier: workspace:* - version: link:../tuono-fs-router-vite-plugin + version: link:../tuono-react-vite-plugin tuono-router: specifier: workspace:* version: link:../tuono-router @@ -252,7 +252,7 @@ importers: specifier: 3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.1)(happy-dom@17.4.4)(jiti@2.4.2)(lightningcss@1.29.1)(sugarss@4.0.1(postcss@8.5.3)) - packages/tuono-fs-router-vite-plugin: + packages/tuono-react-vite-plugin: dependencies: '@babel/core': specifier: ^7.24.4