diff --git a/package-lock.json b/package-lock.json index 406faf2c5fdf..452f6cfa40a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@typescript-eslint/eslint-plugin": "6.7.5", "@typescript-eslint/parser": "6.7.5", "@yeoman/adapter": "1.2.0", - "@yeoman/conflicter": "1.0.10", + "@yeoman/conflicter": "1.1.0", "@yeoman/namespace": "1.0.0", "@yeoman/transform": "1.2.0", "@yeoman/types": "1.0.1", @@ -3503,9 +3503,9 @@ } }, "node_modules/@yeoman/conflicter": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@yeoman/conflicter/-/conflicter-1.0.10.tgz", - "integrity": "sha512-lMIjLYBCLk/3y9dC1/ZTb3wR/AwRWQGyA1mh+9hW6PXeqnFcSLbEHsfWOpmIuXPEK5bX2OJiCAecn9Gh0X4EQw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yeoman/conflicter/-/conflicter-1.1.0.tgz", + "integrity": "sha512-TCh8zVOBYkVXdMllUzrTgkY2qwqnbtZCMOSP3t++xfATXXFTvo3m/j3MJZwi3dHDJw/+TmtKStymTVbvrRCdyA==", "dependencies": { "@types/node": "^16.18.28", "@yeoman/transform": "^1.2.0", @@ -3514,18 +3514,21 @@ "dateformat": "^5.0.3", "diff": "^5.1.0", "isbinaryfile": "^5.0.0", - "mem-fs": "^3.0.0", "mem-fs-editor": "^10.0.2", "minimatch": "^9.0.0", "p-transform": "^4.0.5", "pretty-bytes": "^6.1.0", "textextensions": "^5.16.0" }, + "acceptDependencies": { + "mem-fs": ">=3.0.0" + }, "engines": { "node": "^16.13.0 || >=18.12.0" }, "peerDependencies": { - "@yeoman/types": "^1.0.0" + "@yeoman/types": "^1.0.0", + "mem-fs": "^3.0.0" } }, "node_modules/@yeoman/conflicter/node_modules/@types/node": { diff --git a/package.json b/package.json index 9327d6bb3611..a87c12a1b9b6 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@typescript-eslint/eslint-plugin": "6.7.5", "@typescript-eslint/parser": "6.7.5", "@yeoman/adapter": "1.2.0", - "@yeoman/conflicter": "1.0.10", + "@yeoman/conflicter": "1.1.0", "@yeoman/namespace": "1.0.0", "@yeoman/transform": "1.2.0", "@yeoman/types": "1.0.1",