From 5b9a8f0407a9e3fe7e00f0fc9284ea986905f1b5 Mon Sep 17 00:00:00 2001
From: John Molakvoæ <skjnldsv@protonmail.com>
Date: Wed, 28 Dec 2022 15:29:54 +0100
Subject: Add component testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 package.json | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index de04893bb2d..46425e737f4 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,10 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "NODE_ENV=production webpack --progress --config webpack.prod.js",
+    "build": "webpack --node-env production --progress",
     "postbuild": "npm run sass && npm run sass:icons",
-    "dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",
-    "watch": "NODE_ENV=development webpack --progress --watch --config webpack.dev.js",
+    "dev": "webpack --node-env development --progress",
+    "watch": "webpack --node-env development --progress --watch",
     "lint": "eslint 'apps/*/src/**/*.{vue,js}' 'core/src/**/*.{vue,js}'",
     "lint:fix": "eslint 'apps/*/src/**/*.{vue,js}' 'core/src/**/*.{vue,js}' --fix",
     "test": "jest",
@@ -20,9 +20,10 @@
     "sass": "sass --load-path core/css core/css/ apps/*/css",
     "sass:watch": "sass --watch --load-path core/css core/css/ apps/*/css",
     "sass:icons": "babel-node core/src/icons.js",
-    "cypress": "npm run cypress:e2e",
+    "cypress": "npm run cypress:e2e && npm run cypress:component",
     "cypress:e2e": "cypress run --e2e",
-    "cypress:gui": "cypress open --e2e"
+    "cypress:component": "cypress run --component",
+    "cypress:gui": "cypress open"
   },
   "repository": {
     "type": "git",
@@ -120,6 +121,7 @@
     "@nextcloud/cypress": "^1.0.0-beta.1",
     "@nextcloud/eslint-config": "^8.0.0",
     "@nextcloud/stylelint-config": "^2.1.2",
+    "@nextcloud/webpack-vue-config": "github:nextcloud/webpack-vue-config#master",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
     "@testing-library/vue": "^5.8.3",
@@ -130,7 +132,7 @@
     "@vue/tsconfig": "^0.1.3",
     "@vue/vue2-jest": "^29.1.1",
     "babel-jest": "^29.0.3",
-    "babel-loader": "^8.2.5",
+    "babel-loader": "^9.1.0",
     "babel-loader-exclude-node-modules-except": "^1.2.1",
     "css-loader": "^6.7.1",
     "cypress": "^11.2.0",
@@ -168,7 +170,7 @@
     "vue-template-compiler": "^2.7.13",
     "wait-on": "^6.0.1",
     "webpack": "^5.75.0",
-    "webpack-cli": "^4.9.2",
+    "webpack-cli": "^5.0.1",
     "webpack-merge": "^5.8.0"
   },
   "browserslist": [
-- 
cgit v1.2.3