Remove core.js

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

build/mergejs.php

@@ -1,39 +0,0 @@
-<?php
-/**
- * @copyright 2017, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/*
- * Stupid simple code to merge all the default vendor javascript into 1
- */
-$data = json_decode(file_get_contents(__DIR__.'/../core/js/core.json'), true);
-$vendors = $data['vendor'];
-
-$vendorjs = fopen(__DIR__.'/../core/vendor/core.js', 'w');
-foreach($vendors as $vendor) {
-	$content = file_get_contents(__DIR__.'/../core/vendor/'.$vendor);
-	// Remove the sourceMappingURL references from the merged file
-	$content = preg_replace('@//# sourceMappingURL=.*$@', '', $content);
-	fwrite($vendorjs, $content);
-	fwrite($vendorjs, PHP_EOL);
-}
-fclose($vendorjs);

build/mergejschecker.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-#Regenerate the vendors core.js
-echo
-echo "Regenerating core/vendor/core.js"
-
-d=`dirname $(readlink -f $0)`
-
-php $d/mergejs.php
-
-files=`git diff --name-only`
-
-for file in $files
-do
-    if [[ $file == core/vendor/core.js ]]
-    then
-        echo "The merged vendor file is not up to date"
-        echo "Please run: php build/mergejs.php"
-        echo "And commit the result"
-        break
-    fi
-done
-
-echo "Vendor js merged as expected. Carry on"
-exit 0

core/js/core.json

@@ -1,7 +1,4 @@
 {
-	"vendor": [
-		"css-vars-ponyfill/dist/css-vars-ponyfill.min.js"
-	],
 	"libraries": [
 		"jquery-showpassword.js",
 		"jquery.avatar.js",

lib/private/legacy/template.php

@@ -124,26 +124,6 @@ class OC_Template extends \OC\Template\Base {
 			OC_Util::addScript('files/client');
 			OC_Util::addScript('contactsmenu');
 			OC_Util::addScript('contactsmenu_templates');
-
-			if (\OC::$server->getConfig()->getSystemValue('debug')) {
-				// Add the stuff we need always
-				// following logic will import all vendor libraries that are
-				// specified in core/js/core.json
-				$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
-				if($fileContent !== false) {
-					$coreDependencies = json_decode($fileContent, true);
-					foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
-						//remove trailing ".js" as addVendorScript will append it
-						OC_Util::addVendorScript(
-							substr($vendorLibrary, 0, -3),null,true);
-						}
- 				} else {
-					throw new \Exception('Cannot read core/js/core.json');
-				}
-			} else {
-				// Import all (combined) default vendor libraries
-				OC_Util::addVendorScript('core', null, true);
-			}
 			OC_Util::addScript('core', 'dist/main', true);
 
 			if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {