Merge pull request #667 from nextcloud/fix/oc-win

fix: Do not export the declaration of window.OC
nextcloud-libraries · Jun 14, 2023 · 97da8b8 · 97da8b8
2 parents df1a4f9 + c5bbd90
commit 97da8b8
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 60 deletions.
diff --git a/__tests__/fileAction.spec.ts b/__tests__/fileAction.spec.ts
@@ -1,13 +1,6 @@
 import { getFileActions, registerFileAction, FileAction } from '../lib/fileAction'
 import logger from '../lib/utils/logger';
 
-declare global {
-	interface Window {
-		OC: any;
-		_nc_fileactions: FileAction[] | undefined;
-	}
-}
-
 describe('FileActions init', () => {
 
 	beforeEach(() => {

diff --git a/__tests__/humanFileSize.spec.ts b/__tests__/humanFileSize.spec.ts
@@ -1,11 +1,5 @@
 import { formatFileSize } from '../lib/humanfilesize'
 
-declare global {
-	interface Window {
-		OC: any;
-	}
-}
-
 describe('humanFileSize', () => {
     describe('formatFileSize', () => {
         it('renders file sizes with the correct unit', function() {

diff --git a/__tests__/index.spec.ts b/__tests__/index.spec.ts
@@ -18,13 +18,6 @@ import { FileType as FileTypeSource } from '../lib/files/fileType'
 import { Entry, NewFileMenu } from '../lib/newFileMenu';
 import { FileAction, registerFileAction, getFileActions } from '../lib/fileAction'
 
-declare global {
-	interface Window {
-		OC: any;
-		_nc_newfilemenu: NewFileMenu | undefined;
-	}
-}
-
 describe('Exports checks', () => {
 	test('formatFileSize', () => {
 		expect(formatFileSize).toBeTruthy()

diff --git a/__tests__/newFileMenu.spec.ts b/__tests__/newFileMenu.spec.ts
@@ -1,13 +1,6 @@
 import { NewFileMenu, getNewFileMenu, type Entry } from '../lib/newFileMenu'
 import logger from '../lib/utils/logger';
 
-declare global {
-	interface Window {
-		OC: any;
-		_nc_newfilemenu: NewFileMenu | undefined;
-	}
-}
-
 describe('NewFileMenu init', () => {
 	test('Initializing NewFileMenu', () => {
 		logger.debug = jest.fn()

diff --git a/jest.config.js b/jest.config.js
@@ -4,12 +4,12 @@ module.exports = {
 	coveragePathIgnorePatterns: ['lib/utils/logger.ts'],
 	testEnvironment: 'jsdom',
 	preset: 'ts-jest/presets/js-with-ts',
-	globals: {
-		'ts-jest': {
-			tsconfig: '__tests__/tsconfig.json',
-		},
-	},
 	transformIgnorePatterns: [
-		'node_modules/(?!(abcde|fghij)/)',
+		'node_modules',
 	],
+	transform: {
+		'^.+\\.tsx?$': ['ts-jest', {
+			tsconfig: '__tests__/tsconfig.json',
+		}]
+	},
 }
diff --git a/lib/index.ts b/lib/index.ts
@@ -33,14 +33,6 @@ export { Node } from './files/node'
 export { Permission, parseWebdavPermissions } from './permissions'
 export { FileAction, registerFileAction, getFileActions } from './fileAction'
 
-declare global {
-	interface Window {
-		OC: any;
-		_nc_newfilemenu: NewFileMenu | undefined;
-		_nc_fileactions: FileAction[] | undefined;
-	}
-}
-
 /**
  * Add a new menu entry to the upload manager menu
  */