Merge pull request #9865 from jibees/sort-package.json-file

Sort package.json to avoid conflicts
This commit is contained in:
jibees
2022-10-25 11:29:41 +02:00
committed by GitHub

View File

@@ -5,6 +5,7 @@
"type": "git",
"url": "https://github.com/openfoodfoundation/openfoodnetwork"
},
"license": "AGPL-3.0",
"scripts": {
"storybook": "start-storybook",
"prepare": "husky install",
@@ -18,6 +19,28 @@
"/node_modules/(?!(stimulus)/)"
]
},
"dependencies": {
"@babel/preset-env": "^7.18.2",
"@floating-ui/dom": "^1.0.1",
"@hotwired/turbo": "^7.1.0",
"@rails/webpacker": "5.4.3",
"babel-loader": "^8.2.3",
"cable_ready": "5.0.0-pre9",
"flatpickr": "^4.6.9",
"foundation-sites": "^5.5.2",
"jquery-ui": "1.13.0",
"js-big-decimal": "^1.3.5",
"moment": "^2.29.1",
"mrujs": "^0.7.4",
"select2": "^4.0.13",
"shortcut-buttons-flatpickr": "^0.4.0",
"stimulus": "^3.0.1",
"stimulus-flatpickr": "^1.4.0",
"stimulus_reflex": "3.5.0-pre9",
"tom-select": "^2.0.0",
"webpack": "~4",
"webpack-cli": "~3"
},
"devDependencies": {
"@storybook/addon-controls": "^6.4.13",
"@storybook/addon-docs": "^6.4.13",
@@ -32,28 +55,5 @@
"prettier": "2.7.1",
"pretty-quick": "^3.1.3",
"webpack-dev-server": "~3"
},
"license": "AGPL-3.0",
"dependencies": {
"@babel/preset-env": "^7.18.2",
"@floating-ui/dom": "^1.0.1",
"@hotwired/turbo": "^7.1.0",
"@rails/webpacker": "5.4.3",
"babel-loader": "^8.2.3",
"cable_ready": "5.0.0-pre9",
"stimulus_reflex": "3.5.0-pre9",
"flatpickr": "^4.6.9",
"foundation-sites": "^5.5.2",
"jquery-ui": "1.13.0",
"js-big-decimal": "^1.3.5",
"moment": "^2.29.1",
"mrujs": "^0.7.4",
"select2": "^4.0.13",
"shortcut-buttons-flatpickr": "^0.4.0",
"stimulus": "^3.0.1",
"stimulus-flatpickr": "^1.4.0",
"tom-select": "^2.0.0",
"webpack": "~4",
"webpack-cli": "~3"
}
}