Move Dependencies

Move bundled PHP libraries from
`apps/files_external/3rdparty` to `apps/files_external/vendor`

Move bundled JS dependencies from:
`core/vendor` to `core/js/vendor`
`apps/theming/js/3rdparty` to `apps/theming/js/vendor`
`apps/user_ldap/vendor` to `apps/user_ldap/js/vendor`

Signed-off-by: Christian Glombek christian.glombek@rwth-aachen.de

.bowerrc

@@ -1,3 +1,3 @@
 {
-	"directory": "core/vendor"
+	"directory": "core/js/vendor"
 }

.gitignore

@@ -39,11 +39,11 @@
 !/apps/theming
 !/apps/twofactor_backupcodes
 !/apps/workflowengine
-/apps/files_external/3rdparty/irodsphp/PHPUnitTest
-/apps/files_external/3rdparty/irodsphp/web
-/apps/files_external/3rdparty/irodsphp/prods/test
-/apps/files_external/3rdparty/irodsphp/prods/tutorials
-/apps/files_external/3rdparty/irodsphp/prods/test*
+/apps/files_external/vendor/irodsphp/PHPUnitTest
+/apps/files_external/vendor/irodsphp/web
+/apps/files_external/vendor/irodsphp/prods/test
+/apps/files_external/vendor/irodsphp/prods/tutorials
+/apps/files_external/vendor/irodsphp/prods/test*
 /apps/files_external/tests/config.*.php
 
 

.scrutinizer.yml

@@ -9,14 +9,13 @@ checks:
 filter:
     excluded_paths:
         - '3rdparty/*'
-        - 'apps/*/3rdparty/*'
         - 'apps/*/vendor/*'
         - 'l10n/*'
         - 'core/l10n/*'
         - 'apps/*/l10n/*'
         - 'apps/*/tests/*'
         - 'lib/l10n/*'
-        - 'core/vendor/*'
+        - 'core/js/vendor/*'
         - 'core/js/tests/lib/*.js'
         - 'core/js/tests/specs/*.js'
         - 'core/js/jquery-showpassword.js'

DEPENDENCY_INFO.md

@@ -1,7 +1,7 @@
 NextCloud Core Dependency Info
 ==============================
 
-JavaScript libs bundled in `core/vendor/`.
+JavaScript libs bundled in `core/js/vendor/`.
 See the `bower.json` file in this directory.
 
 | Library | Version | License           | Comment/Patch Info (if applicable)  |
@@ -36,21 +36,21 @@ JavaScript libs bundled in `apps/comments/js/vendor/`.
 | At.js   | 1.5.5   | MIT               | NOTE: No bower.json file            |
 | Caret.js | 0.2.2  | MIT               | NOTE: No bower.json file            |
 
-External PHP libs bundled in `apps/files_external/3rdparty/`.
+External PHP libs bundled in `apps/files_external/vendor/`.
 See the `composer.json` file in that directory.
 
 | Library | Version | License           | Comment/Patch Info (if applicable)  |
 | ---     | ---     | ---               | ---                                 |
 | icewind/smb | 2.0.4 | MIT             |                                     |
 | icewind/streams | 0.5.2 | MIT         |                                     |
 
-JavaScript libs bundled in `apps/theming/js/3rdparty/`.
+JavaScript libs bundled in `apps/theming/js/vendor/`.
 
 | Library | Version | License           | Comment/Patch Info (if applicable)  |
 | ---     | ---     | ---               | ---                                 |
 | jscolor | 2.0.4   | GPLv3             | NOTE: No bower.json file            |
 
-JavaScript libs bundled in `apps/user_ldap/vendor/`.
+JavaScript libs bundled in `apps/user_ldap/js/vendor/`.
 
 | Library | Version | License           | Comment/Patch Info (if applicable)  |
 | ---     | ---     | ---               | ---                                 |

apps/comments/.bowerrc

@@ -1,3 +1,3 @@
 {
 	"directory": "js/vendor"
-}
+}

apps/files_external/appinfo/app.php

@@ -30,7 +30,7 @@
 
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
-require_once __DIR__ . '/../3rdparty/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 // register Application object singleton
 \OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application();

apps/files_external/3rdparty/composer.json → apps/files_external/vendor/composer.json

@@ -1,6 +1,6 @@
 {
-	"name": "files_external/3rdparty",
-	"description": "3rdparty components for files_external",
+	"name": "files_external/vendor",
+	"description": "Vendored PHP components for files_external",
 	"license": "MIT",
 	"config": {
 		"vendor-dir": ".",
@@ -12,4 +12,3 @@
 		"icewind/streams": "0.5.2"
 	}
 }
-

apps/theming/templates/settings-admin.php

@@ -23,7 +23,7 @@
  *
  */
 script('theming', 'settings-admin');
-script('theming', '3rdparty/jscolor/jscolor');
+script('theming', 'vendor/jscolor/jscolor');
 style('theming', 'settings-admin');
 ?>
 <div id="theming" class="section">

apps/user_ldap/js/renewPassword.js

