Revert "Merge pull request #30026 from owncloud/stable10-b907afe0e91e…

…469b479c690dd11867b063f1bf08"

This reverts commit 46c1dfe, reversing
changes made to 2e5f7c8.

.bowerrc

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

.drone.yml

@@ -27,11 +27,19 @@ pipeline:
     when:
       event: [push, pull_request]
 
-  yarn:
-    image: owncloudci/nodejs:latest
+  npm:
+    image: owncloudci/php:${PHP_VERSION}
+    pull: true
+    commands:
+      - ./tests/drone/npm-install.sh
+    when:
+      event: [push, pull_request]
+
+  bower:
+    image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - ./tests/drone/yarn-install.sh
+      - ./tests/drone/bower-install.sh
     when:
       event: [push, pull_request]
 

.gitignore

@@ -99,7 +99,6 @@ nbproject
 /tests/phpunit.xml
 
 # Node Modules
-/build/yarn-error.log
 /build/node_modules/
 
 # nodejs

Makefile

@@ -2,7 +2,7 @@
 #
 # Requirements to run make here:
 #    - node
-#    - yarn
+#    - npm
 #
 # Both can be installed following e.g. the Debian/Ubuntu instructions at
 # https://nodejs.org/en/download/package-manager/
@@ -32,14 +32,15 @@ NODE_PREFIX=build
 SHELL=/bin/bash
 
 #
-# Define YARN and check if it is available on the system.
+# Define NPM and check if it is available on the system.
 #
-YARN := $(shell command -v yarn 2> /dev/null)
-ifndef YARN
-	$(error yarn is not available on your system, please install yarn (npm install -g yarn))
+NPM := $(shell command -v npm 2> /dev/null)
+ifndef NPM
+    $(error npm is not available on your system, please install npm)
 endif
 
 KARMA=$(NODE_PREFIX)/node_modules/.bin/karma
+BOWER=$(NODE_PREFIX)/node_modules/bower/bin/bower
 JSDOC=$(NODE_PREFIX)/node_modules/.bin/jsdoc
 PHPUNIT="$(shell pwd)/lib/composer/phpunit/phpunit/phpunit"
 COMPOSER_BIN=build/composer.phar
@@ -67,10 +68,10 @@ dist_dir=build/dist
 # Catch-all rules
 #
 .PHONY: all
-all: help-hint $(composer_dev_deps) $(nodejs_deps)
+all: help-hint $(composer_dev_deps) $(core_vendor) $(nodejs_deps)
 
 .PHONY: clean
-clean: clean-composer-deps clean-nodejs-deps clean-test clean-dist
+clean: clean-composer-deps clean-nodejs-deps clean-js-deps clean-test clean-dist
 
 .PHONY: help-hint
 help-hint:
@@ -87,7 +88,7 @@ help:
 	@echo -e "make clean\t\t\tclean everything"
 	@echo -e "make install-composer-deps\tinstall composer dependencies"
 	@echo -e "make update-composer\t\tupdate composer.lock"
-	@echo -e "make install-nodejs-deps\t\tinstall Node JS and Javascript dependencies"
+	@echo -e "make install-js-deps\t\tinstall Javascript dependencies"
 	@echo
 	@echo -e "Note that running 'make' without arguments already installs all required dependencies"
 	@echo
@@ -144,20 +145,32 @@ clean-composer-deps:
 # Node JS dependencies for tools
 #
 $(nodejs_deps): build/package.json
-	cd $(NODE_PREFIX) && $(YARN) install
-	touch $@
-
-# alias for core deps
-$(core_vendor): $(nodejs_deps)
+	$(NPM) install --prefix $(NODE_PREFIX)
+	touch $(nodejs_deps)
 
 .PHONY: install-nodejs-deps
 install-nodejs-deps: $(nodejs_deps)
 
 .PHONY: clean-nodejs-deps
 clean-nodejs-deps:
-	rm -Rf $(core_vendor)
 	rm -Rf $(nodejs_deps)
 
