miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

cleanup(vite): migrate to picomatch (#30484)

Browse Source
This commit is contained in:
James Garbutt 2025-05-01 08:06:39 +01:00 committed by GitHub
parent 6d36be0d24
commit 1ab8bdbe98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/vite/.eslintrc.json
View File

@ -4,7 +4,15 @@
"overrides": [ "overrides": [
{ {
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {} "rules": {
"no-restricted-imports": [
"error",
{
"name": "minimatch",
"message": "Please use `picomatch` instead."
}
]
}
}, },
{ {
"files": ["*.ts", "*.tsx"], "files": ["*.ts", "*.tsx"],

2
packages/vite/package.json
View File

@ -35,8 +35,8 @@
"@swc/helpers": "~0.5.0", "@swc/helpers": "~0.5.0",
"enquirer": "~2.3.6", "enquirer": "~2.3.6",
"@nx/js": "file:../js", "@nx/js": "file:../js",
"picomatch": "4.0.2",
"tsconfig-paths": "^4.1.2", "tsconfig-paths": "^4.1.2",
"minimatch": "9.0.3",
"semver": "^7.6.3" "semver": "^7.6.3"
}, },
"peerDependencies": { "peerDependencies": {

4
packages/vite/src/migrations/update-20-5-0/update-resolve-conditions.ts
View File

@ -1,6 +1,6 @@
import { formatFiles, visitNotIgnoredFiles, type Tree } from '@nx/devkit'; import { formatFiles, visitNotIgnoredFiles, type Tree } from '@nx/devkit';
import { tsquery } from '@phenomnomnominal/tsquery'; import { tsquery } from '@phenomnomnominal/tsquery';
import { minimatch } from 'minimatch'; import picomatch = require('picomatch');
const REMIX_IMPORT_SELECTOR = const REMIX_IMPORT_SELECTOR =
'ImportDeclaration:has(StringLiteral[value=@remix-run/dev]),CallExpression:has(Identifier[name=require]) StringLiteral[value=@remix-run/dev]'; 'ImportDeclaration:has(StringLiteral[value=@remix-run/dev]),CallExpression:has(Identifier[name=require]) StringLiteral[value=@remix-run/dev]';
@ -24,7 +24,7 @@ export default async function (tree: Tree) {
const viteFiles = []; const viteFiles = [];
visitNotIgnoredFiles(tree, '', (filePath) => { visitNotIgnoredFiles(tree, '', (filePath) => {
if (minimatch(filePath, '**/vite.*config*.{js,ts,mjs,mts,cjs,cts}')) { if (picomatch('**/vite.*config*.{js,ts,mjs,mts,cjs,cts}')(filePath)) {
viteFiles.push(filePath); viteFiles.push(filePath);
} }
}); });

6
packages/vite/src/plugins/plugin.ts
View File

@ -25,7 +25,7 @@ import { workspaceDataDirectory } from 'nx/src/utils/cache-directory';
import { getLockFileName } from '@nx/js'; import { getLockFileName } from '@nx/js';
import { loadViteDynamicImport } from '../utils/executor-utils'; import { loadViteDynamicImport } from '../utils/executor-utils';
import { hashObject } from 'nx/src/hasher/file-hasher'; import { hashObject } from 'nx/src/hasher/file-hasher';
import { minimatch } from 'minimatch'; import picomatch = require('picomatch');
import { isUsingTsSolutionSetup as _isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { isUsingTsSolutionSetup as _isUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util'; import { addBuildAndWatchDepsTargets } from '@nx/js/src/plugins/typescript/util';
@ -119,7 +119,7 @@ export const createNodesV2: CreateNodesV2<VitePluginOptions> = [
const tsConfigFiles = const tsConfigFiles =
siblingFiles.filter((p) => siblingFiles.filter((p) =>
minimatch(p, 'tsconfig*{.json,.*.json}') picomatch('tsconfig*{.json,.*.json}')(p)
) ?? []; ) ?? [];
const hasReactRouterConfig = siblingFiles.some((configFile) => { const hasReactRouterConfig = siblingFiles.some((configFile) => {
@ -192,7 +192,7 @@ export const createNodes: CreateNodes<VitePluginOptions> = [
} }
const tsConfigFiles = const tsConfigFiles =
siblingFiles.filter((p) => minimatch(p, 'tsconfig*{.json,.*.json}')) ?? siblingFiles.filter((p) => picomatch('tsconfig*{.json,.*.json}')(p)) ??
[]; [];
const hasReactRouterConfig = siblingFiles.some((configFile) => { const hasReactRouterConfig = siblingFiles.some((configFile) => {