diff options
| author | anoy <anoymouserver+github@mailbox.org> | 2023-11-04 21:36:30 +0100 |
|---|---|---|
| committer | anoy <anoymouserver+github@mailbox.org> | 2023-11-04 21:36:56 +0100 |
| commit | 9c100f2f9398013083caa618b1df92c9c0602080 (patch) | |
| tree | a4636e0a9a7538a64cbb36b845fe0068454349ce | |
| parent | ed595a666d7b72275048dd3ce7f0967c4c1569d8 (diff) | |
fix merge errorsfix-merge-errors
- js build was run twice
- engines were defined twice
Signed-off-by: anoy <anoymouserver+github@mailbox.org>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | package.json | 4 |
2 files changed, 1 insertions, 6 deletions
@@ -83,9 +83,8 @@ endif # Installs npm dependencies .PHONY: npm npm: - $(npm) ci - $(npm) run build ifneq (, $(npm)) + $(npm) ci $(npm) run build else @echo "npm command not available, please install nodejs first" diff --git a/package.json b/package.json index 352cc50b8..27c51e5a4 100644 --- a/package.json +++ b/package.json @@ -60,10 +60,6 @@ "browserslist": [ "extends @nextcloud/browserslist-config" ], - "engines": { - "node": "^16.0.0", - "npm": "^7.0.0 || ^8.0.0" - }, "devDependencies": { "@babel/core": "^7.11.1", "@babel/plugin-syntax-dynamic-import": "^7.8.3", |