Merge pull request #455 from dev-five-git/turbo-files-issue

Turbo files issue

Author: owjs3901

.changeset/slow-years-flow.md

@@ -0,0 +1,5 @@
+---
+'@devup-ui/next-plugin': patch
+---
+
+Refactor collecting files

apps/landing/src/components/Code.tsx

@@ -32,7 +32,12 @@ export const Code = ({
         }}
         display="none"
       >
-        <SyntaxHighlighter language={language} showLineNumbers style={Dark}>
+        <SyntaxHighlighter
+          customStyle={{ margin: 0 }}
+          language={language}
+          showLineNumbers
+          style={Dark}
+        >
           {value}
         </SyntaxHighlighter>
       </Box>

apps/landing/tsconfig.json

@@ -11,7 +11,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {

packages/next-plugin/package.json

@@ -43,7 +43,8 @@
   "dependencies": {
     "@devup-ui/webpack-plugin": "workspace:*",
     "next": "^16.0",
-    "@devup-ui/wasm": "workspace:*"
+    "@devup-ui/wasm": "workspace:*",
+    "glob": "^11.0"
   },
   "devDependencies": {
     "vite": "^7.1",

packages/next-plugin/src/__tests__/find-root.test.ts

@@ -1,44 +1,41 @@
-import { globSync, writeFileSync } from 'node:fs'
+import { writeFileSync } from 'node:fs'
 import { readFileSync } from 'node:fs'
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 
 import { codeExtract, registerTheme } from '@devup-ui/wasm'
+import { globSync } from 'glob'
 
-import { findRoot } from '../find-root'
 import { preload } from '../preload'
 
 // Mock dependencies
 vi.mock('node:fs')
 vi.mock('@devup-ui/wasm')
-vi.mock('../find-root')
+vi.mock('glob')
 
 // Mock globSync
 vi.mock('node:fs', () => ({
-  globSync: vi.fn(),
   readFileSync: vi.fn(),
   writeFileSync: vi.fn(),
   mkdirSync: vi.fn(),
   existsSync: vi.fn(),
 }))
 
+vi.mock('glob', () => ({
+  globSync: vi.fn(),
+}))
+
 // Mock @devup-ui/wasm
 vi.mock('@devup-ui/wasm', () => ({
   codeExtract: vi.fn(),
   registerTheme: vi.fn(),
 }))
 
-// Mock findRoot
-vi.mock('../find-root', () => ({
-  findRoot: vi.fn(),
-}))
-
 describe('preload', () => {
   beforeEach(() => {
     vi.clearAllMocks()
 
     // Default mock implementations
-    vi.mocked(findRoot).mockReturnValue('/project/root')
     vi.mocked(globSync).mockReturnValue([
       'src/App.tsx',
       'src/components/Button.tsx',
@@ -67,12 +64,10 @@ describe('preload', () => {
 
     preload(excludeRegex, libPackage, singleCss, theme, cssDir)
 
-    expect(findRoot).toHaveBeenCalledWith(process.cwd())
     expect(globSync).toHaveBeenCalledWith(
       ['**/*.tsx', '**/*.ts', '**/*.js', '**/*.mjs'],
       {
-        cwd: '/project/root',
-        exclude: expect.any(Function),
+        follow: true,
       },
     )
   })
@@ -86,7 +81,7 @@ describe('preload', () => {
   })
 
   it('should process each collected file', () => {
-    const files = ['src/App.tsx', 'src/components/Button.tsx']
+    const files = ['src/App.tsx', 'src/components/Button.tsx', '.next/page.tsx']
     vi.mocked(globSync).mockReturnValue(files)
 
     preload(/node_modules/, '@devup-ui/react', false, {}, '/output/css')
@@ -235,25 +230,4 @@ describe('preload', () => {
       'utf-8',
     )
   })
-  it('should handle exclude regex', () => {
-    const excludeRegex = /node_modules/
-    const libPackage = '@devup-ui/react'
-    const singleCss = false
-    const theme = { colors: { primary: 'blue' } }
-    const cssDir = '/output/css'
-
-    preload(excludeRegex, libPackage, singleCss, theme, cssDir)
-    expect(globSync).toHaveBeenCalledWith(
-      ['**/*.tsx', '**/*.ts', '**/*.js', '**/*.mjs'],
-      {
-        cwd: '/project/root',
-        exclude: expect.any(Function),
-      },
-    )
-    expect(
-      (vi.mocked(globSync).mock.calls[0][1].exclude as any)(
-        '/node_modules/react.tsx',
-      ),
-    ).toBe(true)
-  })
 })

packages/next-plugin/src/__tests__/preload.test.ts

@@ -1,9 +1,8 @@
-import { globSync, readFileSync, writeFileSync } from 'node:fs'
+import { readFileSync, writeFileSync } from 'node:fs'
 import { basename, join, relative } from 'node:path'
 
 import { codeExtract, registerTheme } from '@devup-ui/wasm'
-
-import { findRoot } from './find-root'
+import { globSync } from 'glob'
 
 export function preload(
   excludeRegex: RegExp,
@@ -12,14 +11,19 @@ export function preload(
   theme: object,
   cssDir: string,
 ) {
-  const projectRoot = findRoot(process.cwd())
+  const projectRoot = process.cwd()
 
   const collected = globSync(['**/*.tsx', '**/*.ts', '**/*.js', '**/*.mjs'], {
-    cwd: projectRoot,
-    exclude: (fileName) => excludeRegex.test(fileName),
+    follow: true,
   })
   registerTheme(theme)
   for (const file of collected) {
+    if (
+      /\.(test(-d)?|d|spec)\.(tsx|ts|js|mjs)$/.test(file) ||
+      /^(out|.next)[/\\]/.test(file) ||
+      excludeRegex.test(file)
+    )
+      continue
     const filePath = relative(process.cwd(), join(projectRoot, file))
     const { cssFile, css } = codeExtract(
       filePath,