Adjust Makefile, Changelog and more

.github/dependabot.yml

@@ -7,7 +7,7 @@ version: 2
 updates:
   # Maintain dependencies for npm
   - package-ecosystem: "npm"
-    directory: "/js"
+    directory: "/"
     schedule:
       interval: "daily"
     labels:

AUTHORS.md

@@ -3,6 +3,7 @@
 * [Benjamin Brahmer](mailto:[email protected])
 * [Alessandro Cosentino](mailto:[email protected])
 * [Marco Nassabain](mailto:[email protected])
+* [Devlin Junker](mailto:[email protected])
 * [Robin Appelman](mailto:[email protected])
 * [Sean Molenaar](mailto:[email protected])
 * [Gregor Tätzner](mailto:[email protected])
@@ -37,6 +38,8 @@
 * [Thomas Tanghus](mailto:[email protected])
 * [Volkan Gezer](mailto:[email protected])
 * [Xéfir Destiny](mailto:[email protected])
+* [devlinjunker](mailto:[email protected])
+* [hydrian](mailto:[email protected])
 * [Daniel Opitz](mailto:[email protected])
 * [Daniel Rheinbay](mailto:[email protected])
 * [Lars Bensmann](mailto:[email protected])
@@ -49,6 +52,7 @@
 * [Christoph Stenglein](mailto:[email protected])
 * [Daniel Kesselberg](mailto:[email protected])
 * [ELHADDAD Hamza](mailto:[email protected])
+* [IgorA100](mailto:[email protected])
 * [Jakob Sack](mailto:[email protected])
 * [ManuelSailer](mailto:[email protected])
 * [Qingping Hou](mailto:[email protected])
@@ -127,10 +131,12 @@
 * [Freddo](mailto:[email protected])
 * [Freddo3000](mailto:[email protected])
 * [Greg](mailto:[email protected])
+* [HK2FB](mailto:[email protected])
 * [Hagen](mailto:[email protected])
 * [Hanzei](mailto:[email protected])
 * [Hendrik Leppelsack](mailto:[email protected])
 * [Jasper Knockaert](mailto:[email protected])
+* [Jimmy Boucher](mailto:[email protected])
 * [Kevin Decherf](mailto:[email protected])
 * [Kuba Orlik](mailto:[email protected])
 * [Maceček Richard](mailto:[email protected])
@@ -142,6 +148,7 @@
 * [Michael Grosser](mailto:[email protected])
 * [Michael Hamann](mailto:[email protected])
 * [Michael Holley](mailto:[email protected])
+* [Mynacol](mailto:[email protected])
 * [NanoSector](mailto:[email protected])
 * [Nick Frey](mailto:[email protected])
 * [Oliver Herst](mailto:[email protected])

CHANGELOG.md

@@ -5,12 +5,11 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 # Unreleased
 ## [25.x.x]
 ### Changed
-- Vue Rewrite
-# Releases
-## [24.x.x]
-### Changed
-- Set User Agent for curl in Scraper
-
+- Major Rewrite of the Frontend with Vue JS (#748)
+  For comments and suggestions for the new UI, please use this: https://github.com/nextcloud/news/discussions/2388
+- Set User Agent for curl in Scraper (#2380)
+- Drop support for Nextcloud 26, Supported 27
+
 ### Fixed
 
 # Releases

Makefile

@@ -92,10 +92,10 @@ else
 	@exit 1
 endif
 
-# Removes the appstore build
+# Removes the appstore build and compiled js files
 .PHONY: clean
 clean:
-	rm -rf ./build
+	rm -rf ./build ./js/*
 
 # Reports PHP codestyle violations
 .PHONY: phpcs
@@ -171,9 +171,8 @@ appstore:
 	find $(appstore_sign_dir) -name .htaccess -exec rm {} \;
 
 	# on macOS there is no option "--parents" for the "cp" command
-	mkdir -p $(appstore_sign_dir)/$(app_name)/js/build $(appstore_sign_dir)/$(app_name)/js/admin
-	cp js/build/app.min.js $(appstore_sign_dir)/$(app_name)/js/build
-	cp js/nextcloud-news-admin-settings.js* $(appstore_sign_dir)/$(app_name)/js/build
+	mkdir -p $(appstore_sign_dir)/$(app_name)/js
+	cp js/* $(appstore_sign_dir)/$(app_name)/js/
 
 	# export the key and cert to a file
 	@if [ ! -f $(cert_dir)/$(app_name).key ] || [ ! -f $(cert_dir)/$(app_name).crt ]; then \

README.md

@@ -1,7 +1,4 @@
 # Nextcloud News app
-
-**We need help with the frontend, check the issue tracker if you are interested!**
-
 ![Release status](https://github.com/nextcloud/news/workflows/Build%20and%20publish%20app%20release/badge.svg) ![Integration Tests](https://github.com/nextcloud/news/workflows/Integration%20Tests/badge.svg) ![Frontend tests](https://github.com/nextcloud/news/workflows/Frontend%20tests/badge.svg) [![Code coverage](https://img.shields.io/codecov/c/github/nextcloud/news.svg?style=flat)](https://codecov.io/gh/nextcloud/news/)
 
 The News app is an RSS/Atom feed aggregator. It offers a [RESTful API](https://nextcloud.github.io/news/developer/#apis) for app developers. The source code is [available on GitHub](https://github.com/nextcloud/news)

appinfo/info.xml

@@ -21,7 +21,7 @@ Create a [feature request](https://github.com/nextcloud/news/discussions/new)
 
 Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     ]]></description>
-    <version>24.0.0</version>
+    <version>25.0.0-alpha1</version>
     <licence>agpl</licence>
     <author>Benjamin Brahmer</author>
     <author>Sean Molenaar</author>

lib/Controller/PageController.php

@@ -96,7 +96,6 @@ public function index(): TemplateResponse
         $csp->addAllowedImageDomain('*')
             ->addAllowedMediaDomain('*')
             ->addAllowedConnectDomain('*')// chrome breaks on audio elements
-            ->allowEvalScript(true)
             ->addAllowedFrameDomain('https://youtube.com')
             ->addAllowedFrameDomain('https://www.youtube.com')
             ->addAllowedFrameDomain('https://player.vimeo.com')

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nextcloud-news",
   "description": "An RSS/Atom feed reader",
-  "main": "js/app.min.js",
+  "main": "js/nextcloud-news-main.js",
   "scripts": {
     "prebuild": "npm install && npm ci",
     "build": "NODE_ENV=production webpack --progress --config webpack.js",