Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(nuxt,schema): do not watch buildDir and node_modules #22214

Merged
merged 17 commits into from Jul 19, 2023
Merged

perf(nuxt,schema): do not watch buildDir and node_modules #22214

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4c8a3e3
fix(schema): ignore relative paths for `buildDir`
danielroe Jul 19, 2023
afff8d4
fix(nuxt): ignore `node_modules` folders within watched paths
danielroe Jul 19, 2023
712b87c
fix(schema): ignore nested output/git/cache dirs
danielroe Jul 19, 2023
ba7ae91
perf(schema): exclude other common output dirs
danielroe Jul 19, 2023
5ae1fc3
fix: simplify and include cts/mts in ignore patterns
danielroe Jul 19, 2023
e7bc2db
fix: add `.data` to ignore list
danielroe Jul 19, 2023
da28085
fix(nuxt): run component transform on source files within `buildDir`
danielroe Jul 19, 2023
0bd46e2
fix(nuxt): check if watchers exist before closing
danielroe Jul 19, 2023
728b78a
fix: remove extra buildDir
danielroe Jul 19, 2023
5666eac
Merge remote-tracking branch 'origin/main' into fix/quis-custodiet
danielroe Jul 19, 2023
77a59b4
fix(nuxt): include buildDir in components transform
danielroe Jul 19, 2023
ccca10d
chore: don't copy buildDir/cache when testing
danielroe Jul 19, 2023
ee0cf09
fix: normalize id
danielroe Jul 19, 2023
e3a6829
Merge remote-tracking branch 'origin/main' into fix/quis-custodiet
danielroe Jul 19, 2023
ff692b2
fix: prepare temp dir
danielroe Jul 19, 2023
7d656d4
fix: copy across nuxt
danielroe Jul 19, 2023
e206fd8
fix: explicitly include virtual files
danielroe Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nuxt/src/components/module.ts
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@ export default defineNuxtModule<ComponentsOptions>({
pattern: dirOptions.pattern || `**/*.{${extensions.join(',')},}`,
ignore: [
'**/*{M,.m,-m}ixin.{js,ts,jsx,tsx}', // ignore mixins
'**/*.d.ts', // .d.ts files
'**/*.d.{cts,mts,ts}', // .d.ts files
...(dirOptions.ignore || [])
],
transpile: (transpile === 'auto' ? dirPath.includes('node_modules') : transpile)
Expand Down
3 changes: 1 addition & 2 deletions packages/nuxt/src/core/builder.ts
View file
Open in desktop
Expand Up @@ -76,7 +76,6 @@ function createWatcher () {
ignoreInitial: true,
ignored: [
isIgnored,
'.nuxt',
'node_modules'
]
})
Expand Down Expand Up @@ -104,7 +103,7 @@ function createGranularWatcher () {
}
for (const dir of pathsToWatch) {
pending++
const watcher = chokidar.watch(dir, { ...nuxt.options.watchers.chokidar, ignoreInitial: false, depth: 0, ignored: [isIgnored] })
const watcher = chokidar.watch(dir, { ...nuxt.options.watchers.chokidar, ignoreInitial: false, depth: 0, ignored: [isIgnored, '**/node_modules'] })
const watchers: Record<string, FSWatcher> = {}

watcher.on('all', (event, path) => {
Expand Down
17 changes: 8 additions & 9 deletions packages/schema/src/config/common.ts
View file
Open in desktop
@@ -1,5 +1,5 @@
import { defineUntypedSchema } from 'untyped'
import { join, resolve } from 'pathe'
import { join, relative, resolve } from 'pathe'
import { isDebug, isDevelopment } from 'std-env'
import { defu } from 'defu'
import { findWorkspaceDir } from 'pkg-types'
Expand Down Expand Up @@ -352,14 +352,13 @@ export default defineUntypedSchema({
*/
ignore: {
$resolve: async (val, get) => [
'**/*.stories.{js,ts,jsx,tsx}', // ignore storybook files
'**/*.{spec,test}.{js,ts,jsx,tsx}', // ignore tests
'**/*.d.ts', // ignore type declarations
'.output',
'.git',
'.cache',
await get('analyzeDir'),
await get('buildDir'),
'**/*.stories.{js,cts,mts,ts,jsx,tsx}', // ignore storybook files
'**/*.{spec,test}.{js,cts,mts,ts,jsx,tsx}', // ignore tests
'**/*.d.{cts,mts,ts}', // ignore type declarations
'**/.{vercel,netlify,output,git,cache,data}',
'**/dist',
relative(await get('rootDir'), await get('analyzeDir')),
relative(await get('rootDir'), await get('buildDir')),
await get('ignorePrefix') && `**/${await get('ignorePrefix')}*.*`
].concat(val).filter(Boolean)
},
Expand Down