Move to @nextcloud/capabilities package

And kill of oc_capabilities and _oc_capabilities globals Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · May 29, 2020 · 0209532 · 0209532
1 parent 532f4c4
commit 0209532
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 84 deletions.
diff --git a/core/js/dist/files_client.js b/core/js/dist/files_client.js
diff --git a/core/js/dist/files_client.js.map b/core/js/dist/files_client.js.map
diff --git a/core/js/dist/files_fileinfo.js b/core/js/dist/files_fileinfo.js
diff --git a/core/js/dist/files_fileinfo.js.map b/core/js/dist/files_fileinfo.js.map
diff --git a/core/js/dist/files_iedavclient.js b/core/js/dist/files_iedavclient.js
diff --git a/core/js/dist/files_iedavclient.js.map b/core/js/dist/files_iedavclient.js.map
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/install.js.map b/core/js/dist/install.js.map
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
diff --git a/core/js/dist/recommendedapps.js b/core/js/dist/recommendedapps.js
diff --git a/core/js/dist/recommendedapps.js.map b/core/js/dist/recommendedapps.js.map
diff --git a/core/src/OC/capabilities.js b/core/src/OC/capabilities.js
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const capabilities = window._oc_capabilities || {}
+import { getCapabilities as realGetCapabilities } from '@nextcloud/capabilities'
 
 /**
  * Returns the capabilities
@@ -28,4 +28,7 @@ const capabilities = window._oc_capabilities || {}
  *
  * @since 14.0
  */
-export const getCapabilities = () => capabilities
+export const getCapabilities = () => {
+	console.warn('OC.getCapabilities is deprecated and will be removed in Nextcloud 21. See @nextcloud/capabilities')
+	return realGetCapabilities()
+}
diff --git a/core/src/globals.js b/core/src/globals.js
@@ -114,7 +114,6 @@ setDeprecatedProp('moment', () => moment, 'please ship your own, this will be re
 window['OC'] = OC
 setDeprecatedProp('initCore', () => initCore, 'this is an internal function')
 setDeprecatedProp('oc_appswebroots', () => OC.appswebroots, 'use OC.appswebroots instead, this will be removed in Nextcloud 20')
-setDeprecatedProp('oc_capabilities', OC.getCapabilities, 'use OC.getCapabilities instead, this will be removed in Nextcloud 20')
 setDeprecatedProp('oc_config', () => OC.config, 'use OC.config instead, this will be removed in Nextcloud 20')
 setDeprecatedProp('oc_current_user', () => OC.getCurrentUser().uid, 'use OC.getCurrentUser().uid instead, this will be removed in Nextcloud 20')
 setDeprecatedProp('oc_debug', () => OC.debug, 'use OC.debug instead, this will be removed in Nextcloud 20')

diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
@@ -292,7 +292,6 @@ public function getConfig() {
 				'longFooter' => $this->defaults->getLongFooter(),
 				'folder' => \OC_Util::getTheme(),
 			]),
-			"_oc_capabilities" => json_encode($capabilities),
 		];
 
 		if ($this->currentUser !== null) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "@chenfengyuan/vue-qrcode": "^1.0.2",
     "@nextcloud/auth": "^1.2.3",
     "@nextcloud/axios": "^1.3.2",
+    "@nextcloud/capabilities": "^1.0.2",
     "@nextcloud/dialogs": "^1.3.0",
     "@nextcloud/event-bus": "^1.1.4",
     "@nextcloud/initial-state": "^1.1.2",