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

feat(webpack): add scan-only mode to adapt webpack5 persistent cache #2652

Closed
wants to merge 1 commit into from
Closed

feat(webpack): add scan-only mode to adapt webpack5 persistent cache #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions packages/core/src/types.ts
View file
Open in desktop
Expand Up @@ -648,6 +648,12 @@ export interface ExtraContentOptions {
* Plain text to be extracted
*/
plain?: string[]

/**
* enable/disable file watching
* @default false
*/
enableWatch?: boolean
}

/**
Expand Down
18 changes: 15 additions & 3 deletions packages/webpack/src/index.ts
View file
Open in desktop
Expand Up @@ -9,7 +9,16 @@ import { HASH_PLACEHOLDER_RE, LAYER_MARK_ALL, LAYER_PLACEHOLDER_RE, RESOLVED_ID_
import { applyTransformers } from '../../shared-integration/src/transformers'
import { getPath, isCssId } from '../../shared-integration/src/utils'

export interface WebpackPluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {}
export interface WebpackPluginOptions<Theme extends {} = {}> extends UserConfig<Theme> {
/**
* only extract files through `PluginOptions.ExtraContentOptions`
* In order to fix the bug of persistent caching in Webpack5
* @see: https://github.com/unocss/unocss/issues/419
*
* @default false
*/
scanModeOnly?: boolean
}

const PLUGIN_NAME = 'unocss:webpack'
const UPDATE_DEBOUNCE = 10
Expand All @@ -24,6 +33,7 @@ export default function WebpackPlugin<Theme extends {}>(
) {
return createUnplugin(() => {
const ctx = createContext<WebpackPluginOptions>(configOrPath as any, defaults)
const inlineConfig = (configOrPath && typeof configOrPath !== 'string') ? configOrPath : {}
const { uno, tokens, filter, extract, onInvalidate, tasks, flushTasks } = ctx

let timer: any
Expand All @@ -43,7 +53,8 @@ export default function WebpackPlugin<Theme extends {}>(
}

// TODO: detect webpack's watch mode and enable watcher
tasks.push(setupExtraContent(ctx))
const shouldWatch = ctx.uno.config.extraContent?.enableWatch ?? false
tasks.push(setupExtraContent(ctx, shouldWatch))

const entries = new Set<string>()
const hashes = new Map<string, string>()
Expand All @@ -52,7 +63,8 @@ export default function WebpackPlugin<Theme extends {}>(
name: 'unocss:webpack',
enforce: 'pre',
transformInclude(id) {
return filter('', id) && !id.match(/\.html$/) && !RESOLVED_ID_RE.test(id)
// transform nothing in scan mode
return !inlineConfig.scanModeOnly && filter('', id) && !id.match(/\.html$/) && !RESOLVED_ID_RE.test(id)
},
async transform(code, id) {
const result = await applyTransformers(ctx, code, id, 'pre')
Expand Down