Merge pull request #94 from YurandCL/master

Update prepare script to compile only the necessary files

projects/07-midu-router/package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "prepare": "npm run test && swc ./src/*.jsx -d lib && rm lib/App.js lib/main.js lib/Router.test.js && cp src/*.js lib",
+    "prepare": "npm run test && swc src/components src/utils src/index.jsx -d lib",
     "preview": "vite preview",
     "test": "echo",
     "test:watch": "vitest",

projects/07-midu-router/src/App.jsx

@@ -1,11 +1,10 @@
 import { lazy, Suspense } from 'react'
 
-import './App.css'
 import Page404 from './pages/404.jsx'
 import SearchPage from './pages/Search.jsx'
 
-import { Router } from './Router.jsx'
-import { Route } from './Route.jsx'
+import { Router } from './components/Router.jsx'
+import { Route } from './components/Route.jsx'
 
 const LazyHomePage = lazy(() => import('./pages/Home.jsx'))
 const LazyAboutPage = lazy(() => import('./pages/About.jsx'))

projects/07-midu-router/src/Router.test.jsx

@@ -1,11 +1,11 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { render, screen, cleanup, fireEvent } from '@testing-library/react'
-import { Router } from './Router.jsx'
-import { Route } from './Route.jsx'
-import { Link } from './Link.jsx'
-import { getCurrentPath } from './utils.js'
+import { Router } from './components/Router.jsx'
+import { Route } from './components/Route.jsx'
+import { Link } from './components/Link.jsx'
+import { getCurrentPath } from './utils/getCurrentPath.js'
 
-vi.mock('./utils.js', () => ({
+vi.mock('./utils/getCurrentPath.js', () => ({
   getCurrentPath: vi.fn()
 }))
 
@@ -63,8 +63,8 @@ describe('Router', () => {
     )
 
     // Click on the link
-    const button = screen.getByText(/Go to About/)
-    fireEvent.click(button)
+    const anchor = screen.getByText(/Go to About/)
+    fireEvent.click(anchor)
 
     const aboutTitle = await screen.findByText('About')
 

projects/07-midu-router/src/Link.jsx → projects/07-midu-router/src/components/Link.jsx

@@ -1,4 +1,4 @@
-import { BUTTONS, EVENTS } from './consts.js'
+import { BUTTONS, EVENTS } from '../utils/consts.js'
 
 export function navigate (href) {
   window.history.pushState({}, '', href)

projects/07-midu-router/src/Router.jsx → projects/07-midu-router/src/components/Router.jsx

@@ -1,7 +1,7 @@
-import { EVENTS } from './consts.js'
+import { EVENTS } from '../utils/consts.js'
 import { useState, useEffect, Children } from 'react'
 import { match } from 'path-to-regexp'
-import { getCurrentPath } from './utils.js'
+import { getCurrentPath } from '../utils/getCurrentPath.js'
 
 export function Router ({ children, routes = [], defaultComponent: DefaultComponent = () => <h1>404</h1> }) {
   const [currentPath, setCurrentPath] = useState(getCurrentPath())

projects/07-midu-router/src/index.jsx

@@ -1,3 +1,3 @@
-export { Router } from './Router'
-export { Link } from './Link'
-export { Route } from './Route'
+export { Router } from './components/Router'
+export { Link } from './components/Link'
+export { Route } from './components/Route'

projects/07-midu-router/src/pages/404.jsx

@@ -1,4 +1,4 @@
-import { Link } from '../Link.jsx'
+import { Link } from '../components/Link'
 
 export default function Page404 () {
   return (

projects/07-midu-router/src/pages/About.jsx

@@ -1,4 +1,4 @@
-import { Link } from '../Link.jsx'
+import { Link } from '../components/Link'
 
 const i18n = {
   es: {

projects/07-midu-router/src/pages/Home.jsx

@@ -1,4 +1,4 @@
-import { Link } from '../Link.jsx'
+import { Link } from '../components/Link'
 
 export default function HomePage () {
   return (