@@ -32,12 +32,12 @@ OCA.LDAP = _.extend(OC.LDAP || {}, {
 
 $(document).ready(function() {
 	$('form[name=renewpassword]').submit(OCA.LDAP.onRenewPassword);
-	
+
 	if($('#newPassword').length) {
 		$('#newPassword').showPassword().keyup();
 	}
 	$('#newPassword').strengthify({
-		zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','js/vendor/zxcvbn/dist/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),

apps/user_ldap/templates/settings.php

@@ -1,10 +1,7 @@
 <?php
 
-vendor_script('user_ldap', 'ui-multiselect/src/jquery.multiselect');
-
-vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
-
 script('user_ldap', [
+	'vendor/ui-multiselect/src/jquery.multiselect',
 	'wizard/controller',
 	'wizard/configModel',
 	'wizard/view',
@@ -47,7 +44,10 @@
 	'wizard/wizard'
 ]);
 
-style('user_ldap', 'settings');
+style('user_ldap', [
+	'vendor/ui-multiselect/jquery.multiselect',
+	'settings'
+]);
 
 /** @var \OCP\IL10N $l */
 /** @var array $_ */

bower.json

@@ -1,14 +1,14 @@
 {
   "name": "Nextcloud",
-  "version": "11 alpha",
+  "version": "14",
   "homepage": "https://www.nextcloud.com",
   "license": "AGPL",
   "private": true,
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
-    "core/vendor",
+    "core/js/vendor",
     "test",
     "tests"
   ],

build/.phan/config.php

@@ -57,7 +57,7 @@
 		'apps/federation/tests',
 		'apps/files/composer',
 		'apps/files/tests',
-		'apps/files_external/3rdparty',
+		'apps/files_external/vendor',
 		'apps/files_external/composer',
 		'apps/files_external/tests',
 		'apps/files_sharing/composer',

build/integration/features/bootstrap/AppConfiguration.php

@@ -25,7 +25,7 @@
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 trait AppConfiguration {
 	/** @var string */

build/integration/features/bootstrap/Auth.php

@@ -29,7 +29,7 @@
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Cookie\CookieJar;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 trait Auth {
 	/** @var string */

build/integration/features/bootstrap/BasicStructure.php

@@ -34,7 +34,7 @@
 use GuzzleHttp\Exception\ClientException;
 use Psr\Http\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 trait BasicStructure {
 

build/integration/features/bootstrap/CalDavContext.php

@@ -22,7 +22,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;

build/integration/features/bootstrap/CapabilitiesContext.php

@@ -29,7 +29,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 /**
  * Capabilities context.

build/integration/features/bootstrap/CardDavContext.php

@@ -22,7 +22,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;

build/integration/features/bootstrap/ChecksumsContext.php

@@ -22,7 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;

build/integration/features/bootstrap/CommandLine.php

@@ -21,7 +21,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 trait CommandLine {
 	/** @var int return code of last command */

build/integration/features/bootstrap/CommandLineContext.php

@@ -22,7 +22,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 

build/integration/features/bootstrap/CommentsContext.php

@@ -22,7 +22,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 class CommentsContext implements \Behat\Behat\Context\Context {
 	/** @var string */

build/integration/features/bootstrap/FeatureContext.php

@@ -25,7 +25,7 @@
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 
 /**

build/integration/features/bootstrap/FederationContext.php

@@ -27,7 +27,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 /**
  * Federation context.

build/integration/features/bootstrap/FilesDropContext.php

@@ -26,7 +26,7 @@
 use Behat\Behat\Tester\Exception\PendingException;
 use GuzzleHttp\Client;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 class FilesDropContext implements Context, SnippetAcceptingContext {
 	use WebDav;

build/integration/features/bootstrap/Provisioning.php

@@ -30,7 +30,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 trait Provisioning {
 	use BasicStructure;

build/integration/features/bootstrap/RemoteContext.php

@@ -21,7 +21,7 @@
 
 use Behat\Behat\Context\Context;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 /**
  * Remote context.

build/integration/features/bootstrap/SetupContext.php

@@ -22,7 +22,7 @@
  */
 use Behat\Behat\Context\Context;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 
 /**

build/integration/features/bootstrap/ShareesContext.php

@@ -25,7 +25,7 @@
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Psr\Http\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 
 /**

build/integration/features/bootstrap/Sharing.php

@@ -28,7 +28,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 
 

build/integration/features/bootstrap/TagsContext.php

@@ -25,7 +25,7 @@
  *
  */
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 use Behat\Gherkin\Node\TableNode;
 use GuzzleHttp\Client;

build/integration/features/bootstrap/Trashbin.php

@@ -23,7 +23,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 /**
  * Trashbin functions

build/integration/features/bootstrap/WebDav.php

@@ -34,7 +34,7 @@
 use Sabre\DAV\Client as SClient;
 use Sabre\DAV\Xml\Property\ResourceType;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../js/vendor/autoload.php';
 
 
 trait WebDav {

build/mergejs.php

@@ -28,9 +28,9 @@
 $data = json_decode(file_get_contents(__DIR__.'/../core/js/core.json'), true);
 $vendors = $data['vendor'];
 
-$vendorjs = fopen(__DIR__.'/../core/vendor/core.js', 'w');
+$vendorjs = fopen(__DIR__.'/../core/js/vendor/core.js', 'w');
 foreach($vendors as $vendor) {
-	fwrite($vendorjs, file_get_contents(__DIR__.'/../core/vendor/'.$vendor));
+	fwrite($vendorjs, file_get_contents(__DIR__.'/../core/js/vendor/'.$vendor));
 	fwrite($vendorjs, PHP_EOL);
 }
 fclose($vendorjs);

core/vendor/.gitignore → core/js/vendor/.gitignore

@@ -71,6 +71,7 @@ jquery-ui/themes/ui-darkness
 jquery-ui/themes/ui-lightness
 jquery-ui/themes/vader
 jquery-ui/ui/**
+!jquery-ui/ui/minified
 !jquery-ui/ui/minified/jquery-ui.custom.min.js
 jquery-ui/*.json
 !jquery-ui/.bower.json
@@ -157,7 +158,7 @@ autosize/**
 !autosize/dist
 !autosize/dist/autosize.min.js
 !autosize/.bower.json
-!autosize/LICENCE.md
+!autosize/LICENSE.md
 
 #marked
 marked/bin

core/vendor/autosize/LICENSE.md → core/js/vendor/autosize/LICENSE.md

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.