feat(misc): update minimatch version used across packages (#21207)

nrwl · Jan 18, 2024 · f98a16f · f98a16f · vercel · Jan 18, 2024
1 parent e4e7f54
commit f98a16f
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -225,7 +225,7 @@
     "metro-config": "0.76.8",
     "metro-resolver": "0.76.8",
     "mini-css-extract-plugin": "~2.4.7",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "next-sitemap": "^3.1.10",
     "ng-packagr": "~17.0.0",
     "node-fetch": "^2.6.7",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -52,7 +52,7 @@
     "find-cache-dir": "^3.3.2",
     "ignore": "^5.0.4",
     "magic-string": "~0.30.2",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",

diff --git a/packages/angular/src/generators/stories/stories.ts b/packages/angular/src/generators/stories/stories.ts
@@ -20,7 +20,7 @@ import { getProjectEntryPoints } from '../utils/storybook-ast/entry-point';
 import { getE2EProject } from './lib/get-e2e-project';
 import { getModuleFilePaths } from '../utils/storybook-ast/module-info';
 import type { StoriesGeneratorOptions } from './schema';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { nxVersion } from '../../utils/versions';
 
 export async function angularStoriesGenerator(

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -42,7 +42,7 @@
     "jest-config": "^29.4.1",
     "jest-resolve": "^29.4.1",
     "jest-util": "^29.4.1",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "resolve.exports": "1.1.0",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",

diff --git a/packages/jest/src/plugins/plugin.ts b/packages/jest/src/plugins/plugin.ts
@@ -18,7 +18,7 @@ import { projectGraphCacheDirectory } from 'nx/src/utils/cache-directory';
 import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes';
 import { getGlobPatternsFromPackageManagerWorkspaces } from 'nx/plugins/package-json-workspaces';
 import { combineGlobPatterns } from 'nx/src/utils/globs';
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 
 export interface JestPluginOptions {
   targetName?: string;

diff --git a/packages/js/package.json b/packages/js/package.json
@@ -52,7 +52,7 @@
     "tsconfig-paths": "^4.1.2",
     "ignore": "^5.0.4",
     "js-tokens": "^4.0.0",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "ora": "5.3.0",
     "semver": "7.5.3",
     "source-map-support": "0.5.19",

diff --git a/packages/js/src/utils/assets/copy-assets-handler.ts b/packages/js/src/utils/assets/copy-assets-handler.ts
@@ -1,4 +1,4 @@
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import * as path from 'path';
 import * as fse from 'fs-extra';
 import ignore from 'ignore';

diff --git a/packages/nx/package.json b/packages/nx/package.json
@@ -52,7 +52,7 @@
     "js-yaml": "4.1.0",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "~2.0.3",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "npm-run-path": "^4.0.1",
     "open": "^8.4.0",
     "semver": "7.5.3",

diff --git a/packages/nx/src/command-line/graph/graph.ts b/packages/nx/src/command-line/graph/graph.ts
@@ -2,7 +2,7 @@ import { createHash } from 'crypto';
 import { existsSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { copySync, ensureDirSync } from 'fs-extra';
 import * as http from 'http';
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { URL } from 'node:url';
 import * as open from 'open';
 import {

diff --git a/packages/nx/src/generators/utils/glob.spec.ts b/packages/nx/src/generators/utils/glob.spec.ts
@@ -38,7 +38,7 @@ describe('glob', () => {
     tree.write('3.txt', '3');
     fs.writeFile('4.md', '4');
 
-    const withTree = glob(tree, ['*.txt']).sort();
+    const withTree = glob(tree, ['**/*.txt']).sort();
 
     expect(withTree).toMatchInlineSnapshot(`
       [

diff --git a/packages/nx/src/generators/utils/glob.ts b/packages/nx/src/generators/utils/glob.ts
@@ -1,10 +1,8 @@
+import { minimatch } from 'minimatch';
 import { Tree } from '../tree';
 import { combineGlobPatterns } from '../../utils/globs';
-import { workspaceRoot } from '../../utils/workspace-root';
 import { globWithWorkspaceContext } from '../../utils/workspace-context';
 
-import minimatch = require('minimatch');
-
 /**
  * Performs a tree-aware glob search on the files in a workspace. Able to find newly
  * created files and hides deleted files before the updates are committed to disk.

diff --git a/packages/nx/src/generators/utils/project-configuration.ts b/packages/nx/src/generators/utils/project-configuration.ts
@@ -1,3 +1,4 @@
+import { minimatch } from 'minimatch';
 import { basename, join, relative } from 'path';
 
 import {
@@ -24,8 +25,6 @@ import { readNxJson } from './nx-json';
 
 import type { Tree } from '../tree';
 
-import minimatch = require('minimatch');
-
 export { readNxJson, updateNxJson } from './nx-json';
 
 /**

diff --git a/packages/nx/src/hasher/node-task-hasher-impl.ts b/packages/nx/src/hasher/node-task-hasher-impl.ts
@@ -10,7 +10,7 @@ import { Task, TaskGraph } from '../config/task-graph';
 import { hashArray, hashObject } from './file-hasher';
 import { getOutputsForTargetAndConfiguration } from '../tasks-runner/utils';
 import { workspaceRoot } from '../utils/workspace-root';
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { join } from 'path';
 import { hashFile } from '../native';
 import { findAllProjectNodeDependencies } from '../utils/project-graph-utils';

diff --git a/packages/nx/src/hasher/task-hasher.ts b/packages/nx/src/hasher/task-hasher.ts
@@ -10,7 +10,7 @@ import { DaemonClient } from '../daemon/client/client';
 import { hashArray } from './file-hasher';
 import { NodeTaskHasherImpl } from './node-task-hasher-impl';
 import { InputDefinition } from '../config/workspace-json-project-json';
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { NativeTaskHasherImpl } from './native-task-hasher-impl';
 import { workspaceRoot } from '../utils/workspace-root';
 import { NxWorkspaceFilesExternals } from '../native';

diff --git a/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts b/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts
@@ -1,5 +1,5 @@
 import { TouchedProjectLocator } from '../affected-project-graph-models';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { workspaceRoot } from '../../../utils/workspace-root';
 import { getNxRequirePaths } from '../../../utils/installation-directory';
 import { join } from 'path';

diff --git a/packages/nx/src/project-graph/affected/locators/workspace-projects.ts b/packages/nx/src/project-graph/affected/locators/workspace-projects.ts
@@ -1,4 +1,4 @@
-import * as minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 import { TouchedProjectLocator } from '../affected-project-graph-models';
 import { NxJsonConfiguration } from '../../../config/nx-json';
 import {

diff --git a/packages/nx/src/project-graph/file-utils.ts b/packages/nx/src/project-graph/file-utils.ts
@@ -24,7 +24,7 @@ import {
 } from './utils/project-configuration-utils';
 import { NxJsonConfiguration } from '../config/nx-json';
 import { getDefaultPluginsSync } from '../utils/nx-plugin.deprecated';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { CreateNodesResult } from '../devkit-exports';
 import { CreatePackageJsonProjectsNextToProjectJson } from '../plugins/project-json/build-nodes/package-json-next-to-project-json';
 import { LoadedNxPlugin } from '../utils/nx-plugin';

diff --git a/packages/nx/src/project-graph/utils/project-configuration-utils.ts b/packages/nx/src/project-graph/utils/project-configuration-utils.ts
@@ -10,7 +10,7 @@ import { CreateNodesResult, LoadedNxPlugin } from '../../utils/nx-plugin';
 import { readJsonFile } from '../../utils/fileutils';
 import { workspaceRoot } from '../../utils/workspace-root';
 
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { join } from 'path';
 
 export type SourceInformation = [string, string];

diff --git a/packages/nx/src/utils/find-matching-projects.spec.ts b/packages/nx/src/utils/find-matching-projects.spec.ts
@@ -3,7 +3,7 @@ import {
   getMatchingStringsWithCache,
 } from './find-matching-projects';
 import type { ProjectGraphProjectNode } from '../config/project-graph';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 
 describe('findMatchingProjects', () => {
   let projectGraph: Record<string, ProjectGraphProjectNode> = {

diff --git a/packages/nx/src/utils/find-matching-projects.ts b/packages/nx/src/utils/find-matching-projects.ts
@@ -1,4 +1,4 @@
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import type { ProjectGraphProjectNode } from '../config/project-graph';
 
 const validPatternTypes = [

diff --git a/packages/playwright/package.json b/packages/playwright/package.json
@@ -36,7 +36,7 @@
     "@nx/eslint": "file:../eslint",
     "@nx/js": "file:../js",
     "tslib": "^2.3.0",
-    "minimatch": "3.0.5"
+    "minimatch": "9.0.3"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"

diff --git a/packages/playwright/src/plugins/plugin.ts b/packages/playwright/src/plugins/plugin.ts
@@ -16,7 +16,7 @@ import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash
 
 import type { PlaywrightTestConfig } from '@playwright/test';
 import { getFilesInDirectoryUsingContext } from 'nx/src/utils/workspace-context';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { loadPlaywrightConfig } from '../utils/load-config-file';
 import { projectGraphCacheDirectory } from 'nx/src/utils/cache-directory';
 import { getLockFileName } from '@nx/js';

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -32,7 +32,7 @@
     "ignore": "^5.0.4",
     "metro-config": "~0.76.8",
     "metro-resolver": "~0.76.8",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",

diff --git a/packages/react-native/src/generators/stories/stories.ts b/packages/react-native/src/generators/stories/stories.ts
@@ -12,7 +12,7 @@ import {
   containsComponentDeclaration,
   projectRootPath,
 } from '@nx/react/src/generators/stories/stories';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { nxVersion } from '../../utils/versions';
 
 export async function createAllStories(

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -35,7 +35,7 @@
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "file-loader": "^6.2.0",
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",
     "@nx/js": "file:../js",

diff --git a/packages/react/src/generators/stories/stories.ts b/packages/react/src/generators/stories/stories.ts
@@ -18,7 +18,7 @@ import {
   visitNotIgnoredFiles,
 } from '@nx/devkit';
 import { basename, join } from 'path';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript';
 import { nxVersion } from '../../utils/versions';
 

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -28,7 +28,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "minimatch": "3.0.5",
+    "minimatch": "9.0.3",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",
     "@nx/js": "file:../js",

diff --git a/packages/vue/src/generators/stories/stories.ts b/packages/vue/src/generators/stories/stories.ts
@@ -13,7 +13,7 @@ import {
 import { basename, join } from 'path';
 import { nxVersion } from '../../utils/versions';
 import { createComponentStories } from './lib/component-story';
-import minimatch = require('minimatch');
+import { minimatch } from 'minimatch';
 
 export interface StorybookStoriesSchema {
   project: string;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml