refactor: migrate to @shgk/nextcloud-styles

Signed-off-by: Grigorii K. Shartsev <[email protected]>
nextcloud · Nov 10, 2024 · d65f4c8 · d65f4c8
1 parent cf38f44
commit d65f4c8
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 24 deletions.
diff --git a/src/authentication/renderer/AuthenticationApp.vue b/src/authentication/renderer/AuthenticationApp.vue
@@ -204,7 +204,7 @@ async function login() {
 }
 
 .logo {
-	background: no-repeat center url('~@global-styles/core/img/logo/logo.svg');
+	background: no-repeat center url('~@shgk/nextcloud-styles/core/img/logo/logo.svg');
 	background-size: contain;
 	width: 175px;
 	height: 130px;

diff --git a/src/authentication/renderer/authentication.main.js b/src/authentication/renderer/authentication.main.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import '../../shared/assets/global.styles.css'
+import '@shgk/nextcloud-styles'
 
 import Vue from 'vue'
 import AuthenticationApp from './AuthenticationApp.vue'

diff --git a/src/help/renderer/help.app.js b/src/help/renderer/help.app.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import '../../shared/assets/global.styles.css'
+import '@shgk/nextcloud-styles'
 
 import Vue from 'vue'
 import HelpApp from './HelpApp.vue'

diff --git a/src/shared/assets/global.styles.css b/src/shared/assets/global.styles.css
diff --git a/src/shared/globals/globals.js b/src/shared/globals/globals.js
@@ -56,7 +56,7 @@ const OC = {
 			icon = MimeTypeList.files.includes(icon) ? icon : mimeType.split('/')[0]
 
 			try {
-				return require(`@global-styles/core/img/filetypes/${icon}.svg`)
+				return require(`@shgk/nextcloud-styles/core/img/filetypes/${icon}.svg`)
 			} catch {
 				return undefined
 			}

diff --git a/src/talk/renderer/talk.main.js b/src/talk/renderer/talk.main.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import '../../shared/assets/global.styles.css'
+import '@shgk/nextcloud-styles'
 import '@talk/css/icons.css'
 import './assets/styles.css'
 import './assets/overrides.css'

diff --git a/src/upgrade/renderer/upgrade.app.js b/src/upgrade/renderer/upgrade.app.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import '../../shared/assets/global.styles.css'
+import '@shgk/nextcloud-styles'
 
 import Vue from 'vue'
 import UpgradeApp from './UpgradeApp.vue'

diff --git a/src/welcome/welcome.js b/src/welcome/welcome.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import '@global-styles/dist/icons.css'
+import '@shgk/nextcloud-styles/dist/icons.css'
 
 import { appData } from '../app/AppData.js'
 import { refetchAppDataIfDirty } from '../app/appData.service.js'

diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js
@@ -109,7 +109,7 @@ const webpackRendererConfig = mergeWithRules({
 	resolve: {
 		alias: {
 			'@talk': TALK_PATH,
-			'@global-styles': path.resolve(__dirname, 'resources/server-global-styles', MAX_NEXTCLOUD_VERSION === NEXTCLOUD_MASTER_VERSION ? 'master' : `stable${MAX_NEXTCLOUD_VERSION}`),
+			'@shgk/nextcloud-styles': `@shgk/nextcloud-styles/${MAX_NEXTCLOUD_VERSION === NEXTCLOUD_MASTER_VERSION ? 'master' : ('stable' + MAX_NEXTCLOUD_VERSION)}`,
 			// To reuse modules between Talk Desktop and Talk, otherwise Talk has its own from its node_modules
 			'@nextcloud/axios': path.resolve(__dirname, 'node_modules', '@nextcloud/axios/dist/index.mjs'),
 			// Patched packages