fix(patchers): fix patching modules resolving by require.resolve

src/patchers/nextcloud-auth.js → src/patchers/@nextcloud/auth.js

@@ -1,9 +1,9 @@
 /*
- * @copyright Copyright (c) 2022 Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @copyright Copyright (c) 2023 Grigorii Shartsev <me@shgk.me>
  *
- * @author Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @author Grigorii Shartsev <me@shgk.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,12 +19,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { appData } from '../app/AppData.js'
+import { appData } from '../../app/AppData.js'
 
 export {
 	getRequestToken,
 	onRequestTokenUpdate,
-} from '@talk/node_modules/@nextcloud/auth/dist/index.esm.js'
+} from '@talk-modules--@nextcloud/auth'
 
 /**
  *

src/patchers/nextcloud-axios.js → src/patchers/@nextcloud/axios.js

@@ -1,9 +1,9 @@
 /*
- * @copyright Copyright (c) 2022 Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @copyright Copyright (c) 2023 Grigorii Shartsev <me@shgk.me>
  *
- * @author Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @author Grigorii Shartsev <me@shgk.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import axios from '../../node_modules/@nextcloud/axios/dist/index.esm.js'
+import axios from '@desktop-modules--@nextcloud/axios'
 
 axios.interceptors.request.use((config) => {
 	config.withCredentials = true

src/patchers/nextcloud-initial-state.js → src/patchers/@nextcloud/initial-state.js

@@ -1,9 +1,9 @@
 /*
- * @copyright Copyright (c) 2022 Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @copyright Copyright (c) 2023 Grigorii Shartsev <me@shgk.me>
  *
- * @author Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @author Grigorii Shartsev <me@shgk.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { appData } from '../app/AppData.js'
+import { appData } from '../../app/AppData.js'
 
 /**
  * Generates Initial State-like object based on capablilities and user metadata

src/patchers/nextcloud-router.js → src/patchers/@nextcloud/router.js

@@ -1,9 +1,9 @@
 /*
- * @copyright Copyright (c) 2022 Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @copyright Copyright (c) 2023 Grigorii Shartsev <me@shgk.me>
  *
- * @author Grigorii Shartsev <grigorii.shartsev@nextcloud.com>
+ * @author Grigorii Shartsev <me@shgk.me>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,9 +21,9 @@
 
 /* eslint-disable jsdoc/require-jsdoc */
 
-import { getRootUrl, generateFilePath as _generateFilePath } from '../../node_modules/@nextcloud/router/dist/index.js'
+import { getRootUrl, generateFilePath as _generateFilePath } from '@desktop-modules--@nextcloud/router'
 
-export { linkTo, getRootUrl, generateUrl } from '../../node_modules/@nextcloud/router/dist/index.js'
+export { linkTo, getRootUrl, generateUrl } from '@desktop-modules--@nextcloud/router'
 
 /**
  * @param {string} s - String with "{token}" blocks
@@ -73,7 +73,7 @@ export function generateFilePath(app, type, file) {
 		}
 	} else if (app === 'notifications' && ext === '.ogg') {
 		// For now notifications sounds are just a copy of the notifications app sounds
-		return require(`../../sounds/${filename}.ogg`)
+		return require(`../../../sounds/${filename}.ogg`)
 	}
 
 	return _generateFilePath(app, type, file)

src/patchers/globals.js

@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { loadState } from './nextcloud-initial-state.js'
+import { loadState } from '@nextcloud/initial-state'
 import { appData } from '../app/AppData.js'
 
 export const OC = {

webpack.renderer.config.js

@@ -44,6 +44,35 @@ process.env.npm_package_version = talkPackage.version
 const nextcloudWebpackConfig = require('@nextcloud/webpack-vue-config')
 const commonTalkWebpackConfig = require(`${TALK_PATH}/webpack.common.config`)
 
+/**
+ * Create webpack aliases config to patch a package
+ *
+ * @param {string} packageName - name of the package to patch, for example, @nextcloud/axios
+ * @return {Object<string, string>} webpack.resolve.alice config object with at most 3 aliases:
+ *                                  - Alias from package to the patcher (e.g. @nextcloud/axios)
+ *                                  - Alias to the original module in spreed (e.g. @talk-modules--@nextcloud/axios)
+ *                                  - Alias to the original module in talk-desktop (e.g. @desktop-modules--@nextcloud/axios)
+ */
+function createPatcherAliases(packageName) {
+	// Try to resolve a package. If it throws then there is no such package, do not create an alias
+	let talkModulePath = false
+	try {
+		talkModulePath = require.resolve(packageName, { paths: [TALK_PATH] })
+	} catch {}
+
+	let desktopModulePath = false
+	try {
+		desktopModulePath = require.resolve(packageName)
+	} catch {}
+
+	// webpack.resolve.aliases
+	return {
+		[`${packageName}$`]: path.resolve(__dirname, `src/patchers/${packageName}.js`),
+		[`@talk-modules--${packageName}$`]: talkModulePath,
+		[`@desktop-modules--${packageName}$`]: desktopModulePath,
+	}
+}
+
 const merge = mergeWithRules({
 	module: {
 		rules: {
@@ -85,11 +114,11 @@ module.exports = merge(commonTalkWebpackConfig, {
 	resolve: {
 		alias: {
 			'@talk': TALK_PATH,
-			'@nextcloud/initial-state$': path.resolve(__dirname, 'src/patchers/nextcloud-initial-state.js'),
-			'@nextcloud/axios$': path.resolve(__dirname, 'src/patchers/nextcloud-axios.js'),
-			'@nextcloud/router$': path.resolve(__dirname, 'src/patchers/nextcloud-router.js'),
-			'@nextcloud/auth$': path.resolve(__dirname, 'src/patchers/nextcloud-auth.js'),
-			'@nextcloud/notify_push$': path.resolve(__dirname, 'src/patchers/nextcloud-notify_push.js'),
+			...createPatcherAliases('@nextcloud/initial-state'),
+			...createPatcherAliases('@nextcloud/axios'),
+			...createPatcherAliases('@nextcloud/router'),
+			...createPatcherAliases('@nextcloud/auth'),
+			...createPatcherAliases('@nextcloud/notify_push'),
 		},
 	},