From cd6c2a8974acff76210d62015550bfc556937332 Mon Sep 17 00:00:00 2001 From: patak Date: Mon, 13 Jun 2022 16:52:16 +0200 Subject: [PATCH] feat: expose createFilter util (#8562) --- packages/plugin-vue-jsx/package.json | 1 - packages/plugin-vue-jsx/src/index.ts | 2 +- packages/plugin-vue-jsx/src/types.ts | 2 +- packages/plugin-vue/package.json | 3 --- packages/plugin-vue/src/index.ts | 2 +- packages/plugin-vue/src/main.ts | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 1e345081..474bfa48 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -38,7 +38,6 @@ "@babel/core": "^7.18.2", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-transform-typescript": "^7.18.4", - "@rollup/pluginutils": "^4.2.1", "@vue/babel-plugin-jsx": "^1.1.1" }, "devDependencies": { diff --git a/packages/plugin-vue-jsx/src/index.ts b/packages/plugin-vue-jsx/src/index.ts index c3edb77c..48de3da4 100644 --- a/packages/plugin-vue-jsx/src/index.ts +++ b/packages/plugin-vue-jsx/src/index.ts @@ -5,7 +5,7 @@ import * as babel from '@babel/core' import jsx from '@vue/babel-plugin-jsx' // @ts-expect-error missing type import importMeta from '@babel/plugin-syntax-import-meta' -import { createFilter, normalizePath } from '@rollup/pluginutils' +import { createFilter, normalizePath } from 'vite' import type { ComponentOptions } from 'vue' import type { Plugin } from 'vite' import type { Options } from './types' diff --git a/packages/plugin-vue-jsx/src/types.ts b/packages/plugin-vue-jsx/src/types.ts index aa30b743..a3be5808 100644 --- a/packages/plugin-vue-jsx/src/types.ts +++ b/packages/plugin-vue-jsx/src/types.ts @@ -1,5 +1,5 @@ import type { VueJSXPluginOptions } from '@vue/babel-plugin-jsx' -import type { FilterPattern } from '@rollup/pluginutils' +import type { FilterPattern } from 'vite' export interface FilterOptions { include?: FilterPattern diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index d1ca5fd8..eee3183d 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -47,8 +47,5 @@ "source-map": "^0.6.1", "vite": "workspace:*", "vue": "^3.2.37" - }, - "dependencies": { - "@rollup/pluginutils": "^4.2.1" } } diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 6ccbe7bf..3e1b2c3b 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -1,6 +1,6 @@ import fs from 'fs' import type { Plugin, ViteDevServer } from 'vite' -import { createFilter } from '@rollup/pluginutils' +import { createFilter } from 'vite' /* eslint-disable import/no-duplicates */ import type { SFCBlock, diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index be11de7e..dda9c75d 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -1,13 +1,12 @@ import path from 'path' import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc' import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup' -import { normalizePath } from '@rollup/pluginutils' import type { RawSourceMap } from 'source-map' import type { EncodedSourceMap as TraceEncodedSourceMap } from '@jridgewell/trace-mapping' import { TraceMap, eachMapping } from '@jridgewell/trace-mapping' import type { EncodedSourceMap as GenEncodedSourceMap } from '@jridgewell/gen-mapping' import { addMapping, fromMap, toEncodedMap } from '@jridgewell/gen-mapping' -import { transformWithEsbuild } from 'vite' +import { normalizePath, transformWithEsbuild } from 'vite' import { createDescriptor, getPrevDescriptor,