Skip to content

Commit 733f19b

Browse files
Merge remote-tracking branch 'gitHub/main' into task/main/DURACOM-390
2 parents 1b91adb + bf72132 commit 733f19b

2,260 files changed

Lines changed: 17730 additions & 17805 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cypress/support/commands.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import {
77
AuthTokenInfo,
88
TOKENITEM,
9-
} from 'src/app/core/auth/models/auth-token-info.model';
9+
} from '@dspace/core/auth/models/auth-token-info.model';
1010
import {
1111
DSPACE_XSRF_COOKIE,
1212
XSRF_REQUEST_HEADER,
13-
} from 'src/app/core/xsrf/xsrf.constants';
13+
} from '@dspace/core/xsrf/xsrf.constants';
1414
import { v4 as uuidv4 } from 'uuid';
1515

1616
// Declare Cypress namespace to help with Intellisense & code completion in IDEs

cypress/support/e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import './commands';
1919
// https://github.com/component-driven/cypress-axe
2020
import 'cypress-axe';
2121

22-
import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
22+
import { DSPACE_XSRF_COOKIE } from '@dspace/core/xsrf/xsrf.constants';
2323

2424
// Runs once before all tests
2525
before(() => {

lint/src/util/theme-support.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ class ThemeableComponentRegistry {
150150
traverse(source);
151151
}
152152

153-
const glob = require('glob');
153+
const { globSync } = require('glob');
154154

155155
// note: this outputs Unix-style paths on Windows
156-
const wrappers: string[] = glob.GlobSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' }).found;
156+
const wrappers: string[] = globSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' });
157157

158158
for (const wrapper of wrappers) {
159159
registerWrapper(wrapper);

0 commit comments

Comments
 (0)