Commit 4f784e93 authored by cheesestringer's avatar cheesestringer
Browse files

fix: invalid package-lock.json

Seems like some merge conflicts in https://github.com/facebook/create-react-app/pull/12288/files created an invalid package-lock.json
parent d960b9e3
1 merge request!12795fix: invalid package-lock.json
Showing with 13 additions and 33 deletions
+13 -33
......@@ -29793,21 +29793,21 @@
}
},
"packages/cra-template": {
"version": "1.1.3",
"version": "1.2.0",
"license": "MIT",
"engines": {
"node": ">=14"
}
},
"packages/cra-template-typescript": {
"version": "1.1.3",
"version": "1.2.0",
"license": "MIT",
"engines": {
"node": ">=14"
}
},
"packages/create-react-app": {
"version": "5.0.0",
"version": "5.0.1",
"license": "MIT",
"dependencies": {
"chalk": "^4.1.2",
......@@ -29848,7 +29848,7 @@
}
},
"packages/eslint-config-react-app": {
"version": "7.0.0",
"version": "7.0.1",
"license": "MIT",
"dependencies": {
"@babel/core": "^7.16.0",
......@@ -29889,7 +29889,7 @@
}
},
"packages/react-dev-utils": {
"version": "12.0.0",
"version": "12.0.1",
"license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.16.0",
......@@ -29911,7 +29911,7 @@
"open": "^8.4.0",
"pkg-up": "^3.1.0",
"prompts": "^2.4.2",
"react-error-overlay": "^6.0.10",
"react-error-overlay": "^6.0.11",
"recursive-readdir": "^2.2.2",
"shell-quote": "^1.7.3",
"strip-ansi": "^6.0.1",
......@@ -29934,7 +29934,7 @@
}
},
"packages/react-error-overlay": {
"version": "6.0.10",
"version": "6.0.11",
"license": "MIT",
"devDependencies": {
"@babel/code-frame": "^7.16.0",
......@@ -29948,15 +29948,6 @@
"cross-env": "^7.0.3",
"eslint": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> f21e2137 (Publish)
=======
>>>>>>> 9f8d75e5 (chore(lint): lint all files)
>>>>>>> fb003998 (chore(lint): lint all files)
>>>>>>> f301bfe4 (chore(lint): lint all files)
"flow-bin": "^0.116.0",
"html-entities": "^2.3.2",
"jest": "^27.4.3",
......@@ -29983,7 +29974,7 @@
}
},
"packages/react-scripts": {
"version": "5.0.0",
"version": "5.0.1",
"license": "MIT",
"dependencies": {
"@babel/core": "^7.16.0",
......@@ -30002,7 +29993,7 @@
"dotenv": "^10.0.0",
"dotenv-expand": "^5.1.0",
"eslint": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
"eslint-config-react-app": "^7.0.1",
"eslint-webpack-plugin": "^3.1.1",
"file-loader": "^6.2.0",
"fs-extra": "^10.0.0",
......@@ -30019,7 +30010,7 @@
"postcss-preset-env": "^7.0.1",
"prompts": "^2.4.2",
"react-app-polyfill": "^3.0.0",
"react-dev-utils": "^12.0.0",
"react-dev-utils": "^12.0.1",
"react-refresh": "^0.11.0",
"resolve": "^1.20.0",
"resolve-url-loader": "^4.0.0",
......@@ -47301,7 +47292,7 @@
"open": "^8.4.0",
"pkg-up": "^3.1.0",
"prompts": "^2.4.2",
"react-error-overlay": "^6.0.10",
"react-error-overlay": "^6.0.11",
"recursive-readdir": "^2.2.2",
"shell-quote": "^1.7.3",
"strip-ansi": "^6.0.1",
......@@ -47337,19 +47328,8 @@
"chalk": "^4.1.2",
"chokidar": "^3.5.2",
"cross-env": "^7.0.3",
<<<<<<< HEAD
"eslint": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
"eslint": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
=======
>>>>>>> 9f8d75e5 (chore(lint): lint all files)
>>>>>>> fb003998 (chore(lint): lint all files)
>>>>>>> f301bfe4 (chore(lint): lint all files)
"flow-bin": "^0.116.0",
"html-entities": "^2.3.2",
"jest": "^27.4.3",
......@@ -47506,7 +47486,7 @@
"dotenv": "^10.0.0",
"dotenv-expand": "^5.1.0",
"eslint": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
"eslint-config-react-app": "^7.0.1",
"eslint-webpack-plugin": "^3.1.1",
"file-loader": "^6.2.0",
"fs-extra": "^10.0.0",
......@@ -47525,7 +47505,7 @@
"prompts": "^2.4.2",
"react": "^18.0.0",
"react-app-polyfill": "^3.0.0",
"react-dev-utils": "^12.0.0",
"react-dev-utils": "^12.0.1",
"react-dom": "^18.0.0",
"react-refresh": "^0.11.0",
"resolve": "^1.20.0",
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment