diff options
author | anoy <anoymouserver+github@mailbox.org> | 2023-11-04 21:36:30 +0100 |
---|---|---|
committer | Benjamin Brahmer <info@b-brahmer.de> | 2023-11-07 14:15:44 +0100 |
commit | e5a4f6a005f155caabd1328aeed241a3424ecd2c (patch) | |
tree | 4edc7308a98d4daf18e0a28d07ee3cb444a0d4d0 | |
parent | 35a6018ea5c58ccacffc1a8d403354056535ffd6 (diff) |
fix 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", |