Merge pull request #22511 from nextcloud/fix/oca-search-monkey-patch

Declare OCA.Search  directly, not via a monkey patch

core/src/OCA/index.js

@@ -19,8 +19,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import Search from './search'
+
 /**
  * Namespace for apps
  * @namespace OCA
  */
-export default {}
+export default {
+	/**
+	 * @deprecated 20.0.0, will be removed in Nextcloud 22
+	 */
+	Search,
+}

core/src/OCA/search.js

@@ -0,0 +1,34 @@
+/*
+ * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @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/>.
+ */
+
+/**
+ * @deprecated 20.0.0, will be removed in Nextcloud 22
+ */
+export default class Search {
+
+	/**
+	 * @deprecated 20.0.0, will be removed in Nextcloud 22
+	 */
+	constructor() {
+		console.warn('OCA.Search is deprecated. Please use the unified search API instead')
+	}
+
+}

core/src/unified-search.js

@@ -32,18 +32,6 @@ __webpack_nonce__ = btoa(getRequestToken())
 // eslint-disable-next-line camelcase
 __webpack_public_path__ = generateFilePath('core', '', 'js/')
 
-// TODO: remove with nc22
-if (!OCA.Search) {
-	class Search {
-
-		constructor() {
-			console.warn('OCA.Search is deprecated. Please use the unified search API instead')
-		}
-
-	}
-	OCA.Search = Search
-}
-
 Vue.mixin({
 	methods: {
 		t,