chore(vite): Migrate from webpack to vite

Signed-off-by: Raimund Schlüßler <[email protected]>
nextcloud · Dec 10, 2023 · 8429627 · 8429627
1 parent c2d6f98
commit 8429627
Show file tree

Hide file tree

Showing 20 changed files with 3,388 additions and 4,767 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/.gitignore b/.gitignore
@@ -253,3 +253,6 @@ coverage
 .phpunit.result.cache
 
 .php_cs.cache
+
+css/*
+!css/tasks-icon.css
diff --git a/Makefile b/Makefile
@@ -88,15 +88,8 @@ update-composer: composer.phar
 # Removes the build directory and the compiled files
 .PHONY: clean
 clean:
-	rm -f ./js/tasks-main.js
-	rm -f ./js/tasks-main.js.map
-	rm -f ./js/tasks-main.js.LICENSE.txt
-	rm -f ./js/tasks-dashboard.js
-	rm -f ./js/tasks-dashboard.js.map
-	rm -f ./js/tasks-dashboard.js.LICENSE.txt
-	rm -f ./js/tasks-talk.js
-	rm -f ./js/tasks-talk.js.map
-	rm -f ./js/tasks-talk.js.LICENSE.txt
+	rm -rf ./js/*
+	ls -d ./css/* | grep -P '^((?!tasks-icon.css).)*$$' | xargs -r -d'\n' rm
 	rm -rf $(build_directory)
 
 # Same as clean but also removes dependencies installed by npm
@@ -115,7 +108,7 @@ appstore: clean build-js-production
 	--exclude=/.babelrc.js \
 	--exclude=/.codecov.yml \
 	--exclude=/.editorconfig \
-	--exclude=/.eslintrc.js \
+	--exclude=/.eslintrc.cjs \
 	--exclude=/.gitattributes \
 	--exclude=/.gitignore \
 	--exclude=/.phpunit.result.cache \
@@ -129,7 +122,7 @@ appstore: clean build-js-production
 	--exclude=/.travis.yml \
 	--exclude=/.tx \
 	--exclude=/.v8flags*.json \
-	--exclude=/babel.config.js \
+	--exclude=/babel.config.cjs \
 	--exclude=/build.xml \
 	--exclude=/clover.integration.xml \
 	--exclude=/clover.unit.xml \
@@ -146,7 +139,7 @@ appstore: clean build-js-production
 	--exclude=/phpunit.integration.xml \
 	--exclude=/README.md \
 	--exclude=/stylelint.config.js \
-	--exclude=/webpack.config.js \
+	--exclude=/vite.config.mjs \
 	--exclude=/build \
 	--exclude=/coverage \
 	--exclude=/img/src \

diff --git a/babel.config.js → babel.config.cjs b/babel.config.js → babel.config.cjs
diff --git a/css/tasks-talk.css → css/tasks-icon.css b/css/tasks-talk.css → css/tasks-icon.css
diff --git a/img/color_picker.svg b/img/color_picker.svg
diff --git a/lib/Dashboard/TasksWidget.php b/lib/Dashboard/TasksWidget.php
@@ -68,7 +68,7 @@ public function getOrder(): int {
 	 * @inheritDoc
 	 */
 	public function getIconClass(): string {
-		return 'app-icon-tasks';
+		return 'icon-tasks';
 	}
 
 	/**
@@ -83,5 +83,7 @@ public function getUrl(): ?string {
 	 */
 	public function load(): void {
 		\OCP\Util::addScript('tasks', 'tasks-dashboard');
+		\OCP\Util::addStyle('tasks', 'tasks-dashboard');
+		\OCP\Util::addStyle('tasks', 'tasks-icon');
 	}
 }
diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -52,7 +52,8 @@ public function handle(Event $event): void {
 		$pathInfo = $this->request->getPathInfo();
 		if (strpos($pathInfo, '/call/') === 0 || strpos($pathInfo, '/apps/spreed') === 0) {
 			Util::addScript('tasks', 'tasks-talk');
-			Util::addStyle('tasks', 'tasks-talk');
+			Util::addStyle('tasks', 'tasks-icon');
+			Util::addStyle('tasks', 'tasks-TaskCreateDialog');
 		}
 	}
 }