+#
+# ownCloud core JS dependencies
+$(core_vendor): $(nodejs_deps) bower.json
+	$(BOWER) install
+
+.PHONY: install-js-deps
+install-js-deps: $(nodejs_deps)
+
+.PHONY: update-js-deps
+update-js-deps: $(nodejs_deps)
+	$(BOWER) update
+
+.PHONY: clean-js-deps
+clean-js-deps:
+	rm -Rf $(core_vendor)
+
 #
 # Tests
 #
@@ -170,11 +183,11 @@ test-external: $(composer_dev_deps)
 	PHPUNIT=$(PHPUNIT) build/autotest-external.sh $(TEST_DATABASE) $(TEST_EXTERNAL_ENV) $(TEST_PHP_SUITE)
 
 .PHONY: test-js
-test-js: $(nodejs_deps)
+test-js: $(nodejs_deps) $(js_deps) $(core_vendor)
 	NODE_PATH='$(NODE_PREFIX)/node_modules' $(KARMA) start tests/karma.config.js --single-run
 
 .PHONY: test-js-debug
-test-js-debug: $(nodejs_deps)
+test-js-debug: $(nodejs_deps) $(js_deps) $(core_vendor)
 	NODE_PATH='$(NODE_PREFIX)/node_modules' $(KARMA) start tests/karma.config.js
 
 .PHONY: test-integration
@@ -220,9 +233,9 @@ clean-docs:
 #
 # Build distribution
 #
-$(dist_dir)/owncloud: $(composer_deps) $(nodejs_deps) $(core_all_src)
+$(dist_dir)/owncloud: $(composer_deps) $(core_vendor) $(core_all_src)
 	rm -Rf $@; mkdir -p $@/config
-	cp -RL $(core_all_src) $@
+	cp -R $(core_all_src) $@
 	cp -R config/config.sample.php $@/config
 	rm -Rf $(dist_dir)/owncloud/apps/testing
 	find $@ -name .gitkeep -delete
@@ -271,9 +284,9 @@ clean-dist:
 #
 # Build qa distribution
 #
-$(dist_dir)/qa/owncloud: $(composer_dev_deps) $(nodejs_deps) $(core_all_src) $(core_test_dirs)
+$(dist_dir)/qa/owncloud: $(composer_dev_deps) $(core_vendor) $(core_all_src) $(core_test_dirs)
 	rm -Rf $@; mkdir -p $@/config
-	cp -RL $(core_all_src) $@
+	cp -R $(core_all_src) $@
 	cp -R $(core_test_dirs) $@
 	cp -R config/config.sample.php $@/config
 	find $@ -name .gitkeep -delete

bower.json

@@ -0,0 +1,39 @@
+{
+  "name": "ownCloud",
+  "version": "10.0.0 beta",
+  "homepage": "https://www.owncloud.org",
+  "license": "AGPL",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "core/vendor",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "blueimp-md5": "1.0.1",
+    "handlebars": "4.0.5",
+    "jcrop": "0.9.12",
+    "jquery": "2.1.4",
+    "jquery-migrate": "1.4.0",
+    "jquery-ui": "1.10.0",
+    "jsTimezoneDetect": "1.0.5",
+    "moment": "2.10.6",
+    "select2": "3.4.8",
+    "zxcvbn": "*",
+    "snapjs": "2.0.0-rc1",
+    "strengthify": "0.5.0",
+    "underscore": "1.8.3",
+    "bootstrap": "3.3.6",
+    "backbone": "1.2.3",
+    "davclient.js": "https://github.com/evert/davclient.js.git#0.1.2",
+    "es6-promise": "https://github.com/jakearchibald/es6-promise.git#2.3.0",
+    "base64": "0.3.0",
+    "clipboard": "1.5.12",
+    "browser-update": "^2.0.1",
+    "bowser": "browser#^1.6.0",
+    "showdown": "^1.7.1"
+  }
+}