diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md index 9a510e91e8dcb3..e9ceac709d004c 100644 --- a/docs/guide/api-plugin.md +++ b/docs/guide/api-plugin.md @@ -584,7 +584,7 @@ export default function myPlugin() { ``` ::: tip -[`@rolldown/pluginutils`](https://www.npmjs.com/package/@rolldown/pluginutils) exports some utilities for hook filters like `exactRegex` and `prefixRegex`. +[`@rolldown/pluginutils`](https://www.npmjs.com/package/@rolldown/pluginutils) exports some utilities for hook filters like `exactRegex` and `prefixRegex`. These are also re-exported from `rolldown/filter` for convenience. ::: ## Client-server Communication diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index 9fdbcafbf6e54d..bd80a72c138380 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -95,38 +95,6 @@ Repository: https://github.com/lukeed/polka --------------------------------------- -## @rolldown/pluginutils -License: MIT -Repository: https://github.com/rolldown/rolldown - -> MIT License -> -> Copyright (c) 2024-present VoidZero Inc. & Contributors -> -> Permission is hereby granted, free of charge, to any person obtaining a copy -> of this software and associated documentation files (the "Software"), to deal -> in the Software without restriction, including without limitation the rights -> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -> copies of the Software, and to permit persons to whom the Software is -> furnished to do so, subject to the following conditions: -> -> The above copyright notice and this permission notice shall be included in all -> copies or substantial portions of the Software. -> -> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -> SOFTWARE. -> -> end of terms and conditions -> -> The licenses of externally maintained libraries from which parts of the Software is derived are listed [here](https://github.com/rolldown/rolldown/blob/main/THIRD-PARTY-LICENSE). - ---------------------------------------- - ## @rollup/plugin-alias, @rollup/plugin-dynamic-import-vars, @rollup/pluginutils License: MIT By: Johannes Stein diff --git a/packages/vite/package.json b/packages/vite/package.json index d87629349040a5..f2575e986581f9 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -90,7 +90,6 @@ "@jridgewell/trace-mapping": "^0.3.31", "@oxc-project/types": "0.112.0", "@polka/compression": "^1.0.0-next.25", - "@rolldown/pluginutils": "1.0.0-rc.3", "@rollup/plugin-alias": "^5.1.1", "@rollup/plugin-commonjs": "^29.0.0", "@rollup/plugin-dynamic-import-vars": "2.1.4", diff --git a/packages/vite/src/node/__tests__/plugins/index.spec.ts b/packages/vite/src/node/__tests__/plugins/index.spec.ts index d5df5e06de7237..e507a173defd1a 100644 --- a/packages/vite/src/node/__tests__/plugins/index.spec.ts +++ b/packages/vite/src/node/__tests__/plugins/index.spec.ts @@ -1,5 +1,5 @@ import { RUNTIME_MODULE_ID } from 'rolldown' -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import { afterAll, describe, expect, test, vi } from 'vitest' import { type InlineConfig, type Plugin, build, createServer } from '../..' diff --git a/packages/vite/src/node/optimizer/rolldownDepPlugin.ts b/packages/vite/src/node/optimizer/rolldownDepPlugin.ts index 674a1e00c6659e..3c7ebb12f4ae99 100644 --- a/packages/vite/src/node/optimizer/rolldownDepPlugin.ts +++ b/packages/vite/src/node/optimizer/rolldownDepPlugin.ts @@ -1,6 +1,6 @@ import path from 'node:path' import type { ImportKind, Plugin, RolldownPlugin } from 'rolldown' -import { prefixRegex } from '@rolldown/pluginutils' +import { prefixRegex } from 'rolldown/filter' import MagicString from 'magic-string' import { stripLiteral } from 'strip-literal' import { JS_TYPES_RE, KNOWN_ASSET_TYPES } from '../constants' diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts index d8ea8a441506a9..61906846c9bdbb 100644 --- a/packages/vite/src/node/plugins/asset.ts +++ b/packages/vite/src/node/plugins/asset.ts @@ -10,7 +10,7 @@ import type { import MagicString from 'magic-string' import colors from 'picocolors' import picomatch from 'picomatch' -import { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils' +import { makeIdFiltersToMatchWithQuery } from 'rolldown/filter' import { createToImportMetaURLBasedRelativeRuntime, toOutputFilePathInJS, diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts index 5d31786176e2b1..803441509f5221 100644 --- a/packages/vite/src/node/plugins/assetImportMetaUrl.ts +++ b/packages/vite/src/node/plugins/assetImportMetaUrl.ts @@ -1,7 +1,7 @@ import path from 'node:path' import MagicString from 'magic-string' import { stripLiteral } from 'strip-literal' -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import type { Plugin } from '../plugin' import type { ResolvedConfig } from '../config' import { diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts index faac6860dd7072..b164eab0ee46bf 100644 --- a/packages/vite/src/node/plugins/dynamicImportVars.ts +++ b/packages/vite/src/node/plugins/dynamicImportVars.ts @@ -5,7 +5,7 @@ import type { ImportSpecifier } from 'es-module-lexer' import { parseAst } from 'rolldown/parseAst' import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars' import { viteDynamicImportVarsPlugin as nativeDynamicImportVarsPlugin } from 'rolldown/experimental' -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import { type Plugin, perEnvironmentPlugin } from '../plugin' import type { ResolvedConfig } from '../config' import { CLIENT_ENTRY } from '../constants' diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 53faae2872bc1d..da1f98826c5444 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -9,7 +9,7 @@ import type { SourceMap } from 'rolldown' import { viteBuildImportAnalysisPlugin as nativeBuildImportAnalysisPlugin } from 'rolldown/experimental' import type { RawSourceMap } from '@jridgewell/remapping' import convertSourceMap from 'convert-source-map' -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import { combineSourcemaps, generateCodeFrame, numberToPos } from '../utils' import { type Plugin, perEnvironmentPlugin } from '../plugin' import type { ResolvedConfig } from '../config' diff --git a/packages/vite/src/node/plugins/modulePreloadPolyfill.ts b/packages/vite/src/node/plugins/modulePreloadPolyfill.ts index 224fe3e3367ad7..2d92db55c97065 100644 --- a/packages/vite/src/node/plugins/modulePreloadPolyfill.ts +++ b/packages/vite/src/node/plugins/modulePreloadPolyfill.ts @@ -1,4 +1,4 @@ -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import { viteModulePreloadPolyfillPlugin as nativeModulePreloadPolyfillPlugin } from 'rolldown/experimental' import { type ResolvedConfig, perEnvironmentPlugin } from '..' import type { Plugin } from '../plugin' diff --git a/packages/vite/src/node/plugins/oxc.ts b/packages/vite/src/node/plugins/oxc.ts index e152fe4bf6db0b..788cabf9a87797 100644 --- a/packages/vite/src/node/plugins/oxc.ts +++ b/packages/vite/src/node/plugins/oxc.ts @@ -13,7 +13,7 @@ import type { InternalModuleFormat, RollupError, SourceMap } from 'rolldown' import { rolldown } from 'rolldown' import { TSConfckParseError } from 'tsconfck' import colors from 'picocolors' -import { exactRegex, prefixRegex } from '@rolldown/pluginutils' +import { exactRegex, prefixRegex } from 'rolldown/filter' import type { FSWatcher } from '#dep-types/chokidar' import { combineSourcemaps, diff --git a/packages/vite/src/node/plugins/wasm.ts b/packages/vite/src/node/plugins/wasm.ts index 8fa123c920686a..99508032e5daa6 100644 --- a/packages/vite/src/node/plugins/wasm.ts +++ b/packages/vite/src/node/plugins/wasm.ts @@ -1,4 +1,4 @@ -import { exactRegex } from '@rolldown/pluginutils' +import { exactRegex } from 'rolldown/filter' import { viteWasmHelperPlugin as nativeWasmHelperPlugin } from 'rolldown/experimental' import type { Plugin } from '../plugin' import type { ResolvedConfig } from '..' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e07560fbd028b3..8e95f50822e5d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -274,9 +274,6 @@ importers: '@polka/compression': specifier: ^1.0.0-next.25 version: 1.0.0-next.25 - '@rolldown/pluginutils': - specifier: 1.0.0-rc.3 - version: 1.0.0-rc.3 '@rollup/plugin-alias': specifier: ^5.1.1 version: 5.1.1(rollup@4.57.1)