Merge branch 'main' into w2p-134319_escape-html-tags_contribute-main

Author: alexandrevryghem

README.md

@@ -454,7 +454,6 @@ dspace-angular
 ├── karma.conf.js                                       * Karma configuration file for Unit Test
 ├── LICENSE                                             *
 ├── LICENSES_THIRD_PARTY                                *
-├── nodemon.json                                        * Nodemon (https://nodemon.io/) configuration
 ├── package.json                                        * This file describes the npm package for this project, its dependencies, scripts, etc.
 ├── package-lock.json                                   * npm lockfile (https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json)
 ├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration

cypress/support/commands.ts

@@ -6,11 +6,11 @@
 import {
   AuthTokenInfo,
   TOKENITEM,
-} from 'src/app/core/auth/models/auth-token-info.model';
+} from '@dspace/core/auth/models/auth-token-info.model';
 import {
   DSPACE_XSRF_COOKIE,
   XSRF_REQUEST_HEADER,
-} from 'src/app/core/xsrf/xsrf.constants';
+} from '@dspace/core/xsrf/xsrf.constants';
 import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs

cypress/support/e2e.ts

@@ -19,7 +19,7 @@ import './commands';
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
 
-import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+import { DSPACE_XSRF_COOKIE } from '@dspace/core/xsrf/xsrf.constants';
 
 // Runs once before all tests
 before(() => {

lint/src/util/theme-support.ts

@@ -150,10 +150,10 @@ class ThemeableComponentRegistry {
       traverse(source);
     }
 
-    const glob = require('glob');
+    const { globSync } = require('glob');
 
     // note: this outputs Unix-style paths on Windows
-    const wrappers: string[] = glob.GlobSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' }).found;
+    const wrappers: string[] = globSync(prefix + 'src/app/**/themed-*.component.ts', { ignore: 'node_modules/**' });
 
     for (const wrapper of wrappers) {
       registerWrapper(wrapper);